From ad805d4756f56e1c941aeafe5f3bb893bad85ff8 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 23 Sep 2020 15:38:34 -0500 Subject: [PATCH] Issue #5264 - More post move to /demos/ updates Signed-off-by: Joakim Erdfelt --- .../old_docs/extras/rewrite-handler.adoc | 2 +- .../maven/jetty-jspc-maven-plugin.adoc | 6 +++--- jetty-osgi/test-jetty-osgi/pom.xml | 8 ++++---- .../osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java | 2 +- .../jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java | 2 +- .../test/TestJettyOSGiBootWithJavaxWebSocket.java | 2 +- .../jetty/osgi/test/TestJettyOSGiBootWithJsp.java | 2 +- .../osgi/test/TestJettyOSGiBootWithWebSocket.java | 2 +- tests/test-distribution/pom.xml | 4 ++-- .../jetty/tests/distribution/DemoModulesTests.java | 8 ++++---- .../jetty/tests/distribution/DistributionTests.java | 2 +- .../tests/distribution/DynamicListenerTests.java | 2 +- tests/test-integration/pom.xml | 4 ++-- tests/test-quickstart/pom.xml | 12 ++++++------ 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/extras/rewrite-handler.adoc b/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/extras/rewrite-handler.adoc index d1cfadc3464..4c5b94a11d1 100644 --- a/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/extras/rewrite-handler.adoc +++ b/jetty-documentation/src/main/asciidoc/operations-guide/old_docs/extras/rewrite-handler.adoc @@ -56,7 +56,7 @@ There is an example of link:#rewrite-rules[rules] configuration in the standard [source, xml, subs="{sub-order}"] ---- -include::{SRCDIR}/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/demo-rewrite-rules.xml[] +include::{SRCDIR}/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml[] ---- ===== Embedded Example diff --git a/jetty-documentation/src/main/asciidoc/programming-guide/maven/jetty-jspc-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/programming-guide/maven/jetty-jspc-maven-plugin.adoc index edd351d6642..704ed12d590 100644 --- a/jetty-documentation/src/main/asciidoc/programming-guide/maven/jetty-jspc-maven-plugin.adoc +++ b/jetty-documentation/src/main/asciidoc/programming-guide/maven/jetty-jspc-maven-plugin.adoc @@ -181,7 +181,7 @@ We will unpack the overlaid war file, compile the jsps and merge their servlet d Here's an example configuration of the war plugin that separate those phases into an unpack phase, and then a packing phase: -[source, xml, subs="{sub-order}"] +[source,xml,subs="{sub-order}"] ---- maven-war-plugin @@ -195,8 +195,8 @@ Here's an example configuration of the war plugin that separate those phases int - org.eclipse.jetty - test-jetty-webapp + org.eclipse.jetty.demos + demo-jetty-webapp diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 4a24d4591de..85785dab420 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -369,15 +369,15 @@ - org.eclipse.jetty - test-jetty-webapp + org.eclipse.jetty.demos + demo-jetty-webapp ${project.version} webbundle test - org.eclipse.jetty.tests - test-spec-webapp + org.eclipse.jetty.demos + demo-spec-webapp ${project.version} war test diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java index 3139fdd0231..456bb2ba4cb 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java @@ -78,7 +78,7 @@ public class TestJettyOSGiBootHTTP2Conscrypt options.addAll(TestOSGiUtil.coreJettyDependencies()); options.addAll(TestOSGiUtil.jspDependencies()); //deploy a test webapp - options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject()); + options.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jetty-webapp").classifier("webbundle").versionAsInProject()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-conscrypt-client").versionAsInProject().start()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").versionAsInProject().start()); options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-client").versionAsInProject().start()); diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java index d46e20d6011..2efcc576c6e 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2JDK9.java @@ -75,7 +75,7 @@ public class TestJettyOSGiBootHTTP2JDK9 options.addAll(TestOSGiUtil.coreJettyDependencies()); options.addAll(TestOSGiUtil.jspDependencies()); //deploy a test webapp - options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject()); + options.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jetty-webapp").classifier("webbundle").versionAsInProject()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-java-client").versionAsInProject().start()); options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").versionAsInProject().start()); options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-client").versionAsInProject().start()); diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java index 73291ccd87d..eabdcfb2120 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java @@ -84,7 +84,7 @@ public class TestJettyOSGiBootWithJavaxWebSocket { List - org.eclipse.jetty - test-jetty-webapp + org.eclipse.jetty.demos + demo-jetty-webapp ${project.version} war test diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java index c687a5b0d29..ccfc65ecf85 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java @@ -120,19 +120,19 @@ public class DemoModulesTests extends AbstractJettyHomeTest startHttpClient(); ContentResponse response; - response = client.GET("http://localhost:" + httpPort + "/async-rest/testSerial?items=kayak"); + response = client.GET("http://localhost:" + httpPort + "/demo-async-rest/testSerial?items=kayak"); assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response)); assertThat(response.getContentAsString(), containsString("Blocking: kayak")); - response = client.GET("http://localhost:" + httpPort + "/async-rest/testSerial?items=mouse,beer,gnome"); + response = client.GET("http://localhost:" + httpPort + "/demo-async-rest/testSerial?items=mouse,beer,gnome"); assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response)); assertThat(response.getContentAsString(), containsString("Blocking: mouse,beer,gnome")); - response = client.GET("http://localhost:" + httpPort + "/async-rest/testAsync?items=kayak"); + response = client.GET("http://localhost:" + httpPort + "/demo-async-rest/testAsync?items=kayak"); assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response)); assertThat(response.getContentAsString(), containsString("Asynchronous: kayak")); - response = client.GET("http://localhost:" + httpPort + "/async-rest/testAsync?items=mouse,beer,gnome"); + response = client.GET("http://localhost:" + httpPort + "/demo-async-rest/testAsync?items=mouse,beer,gnome"); assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response)); assertThat(response.getContentAsString(), containsString("Asynchronous: mouse,beer,gnome")); } diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 69686fa56d3..7962b13e501 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -395,7 +395,7 @@ public class DistributionTests extends AbstractJettyHomeTest writer.write("org.eclipse.jetty.LEVEL=INFO"); } - File war = distribution.resolveArtifact("org.eclipse.jetty.tests:test-proxy-webapp:war:" + jettyVersion); + File war = distribution.resolveArtifact("org.eclipse.jetty.demos:demo-proxy-webapp:war:" + jettyVersion); distribution.installWarFile(war, "proxy"); int port = distribution.freePort(); diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DynamicListenerTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DynamicListenerTests.java index bcea8d44819..fb9c1b00448 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DynamicListenerTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DynamicListenerTests.java @@ -58,7 +58,7 @@ public class DynamicListenerTests assertTrue(run1.awaitFor(5, TimeUnit.SECONDS)); assertEquals(0, run1.getExitValue()); - File war = distribution.resolveArtifact("org.eclipse.jetty:test-jetty-webapp:war:" + jettyVersion); + File war = distribution.resolveArtifact("org.eclipse.jetty.demos:demo-jetty-webapp:war:" + jettyVersion); distribution.installWarFile(war, "test"); Path etc = Paths.get(jettyBase.toString(), "etc"); diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index ee6dd312dcf..36179e9c50c 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -167,8 +167,8 @@ test - org.eclipse.jetty - test-jetty-webapp + org.eclipse.jetty.demos + demo-jetty-webapp ${project.version} war test diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index b80b6c7331e..01781862125 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -171,8 +171,8 @@ - org.eclipse.jetty.tests - test-jndi-webapp + org.eclipse.jetty.demos + demo-jndi-webapp ${project.version} war true @@ -181,8 +181,8 @@ test-jndi.war - org.eclipse.jetty.tests - test-spec-webapp + org.eclipse.jetty.demos + demo-spec-webapp ${project.version} war true @@ -191,8 +191,8 @@ test-spec.war - org.eclipse.jetty - test-jetty-webapp + org.eclipse.jetty.demos + demo-jetty-webapp ${project.version} war true