From 120987900512497e39c672a88c3df2006ec8c098 Mon Sep 17 00:00:00 2001
From: Geert Bevin <gbevin@uwyn.com>
Date: Tue, 21 Mar 2023 19:32:29 -0400
Subject: [PATCH] Develop (#12)

* Updated to latest Gradle plugin.

* Updated for better alignment across hello templates

* Updated to RIFE 1.5.2

* Updated to RIFE 1.5.4
---
 README.md                                            |  2 +-
 app/build.gradle.kts                                 | 12 ++++++------
 app/src/main/java/hello/{App.java => AppSite.java}   |  4 ++--
 .../java/hello/{AppUber.java => AppSiteUber.java}    |  4 ++--
 app/src/test/java/hello/AppTest.java                 |  4 ++--
 war/src/web.xml                                      |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename app/src/main/java/hello/{App.java => AppSite.java} (81%)
 rename app/src/main/java/hello/{AppUber.java => AppSiteUber.java} (66%)

diff --git a/README.md b/README.md
index 6425852..bec065d 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ java -javaagent:[path-to]/rife2-[version]-agent.jar -jar $JETTY_HOME/start.jar
 
 
 ```bash
-./gradlew clean uberJar
+./gradlew clean uberjar
 ```
 
 Then run it with:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8ddfd06..68276d3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,7 +4,7 @@ import com.uwyn.rife2.gradle.TemplateType.*
 
 plugins {
     application
-    id("com.uwyn.rife2") version "1.0.7"
+    id("com.uwyn.rife2") version "1.0.8"
     `maven-publish`
     id("org.graalvm.buildtools.native") version "0.9.20"
 }
@@ -13,8 +13,8 @@ version = 1.0
 group = "com.example"
 
 rife2 {
-    version.set("1.4.0")
-    uberMainClass.set("hello.AppUber")
+    version.set("1.5.4")
+    uberMainClass.set("hello.AppSiteUber")
     useAgent.set(true)
     precompiledTemplateTypes.add(HTML)
 }
@@ -36,12 +36,12 @@ repositories {
 }
 
 dependencies {
-    testImplementation("org.jsoup:jsoup:1.15.3")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
+    testImplementation("org.jsoup:jsoup:1.15.4")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
 }
 
 application {
-    mainClass.set("hello.App")
+    mainClass.set("hello.AppSite")
 }
 
 tasks {
diff --git a/app/src/main/java/hello/App.java b/app/src/main/java/hello/AppSite.java
similarity index 81%
rename from app/src/main/java/hello/App.java
rename to app/src/main/java/hello/AppSite.java
index 43a1870..cbe0969 100644
--- a/app/src/main/java/hello/App.java
+++ b/app/src/main/java/hello/AppSite.java
@@ -2,7 +2,7 @@ package hello;
 
 import rife.engine.*;
 
-public class App extends Site {
+public class AppSite extends Site {
     public void setup() {
         var hello = get("/hello", c -> c.print(c.template("hello")));
         get("/", c -> c.redirect(hello));
@@ -11,6 +11,6 @@ public class App extends Site {
     public static void main(String[] args) {
         new Server()
             .staticResourceBase("src/main/webapp")
-            .start(new App());
+            .start(new AppSite());
     }
 }
diff --git a/app/src/main/java/hello/AppUber.java b/app/src/main/java/hello/AppSiteUber.java
similarity index 66%
rename from app/src/main/java/hello/AppUber.java
rename to app/src/main/java/hello/AppSiteUber.java
index 8dbf6a6..9d47fcb 100644
--- a/app/src/main/java/hello/AppUber.java
+++ b/app/src/main/java/hello/AppSiteUber.java
@@ -2,10 +2,10 @@ package hello;
 
 import rife.engine.Server;
 
-public class AppUber extends App {
+public class AppSiteUber extends AppSite {
     public static void main(String[] args) {
         new Server()
             .staticUberJarResourceBase("webapp")
-            .start(new AppUber());
+            .start(new AppSiteUber());
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/hello/AppTest.java b/app/src/test/java/hello/AppTest.java
index 45a0763..b3d167a 100644
--- a/app/src/test/java/hello/AppTest.java
+++ b/app/src/test/java/hello/AppTest.java
@@ -11,13 +11,13 @@ import static org.junit.jupiter.api.Assertions.*;
 public class AppTest {
     @Test
     void verifyRoot() {
-        var m = new MockConversation(new App());
+        var m = new MockConversation(new AppSite());
         assertEquals(m.doRequest("/").getStatus(), 302);
     }
 
     @Test
     void verifyHello() {
-        var m = new MockConversation(new App());
+        var m = new MockConversation(new AppSite());
         assertEquals("Hello", m.doRequest("/hello")
             .getTemplate().getValue("title"));
     }
diff --git a/war/src/web.xml b/war/src/web.xml
index f1f16d1..7e73281 100644
--- a/war/src/web.xml
+++ b/war/src/web.xml
@@ -7,7 +7,7 @@
         <filter-class>rife.servlet.RifeFilter</filter-class>
         <init-param>
             <param-name>rifeSiteClass</param-name>
-            <param-value>hello.App</param-value>
+            <param-value>hello.AppSite</param-value>
         </init-param>
     </filter>