From a0d8f077f43e0dfa9a24bf36166483353a191337 Mon Sep 17 00:00:00 2001
From: Ludovic Orban <lorban@bitronix.be>
Date: Wed, 17 Jul 2024 11:43:17 +0200
Subject: [PATCH] move core demos from jetty-core to jetty-demos

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
---
 jetty-core/jetty-bom/pom.xml                             | 2 +-
 jetty-core/pom.xml                                       | 1 -
 .../jetty-core-demos/jetty-core-demo-handler}/pom.xml    | 9 ++-------
 .../src/main/config/modules/demo-handler.mod             | 4 ++--
 .../src/main/config/modules/demo.d/demo-handler.xml      | 0
 .../main/java/org/eclipse/jetty/demo/HelloHandler.java   | 0
 .../jetty-demos => jetty-demos/jetty-core-demos}/pom.xml | 6 +++---
 jetty-demos/pom.xml                                      | 2 +-
 jetty-home/pom.xml                                       | 2 +-
 9 files changed, 10 insertions(+), 16 deletions(-)
 rename {jetty-core/jetty-demos/jetty-demo-handler => jetty-demos/jetty-core-demos/jetty-core-demo-handler}/pom.xml (85%)
 rename {jetty-core/jetty-demos/jetty-demo-handler => jetty-demos/jetty-core-demos/jetty-core-demo-handler}/src/main/config/modules/demo-handler.mod (63%)
 rename {jetty-core/jetty-demos/jetty-demo-handler => jetty-demos/jetty-core-demos/jetty-core-demo-handler}/src/main/config/modules/demo.d/demo-handler.xml (100%)
 rename {jetty-core/jetty-demos/jetty-demo-handler => jetty-demos/jetty-core-demos/jetty-core-demo-handler}/src/main/java/org/eclipse/jetty/demo/HelloHandler.java (100%)
 rename {jetty-core/jetty-demos => jetty-demos/jetty-core-demos}/pom.xml (80%)

diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml
index 7ca797d651fb..39288818be5d 100644
--- a/jetty-core/jetty-bom/pom.xml
+++ b/jetty-core/jetty-bom/pom.xml
@@ -162,7 +162,7 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.demos</groupId>
-        <artifactId>jetty-demo-handler</artifactId>
+        <artifactId>jetty-core-demo-handler</artifactId>
         <version>12.1.0-SNAPSHOT</version>
       </dependency>
       <dependency>
diff --git a/jetty-core/pom.xml b/jetty-core/pom.xml
index c117bf3208b5..c3670faf6a58 100644
--- a/jetty-core/pom.xml
+++ b/jetty-core/pom.xml
@@ -15,7 +15,6 @@
     <module>jetty-alpn</module>
     <module>jetty-bom</module>
     <module>jetty-client</module>
-    <module>jetty-demos</module>
     <module>jetty-deploy</module>
     <module>jetty-ee</module>
     <module>jetty-fcgi</module>
diff --git a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/pom.xml
similarity index 85%
rename from jetty-core/jetty-demos/jetty-demo-handler/pom.xml
rename to jetty-demos/jetty-core-demos/jetty-core-demo-handler/pom.xml
index c1592e4d5f90..94dcea1e7024 100644
--- a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml
+++ b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/pom.xml
@@ -3,10 +3,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.jetty.demos</groupId>
-    <artifactId>jetty-demos</artifactId>
+    <artifactId>jetty-core-demos</artifactId>
     <version>12.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>jetty-demo-handler</artifactId>
+  <artifactId>jetty-core-demo-handler</artifactId>
   <name>Core :: Demo Handler</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.demos</bundle-symbolic-name>
@@ -31,11 +31,6 @@
       <artifactId>jetty-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo-handler.mod
similarity index 63%
rename from jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod
rename to jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo-handler.mod
index 966de59a45ef..ffefbc1df821 100644
--- a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo-handler.mod
+++ b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo-handler.mod
@@ -12,10 +12,10 @@ server
 
 [files]
 basehome:modules/demo.d/demo-handler.xml|etc/demo-handler.xml
-maven://org.eclipse.jetty.demos/jetty-demo-handler/${jetty.version}/jar|lib/jetty-demo-handler.jar
+maven://org.eclipse.jetty.demos/jetty-core-demo-handler/${jetty.version}/jar|lib/jetty-core-demo-handler.jar
 
 [xml]
 etc/demo-handler.xml
 
 [lib]
-lib/jetty-demo-handler.jar
+lib/jetty-core-demo-handler.jar
diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo.d/demo-handler.xml
similarity index 100%
rename from jetty-core/jetty-demos/jetty-demo-handler/src/main/config/modules/demo.d/demo-handler.xml
rename to jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo.d/demo-handler.xml
diff --git a/jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java
similarity index 100%
rename from jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java
rename to jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java
diff --git a/jetty-core/jetty-demos/pom.xml b/jetty-demos/jetty-core-demos/pom.xml
similarity index 80%
rename from jetty-core/jetty-demos/pom.xml
rename to jetty-demos/jetty-core-demos/pom.xml
index 9ff8dcbdba4a..962b8abdf914 100644
--- a/jetty-core/jetty-demos/pom.xml
+++ b/jetty-demos/jetty-core-demos/pom.xml
@@ -4,16 +4,16 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.jetty</groupId>
-    <artifactId>jetty-core</artifactId>
+    <artifactId>jetty-demos</artifactId>
     <version>12.1.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.demos</groupId>
-  <artifactId>jetty-demos</artifactId>
+  <artifactId>jetty-core-demos</artifactId>
   <packaging>pom</packaging>
   <name>Core :: Demos</name>
 
   <modules>
-    <module>jetty-demo-handler</module>
+    <module>jetty-core-demo-handler</module>
   </modules>
 
 </project>
diff --git a/jetty-demos/pom.xml b/jetty-demos/pom.xml
index e7f4b23b8015..38020937ccb8 100644
--- a/jetty-demos/pom.xml
+++ b/jetty-demos/pom.xml
@@ -7,13 +7,13 @@
     <artifactId>jetty-project</artifactId>
     <version>12.1.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-demos</artifactId>
   <packaging>pom</packaging>
   <name>Demos</name>
 
   <modules>
     <!-- TBD -->
+    <module>jetty-core-demos</module>
     <module>jetty-servlet4-demos</module>
     <module>jetty-servlet5-demos</module>
     <!-- module>jetty-servlet6-demos</module -->
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 5d2e3b6c22e0..1972104a95e8 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -121,7 +121,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.demos</groupId>
-      <artifactId>jetty-demo-handler</artifactId>
+      <artifactId>jetty-core-demo-handler</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>