Issue #5264 - More post move to /demos/ updates

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

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

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}"]
 ----
 <plugin>
     <artifactId>maven-war-plugin</artifactId>
@@ -195,8 +195,8 @@ Here's an example configuration of the war plugin that separate those phases int
           <overlays>
             <overlay />
             <overlay>
-              <groupId>org.eclipse.jetty</groupId>
+              <groupId>org.eclipse.jetty.demos</groupId>
-              <artifactId>test-jetty-webapp</artifactId>
+              <artifactId>demo-jetty-webapp</artifactId>
             </overlay>
           </overlays>
         </configuration>

jetty-osgi/test-jetty-osgi/pom.xml

@@ -369,15 +369,15 @@
 
     <!-- Eclipse OSGi Deps -->
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty.demos</groupId>
-      <artifactId>test-jetty-webapp</artifactId>
+      <artifactId>demo-jetty-webapp</artifactId>
       <version>${project.version}</version>
       <classifier>webbundle</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty.demos</groupId>
-      <artifactId>test-spec-webapp</artifactId>
+      <artifactId>demo-spec-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
       <scope>test</scope>

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());

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());

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java

@@ -84,7 +84,7 @@ public class TestJettyOSGiBootWithJavaxWebSocket
     {
         List<Option> res = new ArrayList<>();
         //test webapp bundle
-        res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject().noStart());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jetty-webapp").classifier("webbundle").versionAsInProject().noStart());
         return res;
     }
 

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java

@@ -74,7 +74,7 @@ public class TestJettyOSGiBootWithJsp
     {
         List<Option> res = new ArrayList<>(TestOSGiUtil.jspDependencies());
         //test webapp bundle
-        res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jetty-webapp").classifier("webbundle").versionAsInProject());
         return res;
     }
 

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java

@@ -79,7 +79,7 @@ public class TestJettyOSGiBootWithWebSocket
     {
         List<Option> res = new ArrayList<>();
         //test webapp bundle
-        res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-jetty-webapp").classifier("webbundle").versionAsInProject());
         return res;
     }
 

tests/test-distribution/pom.xml

@@ -87,8 +87,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty.demos</groupId>
-      <artifactId>test-jetty-webapp</artifactId>
+      <artifactId>demo-jetty-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
       <scope>test</scope>

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"));
             }

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();

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");

tests/test-integration/pom.xml

@@ -167,8 +167,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty.demos</groupId>
-      <artifactId>test-jetty-webapp</artifactId>
+      <artifactId>demo-jetty-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
       <scope>test</scope>

tests/test-quickstart/pom.xml

@@ -171,8 +171,8 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.eclipse.jetty.tests</groupId>
+                  <groupId>org.eclipse.jetty.demos</groupId>
-                  <artifactId>test-jndi-webapp</artifactId>
+                  <artifactId>demo-jndi-webapp</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
                   <overWrite>true</overWrite>
@@ -181,8 +181,8 @@
                   <destFileName>test-jndi.war</destFileName>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.eclipse.jetty.tests</groupId>
+                  <groupId>org.eclipse.jetty.demos</groupId>
-                  <artifactId>test-spec-webapp</artifactId>
+                  <artifactId>demo-spec-webapp</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
                   <overWrite>true</overWrite>
@@ -191,8 +191,8 @@
                   <destFileName>test-spec.war</destFileName>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.eclipse.jetty</groupId>
+                  <groupId>org.eclipse.jetty.demos</groupId>
-                  <artifactId>test-jetty-webapp</artifactId>
+                  <artifactId>demo-jetty-webapp</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
                   <overWrite>true</overWrite>