From e0e07a3d272e9715710472d3d2cd660f67bc72fe Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Mon, 13 Mar 2023 10:07:36 -0400 Subject: [PATCH 1/6] Updated to latest Gradle plugin. --- README.md | 2 +- app/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bb2039a..e47cb90 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..8df1ce7 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" } From 8751306d0f890fd9071ff841ae95d4c310cc1cb6 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Mon, 20 Mar 2023 11:06:06 -0400 Subject: [PATCH 2/6] Updated for better alignment across hello templates --- app/build.gradle.kts | 10 +++++----- app/src/main/java/hello/{App.java => AppSite.java} | 4 ++-- .../main/java/hello/{AppUber.java => AppSiteUber.java} | 4 ++-- app/src/test/java/hello/AppTest.java | 4 ++-- war/src/web.xml | 2 +- 5 files changed, 12 insertions(+), 12 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/app/build.gradle.kts b/app/build.gradle.kts index 8df1ce7..2b00f99 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,8 @@ version = 1.0 group = "com.example" rife2 { - version.set("1.4.0") - uberMainClass.set("hello.AppUber") + version.set("1.5.1") + 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 @@ rife.servlet.RifeFilter rifeSiteClass - hello.App + hello.AppSite From c873741771ea4027175dd45e529f5dc13245d276 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Mon, 20 Mar 2023 21:49:29 -0400 Subject: [PATCH 3/6] Updated to RIFE 1.5.2 --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2b00f99..23c4f02 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ version = 1.0 group = "com.example" rife2 { - version.set("1.5.1") + version.set("1.5.2") uberMainClass.set("hello.AppSiteUber") useAgent.set(true) precompiledTemplateTypes.add(HTML) From 114d73323ff9f26aacea5bd10dbb4bb90dcf3005 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Tue, 21 Mar 2023 19:28:50 -0400 Subject: [PATCH 4/6] Updated to RIFE 1.5.4 --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 23c4f02..68276d3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ version = 1.0 group = "com.example" rife2 { - version.set("1.5.2") + version.set("1.5.4") uberMainClass.set("hello.AppSiteUber") useAgent.set(true) precompiledTemplateTypes.add(HTML) From e94a7585597d4fb3338c087493299af3f159ec04 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Wed, 22 Mar 2023 16:35:08 -0400 Subject: [PATCH 5/6] Updated to RIFE 1.5.5 --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 68276d3..accf622 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ version = 1.0 group = "com.example" rife2 { - version.set("1.5.4") + version.set("1.5.5") uberMainClass.set("hello.AppSiteUber") useAgent.set(true) precompiledTemplateTypes.add(HTML) From 056d590d0e4a95024e811b9f56a1b6965e822113 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sat, 25 Mar 2023 10:12:19 -0400 Subject: [PATCH 6/6] Updated to RIFE 1.5.6 --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index accf622..ff0250b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ version = 1.0 group = "com.example" rife2 { - version.set("1.5.5") + version.set("1.5.6") uberMainClass.set("hello.AppSiteUber") useAgent.set(true) precompiledTemplateTypes.add(HTML)