diff --git a/examples/async-rest/async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml similarity index 73% rename from examples/async-rest/async-rest-jar/pom.xml rename to demos/demo-async-rest/demo-async-rest-jar/pom.xml index b9fedd3572c..899807f4522 100644 --- a/examples/async-rest/async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -1,18 +1,17 @@ - org.eclipse.jetty - example-async-rest + org.eclipse.jetty.demos + demo-async-rest-parent 10.0.0-SNAPSHOT 4.0.0 - org.eclipse.jetty.example-async-rest - example-async-rest-jar + demo-async-rest-jar jar - Example Async Rest :: Jar + Demo Async Rest :: Jar - ${project.parent.groupId}.examples.async.rest + ${project.parent.groupId}.async.rest diff --git a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java similarity index 100% rename from examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java rename to demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java diff --git a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java similarity index 99% rename from examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java rename to demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java index 60ebe22aa2e..c89fda2c2bd 100644 --- a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java +++ b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java @@ -38,7 +38,6 @@ import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Utf8StringBuilder; import org.eclipse.jetty.util.ajax.JSON; -import org.eclipse.jetty.util.ssl.SslContextFactory; /** * Servlet implementation class AsyncRESTServlet. diff --git a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java b/demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java similarity index 100% rename from examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java rename to demos/demo-async-rest/demo-async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java diff --git a/examples/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html b/demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html similarity index 100% rename from examples/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html rename to demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/resources/asyncrest.html diff --git a/examples/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/green.png b/demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/resources/asyncrest/green.png similarity index 100% rename from examples/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/green.png rename to demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/resources/asyncrest/green.png diff --git a/examples/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/red.png b/demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/resources/asyncrest/red.png similarity index 100% rename from examples/async-rest/async-rest-jar/src/main/resources/META-INF/resources/asyncrest/red.png rename to demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/resources/asyncrest/red.png diff --git a/examples/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml b/demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/web-fragment.xml similarity index 100% rename from examples/async-rest/async-rest-jar/src/main/resources/META-INF/web-fragment.xml rename to demos/demo-async-rest/demo-async-rest-jar/src/main/resources/META-INF/web-fragment.xml diff --git a/examples/async-rest/async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml similarity index 62% rename from examples/async-rest/async-rest-server/pom.xml rename to demos/demo-async-rest/demo-async-rest-server/pom.xml index 6e08928ad41..aecc1c1430c 100644 --- a/examples/async-rest/async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -1,18 +1,17 @@ - org.eclipse.jetty - example-async-rest + org.eclipse.jetty.demos + demo-async-rest-parent 10.0.0-SNAPSHOT 4.0.0 - org.eclipse.jetty.example-async-rest - example-async-rest-server + demo-async-rest-server jar - Example Async Rest :: Server + Demo Async Rest :: Server - ${project.parent.groupId}.examples.async.rest.server + ${project.parent.groupId}.async.rest.server diff --git a/examples/async-rest/async-rest-server/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServer.java b/demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServer.java similarity index 100% rename from examples/async-rest/async-rest-server/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServer.java rename to demos/demo-async-rest/demo-async-rest-server/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServer.java diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml similarity index 72% rename from examples/async-rest/async-rest-webapp/pom.xml rename to demos/demo-async-rest/demo-async-rest-webapp/pom.xml index 399ab7a53f2..1f14fadb4b5 100644 --- a/examples/async-rest/async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -1,15 +1,14 @@ - org.eclipse.jetty - example-async-rest + org.eclipse.jetty.demos + demo-async-rest-parent 10.0.0-SNAPSHOT 4.0.0 - org.eclipse.jetty.example-async-rest - example-async-rest-webapp + demo-async-rest-webapp war - Example Async Rest :: Webapp + Demo Async Rest :: Webapp async-rest @@ -26,8 +25,8 @@ compile - org.eclipse.jetty.example-async-rest - example-async-rest-jar + org.eclipse.jetty.demos + demo-async-rest-jar ${project.version} diff --git a/examples/async-rest/async-rest-webapp/src/main/config/modules/demo-async-rest.mod b/demos/demo-async-rest/demo-async-rest-webapp/src/main/config/modules/demo-async-rest.mod similarity index 60% rename from examples/async-rest/async-rest-webapp/src/main/config/modules/demo-async-rest.mod rename to demos/demo-async-rest/demo-async-rest-webapp/src/main/config/modules/demo-async-rest.mod index 784634883f9..0fc4a0ad6f7 100644 --- a/examples/async-rest/async-rest-webapp/src/main/config/modules/demo-async-rest.mod +++ b/demos/demo-async-rest/demo-async-rest-webapp/src/main/config/modules/demo-async-rest.mod @@ -11,5 +11,5 @@ webapp deploy [files] -maven://org.eclipse.jetty.example-async-rest/example-async-rest-webapp/${jetty.version}/war|webapps/demo-async-rest.war +maven://org.eclipse.jetty.examples/example-async-rest-webapp/${jetty.version}/war|webapps/demo-async-rest.war diff --git a/examples/async-rest/async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from examples/async-rest/async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF rename to demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/META-INF/MANIFEST.MF diff --git a/examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml rename to demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/web.xml b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from examples/async-rest/async-rest-webapp/src/main/webapp/WEB-INF/web.xml rename to demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/examples/async-rest/async-rest-webapp/src/main/webapp/index.html b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html similarity index 100% rename from examples/async-rest/async-rest-webapp/src/main/webapp/index.html rename to demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html diff --git a/examples/async-rest/pom.xml b/demos/demo-async-rest/pom.xml similarity index 57% rename from examples/async-rest/pom.xml rename to demos/demo-async-rest/pom.xml index 062104027f5..6d274b7f074 100644 --- a/examples/async-rest/pom.xml +++ b/demos/demo-async-rest/pom.xml @@ -1,20 +1,19 @@ - org.eclipse.jetty.examples - examples-parent + org.eclipse.jetty.demos + demos-parent 10.0.0-SNAPSHOT 4.0.0 - org.eclipse.jetty - example-async-rest + demo-async-rest-parent pom Example Async Rest - async-rest-jar - async-rest-webapp - async-rest-server + demo-async-rest-jar + demo-async-rest-webapp + demo-async-rest-server diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml similarity index 93% rename from tests/test-webapps/test-jaas-webapp/pom.xml rename to demos/demo-jaas-webapp/pom.xml index a718c4c71de..22ac92cd131 100644 --- a/tests/test-webapps/test-jaas-webapp/pom.xml +++ b/demos/demo-jaas-webapp/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - org.eclipse.jetty.tests - test-webapps-parent + org.eclipse.jetty.demos + demos-parent 10.0.0-SNAPSHOT - test-jaas-webapp + demo-jaas-webapp Jetty Tests :: WebApp :: JAAS war diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo-jaas.mod b/demos/demo-jaas-webapp/src/main/config/modules/demo-jaas.mod similarity index 89% rename from tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo-jaas.mod rename to demos/demo-jaas-webapp/src/main/config/modules/demo-jaas.mod index 53c149fac06..a27bf23cd1a 100644 --- a/tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo-jaas.mod +++ b/demos/demo-jaas-webapp/src/main/config/modules/demo-jaas.mod @@ -20,7 +20,7 @@ demo-realm basehome:modules/demo.d/demo-jaas.xml|webapps/demo-jaas.xml basehome:modules/demo.d/demo-login.conf|etc/demo-login.conf basehome:modules/demo.d/demo-login.properties|etc/demo-login.properties -maven://org.eclipse.jetty.tests/test-jaas-webapp/${jetty.version}/war|webapps/demo-jaas.war +maven://org.eclipse.jetty.demos/demo-jaas-webapp/${jetty.version}/war|webapps/demo-jaas.war [ini-template] # Enable security via jaas, and configure it diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo.d/demo-jaas.xml b/demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-jaas.xml similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo.d/demo-jaas.xml rename to demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-jaas.xml diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo.d/demo-login.conf b/demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-login.conf similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo.d/demo-login.conf rename to demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-login.conf diff --git a/tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo.d/demo-login.properties b/demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-login.properties similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/config/modules/demo.d/demo-login.properties rename to demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-login.properties diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml rename to demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/web.xml b/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/WEB-INF/web.xml rename to demos/demo-jaas-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/auth.html b/demos/demo-jaas-webapp/src/main/webapp/auth.html similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/auth.html rename to demos/demo-jaas-webapp/src/main/webapp/auth.html diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/authfail.html b/demos/demo-jaas-webapp/src/main/webapp/authfail.html similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/authfail.html rename to demos/demo-jaas-webapp/src/main/webapp/authfail.html diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/images/jetty_banner.gif b/demos/demo-jaas-webapp/src/main/webapp/images/jetty_banner.gif similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/images/jetty_banner.gif rename to demos/demo-jaas-webapp/src/main/webapp/images/jetty_banner.gif diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/images/small_powered_by.gif b/demos/demo-jaas-webapp/src/main/webapp/images/small_powered_by.gif similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/images/small_powered_by.gif rename to demos/demo-jaas-webapp/src/main/webapp/images/small_powered_by.gif diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html rename to demos/demo-jaas-webapp/src/main/webapp/index.html diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/login.html rename to demos/demo-jaas-webapp/src/main/webapp/login.html diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/logout.jsp b/demos/demo-jaas-webapp/src/main/webapp/logout.jsp similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/logout.jsp rename to demos/demo-jaas-webapp/src/main/webapp/logout.jsp diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/stylesheet.css b/demos/demo-jaas-webapp/src/main/webapp/stylesheet.css similarity index 100% rename from tests/test-webapps/test-jaas-webapp/src/main/webapp/stylesheet.css rename to demos/demo-jaas-webapp/src/main/webapp/stylesheet.css diff --git a/tests/test-webapps/test-jetty-webapp/jetty-chat.jmx b/demos/demo-jetty-webapp/jetty-chat.jmx similarity index 100% rename from tests/test-webapps/test-jetty-webapp/jetty-chat.jmx rename to demos/demo-jetty-webapp/jetty-chat.jmx diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml similarity index 78% rename from tests/test-webapps/test-jetty-webapp/pom.xml rename to demos/demo-jetty-webapp/pom.xml index 221a1b6abcb..bbadfe541c3 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -1,19 +1,18 @@ - org.eclipse.jetty.tests - test-webapps-parent + org.eclipse.jetty.demos + demos-parent 10.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.eclipse.jetty - test-jetty-webapp - Test :: Jetty Test Webapp + demo-jetty-webapp + Demo :: Jetty Test Webapp http://www.eclipse.org/jetty war - ${project.groupId}.tests.webapp + ${project.groupId}.webapp @@ -86,55 +85,7 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - - false - - - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty - jetty-servlets - ${project.version} - - - - 8087 - foo - 1 - - 222 - - - /test - ${project.build.directory}/work - - - - Test Realm - src/main/config/demo-base/etc/realm.properties - - - - - - - diff --git a/tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml rename to demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/assembly/web-bundle.xml b/demos/demo-jetty-webapp/src/main/assembly/web-bundle.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/assembly/web-bundle.xml rename to demos/demo-jetty-webapp/src/main/assembly/web-bundle.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo-jetty.mod b/demos/demo-jetty-webapp/src/main/config/modules/demo-jetty.mod similarity index 82% rename from tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo-jetty.mod rename to demos/demo-jetty-webapp/src/main/config/modules/demo-jetty.mod index bd324a427a0..6c07d6f5a22 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo-jetty.mod +++ b/demos/demo-jetty-webapp/src/main/config/modules/demo-jetty.mod @@ -22,5 +22,5 @@ demo-realm [files] webapps/demo-jetty.d/ basehome:modules/demo.d/demo-jetty.xml|webapps/demo-jetty.xml -maven://org.eclipse.jetty/test-jetty-webapp/${jetty.version}/war|webapps/demo-jetty.war basehome:modules/demo.d/demo-jetty-override-web.xml|webapps/demo-jetty.d/demo-jetty-override-web.xml +maven://org.eclipse.jetty.demos/demo-jetty-webapp/${jetty.version}/war|webapps/demo-jetty.war diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo-moved-context.mod b/demos/demo-jetty-webapp/src/main/config/modules/demo-moved-context.mod similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo-moved-context.mod rename to demos/demo-jetty-webapp/src/main/config/modules/demo-moved-context.mod diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo-rewrite.mod b/demos/demo-jetty-webapp/src/main/config/modules/demo-rewrite.mod similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo-rewrite.mod rename to demos/demo-jetty-webapp/src/main/config/modules/demo-rewrite.mod diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.d/demo-jetty-override-web.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-jetty-override-web.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.d/demo-jetty-override-web.xml rename to demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-jetty-override-web.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.d/demo-jetty.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-jetty.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.d/demo-jetty.xml rename to demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-jetty.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml rename to demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml rename to demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.d/override-web.xml b/demos/demo-jetty-webapp/src/main/config/webapps/test.d/override-web.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.d/override-web.xml rename to demos/demo-jetty-webapp/src/main/config/webapps/test.d/override-web.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.xml b/demos/demo-jetty-webapp/src/main/config/webapps/test.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/config/webapps/test.xml rename to demos/demo-jetty-webapp/src/main/config/webapps/test.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/AddListServletRequestListener.java b/demos/demo-jetty-webapp/src/main/java/com/acme/AddListServletRequestListener.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/AddListServletRequestListener.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/AddListServletRequestListener.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java b/demos/demo-jetty-webapp/src/main/java/com/acme/ChatServlet.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/ChatServlet.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/CookieDump.java b/demos/demo-jetty-webapp/src/main/java/com/acme/CookieDump.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/CookieDump.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/CookieDump.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Counter.java b/demos/demo-jetty-webapp/src/main/java/com/acme/Counter.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Counter.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/Counter.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Date2Tag.java b/demos/demo-jetty-webapp/src/main/java/com/acme/Date2Tag.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Date2Tag.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/Date2Tag.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/DateTag.java b/demos/demo-jetty-webapp/src/main/java/com/acme/DateTag.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/DateTag.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/DateTag.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/DispatchServlet.java b/demos/demo-jetty-webapp/src/main/java/com/acme/DispatchServlet.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/DispatchServlet.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/DispatchServlet.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java b/demos/demo-jetty-webapp/src/main/java/com/acme/Dump.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/Dump.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/HelloWorld.java b/demos/demo-jetty-webapp/src/main/java/com/acme/HelloWorld.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/HelloWorld.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/HelloWorld.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java b/demos/demo-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/LoginServlet.java b/demos/demo-jetty-webapp/src/main/java/com/acme/LoginServlet.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/LoginServlet.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/LoginServlet.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/RegTest.java b/demos/demo-jetty-webapp/src/main/java/com/acme/RegTest.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/RegTest.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/RegTest.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/RewriteServlet.java b/demos/demo-jetty-webapp/src/main/java/com/acme/RewriteServlet.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/RewriteServlet.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/RewriteServlet.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java b/demos/demo-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SessionDump.java b/demos/demo-jetty-webapp/src/main/java/com/acme/SessionDump.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SessionDump.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/SessionDump.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TagListener.java b/demos/demo-jetty-webapp/src/main/java/com/acme/TagListener.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TagListener.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/TagListener.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java b/demos/demo-jetty-webapp/src/main/java/com/acme/TestFilter.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestFilter.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/TestFilter.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestListener.java b/demos/demo-jetty-webapp/src/main/java/com/acme/TestListener.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestListener.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/TestListener.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestServlet.java b/demos/demo-jetty-webapp/src/main/java/com/acme/TestServlet.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestServlet.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/TestServlet.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java b/demos/demo-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java rename to demos/demo-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib.tld b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib.tld similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib.tld rename to demos/demo-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib.tld diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib2.tld b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib2.tld similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib2.tld rename to demos/demo-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib2.tld diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml rename to demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/tags/panel.tag b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/tags/panel.tag similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/tags/panel.tag rename to demos/demo-jetty-webapp/src/main/webapp/WEB-INF/tags/panel.tag diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml rename to demos/demo-jetty-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/auth.html b/demos/demo-jetty-webapp/src/main/webapp/auth.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/auth.html rename to demos/demo-jetty-webapp/src/main/webapp/auth.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/auth/file.txt b/demos/demo-jetty-webapp/src/main/webapp/auth/file.txt similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/auth/file.txt rename to demos/demo-jetty-webapp/src/main/webapp/auth/file.txt diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/auth/relax.txt b/demos/demo-jetty-webapp/src/main/webapp/auth/relax.txt similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/auth/relax.txt rename to demos/demo-jetty-webapp/src/main/webapp/auth/relax.txt diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/auth2/index.html b/demos/demo-jetty-webapp/src/main/webapp/auth2/index.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/auth2/index.html rename to demos/demo-jetty-webapp/src/main/webapp/auth2/index.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/cgi-bin/hello.sh b/demos/demo-jetty-webapp/src/main/webapp/cgi-bin/hello.sh similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/cgi-bin/hello.sh rename to demos/demo-jetty-webapp/src/main/webapp/cgi-bin/hello.sh diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/chat/index.html b/demos/demo-jetty-webapp/src/main/webapp/chat/index.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/chat/index.html rename to demos/demo-jetty-webapp/src/main/webapp/chat/index.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/d.txt b/demos/demo-jetty-webapp/src/main/webapp/d.txt similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/d.txt rename to demos/demo-jetty-webapp/src/main/webapp/d.txt diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/da.txt b/demos/demo-jetty-webapp/src/main/webapp/da.txt similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/da.txt rename to demos/demo-jetty-webapp/src/main/webapp/da.txt diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/da.txt.gz b/demos/demo-jetty-webapp/src/main/webapp/da.txt.gz similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/da.txt.gz rename to demos/demo-jetty-webapp/src/main/webapp/da.txt.gz diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/dat.txt b/demos/demo-jetty-webapp/src/main/webapp/dat.txt similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/dat.txt rename to demos/demo-jetty-webapp/src/main/webapp/dat.txt diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/data.txt b/demos/demo-jetty-webapp/src/main/webapp/data.txt similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/data.txt rename to demos/demo-jetty-webapp/src/main/webapp/data.txt diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/data.txt.gz b/demos/demo-jetty-webapp/src/main/webapp/data.txt.gz similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/data.txt.gz rename to demos/demo-jetty-webapp/src/main/webapp/data.txt.gz diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/error404.html b/demos/demo-jetty-webapp/src/main/webapp/error404.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/error404.html rename to demos/demo-jetty-webapp/src/main/webapp/error404.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/favicon.ico b/demos/demo-jetty-webapp/src/main/webapp/favicon.ico similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/favicon.ico rename to demos/demo-jetty-webapp/src/main/webapp/favicon.ico diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html b/demos/demo-jetty-webapp/src/main/webapp/index.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html rename to demos/demo-jetty-webapp/src/main/webapp/index.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/javax.websocket/index.html b/demos/demo-jetty-webapp/src/main/webapp/javax.websocket/index.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/javax.websocket/index.html rename to demos/demo-jetty-webapp/src/main/webapp/javax.websocket/index.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jetty_banner.gif b/demos/demo-jetty-webapp/src/main/webapp/jetty_banner.gif similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jetty_banner.gif rename to demos/demo-jetty-webapp/src/main/webapp/jetty_banner.gif diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/bean1.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/bean1.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/bean1.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/bean1.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/bean2.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/bean2.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/bean2.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/bean2.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/dump.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/dump.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/dump.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/dump.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/expr.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/expr.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/expr.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/expr.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/foo/foo.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/foo/foo.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/foo/foo.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/foo/foo.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/index.html b/demos/demo-jetty-webapp/src/main/webapp/jsp/index.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/index.html rename to demos/demo-jetty-webapp/src/main/webapp/jsp/index.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/jstl.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/jstl.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/jstl.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/jstl.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/tag.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/tag.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/tag.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/tag.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/tag2.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/tag2.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/tag2.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/tag2.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/tagfile.jsp b/demos/demo-jetty-webapp/src/main/webapp/jsp/tagfile.jsp similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/jsp/tagfile.jsp rename to demos/demo-jetty-webapp/src/main/webapp/jsp/tagfile.jsp diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/logon.html b/demos/demo-jetty-webapp/src/main/webapp/logon.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/logon.html rename to demos/demo-jetty-webapp/src/main/webapp/logon.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/logonError.html b/demos/demo-jetty-webapp/src/main/webapp/logonError.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/logonError.html rename to demos/demo-jetty-webapp/src/main/webapp/logonError.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/remote.html b/demos/demo-jetty-webapp/src/main/webapp/remote.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/remote.html rename to demos/demo-jetty-webapp/src/main/webapp/remote.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/rewrite/index.html b/demos/demo-jetty-webapp/src/main/webapp/rewrite/index.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/rewrite/index.html rename to demos/demo-jetty-webapp/src/main/webapp/rewrite/index.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/rewrite/info.html b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/rewrite/info.html rename to demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/small_powered_by.gif b/demos/demo-jetty-webapp/src/main/webapp/small_powered_by.gif similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/small_powered_by.gif rename to demos/demo-jetty-webapp/src/main/webapp/small_powered_by.gif diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/ws/index.html b/demos/demo-jetty-webapp/src/main/webapp/ws/index.html similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/ws/index.html rename to demos/demo-jetty-webapp/src/main/webapp/ws/index.html diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/ChatServletTest.java b/demos/demo-jetty-webapp/src/test/java/org/eclipse/jetty/ChatServletTest.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/ChatServletTest.java rename to demos/demo-jetty-webapp/src/test/java/org/eclipse/jetty/ChatServletTest.java diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/DispatchServletTest.java b/demos/demo-jetty-webapp/src/test/java/org/eclipse/jetty/DispatchServletTest.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/DispatchServletTest.java rename to demos/demo-jetty-webapp/src/test/java/org/eclipse/jetty/DispatchServletTest.java diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/demos/demo-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java rename to demos/demo-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java diff --git a/tests/test-webapps/test-jetty-webapp/src/test/resources/jetty-logging.properties b/demos/demo-jetty-webapp/src/test/resources/jetty-logging.properties similarity index 100% rename from tests/test-webapps/test-jetty-webapp/src/test/resources/jetty-logging.properties rename to demos/demo-jetty-webapp/src/test/resources/jetty-logging.properties diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml similarity index 90% rename from tests/test-webapps/test-jndi-webapp/pom.xml rename to demos/demo-jndi-webapp/pom.xml index 140cefd592d..249850a66f3 100644 --- a/tests/test-webapps/test-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -2,26 +2,18 @@ 4.0.0 - org.eclipse.jetty.tests - test-webapps-parent + org.eclipse.jetty.demos + demos-parent 10.0.0-SNAPSHOT - test-jndi-webapp - Jetty Tests :: WebApp :: JNDI + demo-jndi-webapp + Demo :: WebApp :: JNDI war ${project.groupId}.jndi - - org.apache.maven.plugins - maven-deploy-plugin - - - false - - maven-antrun-plugin diff --git a/tests/test-webapps/test-jndi-webapp/src/main/config/modules/demo-jndi.mod b/demos/demo-jndi-webapp/src/main/config/modules/demo-jndi.mod similarity index 90% rename from tests/test-webapps/test-jndi-webapp/src/main/config/modules/demo-jndi.mod rename to demos/demo-jndi-webapp/src/main/config/modules/demo-jndi.mod index 5ff39a756ab..4f60efefe41 100644 --- a/tests/test-webapps/test-jndi-webapp/src/main/config/modules/demo-jndi.mod +++ b/demos/demo-jndi-webapp/src/main/config/modules/demo-jndi.mod @@ -15,7 +15,7 @@ plus [files] basehome:modules/demo.d/demo-jndi.xml|webapps/demo-jndi.xml -maven://org.eclipse.jetty.tests/test-jndi-webapp/${jetty.version}/war|webapps/demo-jndi.war +maven://org.eclipse.jetty.demos/demo-jndi-webapp/${jetty.version}/war|webapps/demo-jndi.war maven://org.eclipse.jetty.tests/test-mock-resources/${jetty.version}/jar|lib/ext/test-mock-resources-${jetty.version}.jar maven://org.eclipse.jetty.orbit/javax.mail.glassfish/1.4.1.v201005082020/jar|lib/ext/javax.mail.glassfish-1.4.1.v201005082020.jar maven://jakarta.transaction/jakarta.transaction-api/1.3.2/jar|lib/ext/jakarta.transaction-api-1.3.2.jar diff --git a/tests/test-webapps/test-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml b/demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml rename to demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml diff --git a/tests/test-webapps/test-jndi-webapp/src/main/java/com/acme/JNDITest.java b/demos/demo-jndi-webapp/src/main/java/com/acme/JNDITest.java similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/java/com/acme/JNDITest.java rename to demos/demo-jndi-webapp/src/main/java/com/acme/JNDITest.java diff --git a/tests/test-webapps/test-jndi-webapp/src/main/templates/env-definitions.xml b/demos/demo-jndi-webapp/src/main/templates/env-definitions.xml similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/templates/env-definitions.xml rename to demos/demo-jndi-webapp/src/main/templates/env-definitions.xml diff --git a/tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml rename to demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml diff --git a/tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/templates/plugin-context-header.xml rename to demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml rename to demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml rename to demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/web.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/web.xml rename to demos/demo-jndi-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/images/jetty_banner.gif b/demos/demo-jndi-webapp/src/main/webapp/images/jetty_banner.gif similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/webapp/images/jetty_banner.gif rename to demos/demo-jndi-webapp/src/main/webapp/images/jetty_banner.gif diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/images/small_powered_by.gif b/demos/demo-jndi-webapp/src/main/webapp/images/small_powered_by.gif similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/webapp/images/small_powered_by.gif rename to demos/demo-jndi-webapp/src/main/webapp/images/small_powered_by.gif diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html rename to demos/demo-jndi-webapp/src/main/webapp/index.html diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/stylesheet.css b/demos/demo-jndi-webapp/src/main/webapp/stylesheet.css similarity index 100% rename from tests/test-webapps/test-jndi-webapp/src/main/webapp/stylesheet.css rename to demos/demo-jndi-webapp/src/main/webapp/stylesheet.css diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml similarity index 85% rename from tests/test-webapps/test-proxy-webapp/pom.xml rename to demos/demo-proxy-webapp/pom.xml index 5fc4a70de4b..334d868f3c3 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -1,14 +1,13 @@ - org.eclipse.jetty.tests - test-webapps-parent + org.eclipse.jetty.demos + demos-parent 10.0.0-SNAPSHOT - ../pom.xml 4.0.0 - test-proxy-webapp - Test :: Jetty Proxy Webapp + demo-proxy-webapp + Demo :: Jetty Proxy Webapp war ${project.groupId}.proxy @@ -23,14 +22,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - - false - - diff --git a/tests/test-webapps/test-proxy-webapp/src/main/config/modules/demo-proxy.mod b/demos/demo-proxy-webapp/src/main/config/modules/demo-proxy.mod similarity index 76% rename from tests/test-webapps/test-proxy-webapp/src/main/config/modules/demo-proxy.mod rename to demos/demo-proxy-webapp/src/main/config/modules/demo-proxy.mod index 2adc3352fce..4f96bd24eed 100644 --- a/tests/test-webapps/test-proxy-webapp/src/main/config/modules/demo-proxy.mod +++ b/demos/demo-proxy-webapp/src/main/config/modules/demo-proxy.mod @@ -11,4 +11,4 @@ webapp deploy [files] -maven://org.eclipse.jetty.tests/test-proxy-webapp/${jetty.version}/war|webapps/demo-proxy.war +maven://org.eclipse.jetty.demos/demo-proxy-webapp/${jetty.version}/war|webapps/demo-proxy.war diff --git a/tests/test-webapps/test-proxy-webapp/src/main/webapp/META-INF/MANIFEST.MF b/demos/demo-proxy-webapp/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from tests/test-webapps/test-proxy-webapp/src/main/webapp/META-INF/MANIFEST.MF rename to demos/demo-proxy-webapp/src/main/webapp/META-INF/MANIFEST.MF diff --git a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml rename to demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from tests/test-webapps/test-proxy-webapp/src/main/webapp/WEB-INF/web.xml rename to demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java b/demos/demo-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java similarity index 100% rename from tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java rename to demos/demo-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/demos/demo-spec-webapp/pom.xml similarity index 93% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml rename to demos/demo-spec-webapp/pom.xml index 672adbdb766..1677d19ef69 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml +++ b/demos/demo-spec-webapp/pom.xml @@ -2,27 +2,18 @@ 4.0.0 - org.eclipse.jetty.tests - test-servlet-spec-parent + org.eclipse.jetty.demos + demos-parent 10.0.0-SNAPSHOT - Jetty Tests :: Webapps :: Spec Webapp - test-spec-webapp + Demo :: Spec Webapp + demo-spec-webapp war ${project.groupId}.spec - - org.apache.maven.plugins - maven-deploy-plugin - - - false - - - org.apache.maven.plugins maven-assembly-plugin @@ -72,8 +63,7 @@ war - org.eclipse.jetty.tests.test-spec-webapp - Test Webapp for Servlet 3.1 Features + Test Webapp for Servlet 4.0 Features javax.transaction*;version="[1.1,1.3)", javax.servlet*;version="[2.6,4.1)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", com.acme;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/etc/realm.properties b/demos/demo-spec-webapp/src/etc/realm.properties similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/etc/realm.properties rename to demos/demo-spec-webapp/src/etc/realm.properties diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/assembly/web-bundle.xml b/demos/demo-spec-webapp/src/main/assembly/web-bundle.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/assembly/web-bundle.xml rename to demos/demo-spec-webapp/src/main/assembly/web-bundle.xml diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/config/modules/demo-spec.mod b/demos/demo-spec-webapp/src/main/config/modules/demo-spec.mod similarity index 84% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/config/modules/demo-spec.mod rename to demos/demo-spec-webapp/src/main/config/modules/demo-spec.mod index f70a6cff564..9f4be92cea3 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/config/modules/demo-spec.mod +++ b/demos/demo-spec-webapp/src/main/config/modules/demo-spec.mod @@ -18,4 +18,4 @@ demo-jndi [files] basehome:modules/demo.d/demo-spec.xml|webapps/demo-spec.xml -maven://org.eclipse.jetty.tests/test-spec-webapp/${jetty.version}/war|webapps/demo-spec.war +maven://org.eclipse.jetty.demos/demo-spec-webapp/${jetty.version}/war|webapps/demo-spec.war diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml b/demos/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml rename to demos/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AnnotatedListener.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/AnnotatedListener.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AnnotatedListener.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/AnnotatedListener.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AnnotationTest.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/AnnotationTest.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AnnotationTest.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/AnnotationTest.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AsyncListenerServlet.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/AsyncListenerServlet.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/AsyncListenerServlet.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/AsyncListenerServlet.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/Bar.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/Bar.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/Bar.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/Bar.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/ClassLoaderServlet.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/ClassLoaderServlet.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/ClassLoaderServlet.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/ClassLoaderServlet.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/MultiPartTest.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/MultiPartTest.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/MultiPartTest.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/MultiPartTest.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/RoleAnnotationTest.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/RoleAnnotationTest.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/RoleAnnotationTest.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/RoleAnnotationTest.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/SecuredServlet.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/SecuredServlet.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/SecuredServlet.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/SecuredServlet.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/TestListener.java b/demos/demo-spec-webapp/src/main/java/com/acme/test/TestListener.java similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/test/TestListener.java rename to demos/demo-spec-webapp/src/main/java/com/acme/test/TestListener.java diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/annotations-context-header.xml b/demos/demo-spec-webapp/src/main/templates/annotations-context-header.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/annotations-context-header.xml rename to demos/demo-spec-webapp/src/main/templates/annotations-context-header.xml diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/env-definitions.xml b/demos/demo-spec-webapp/src/main/templates/env-definitions.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/env-definitions.xml rename to demos/demo-spec-webapp/src/main/templates/env-definitions.xml diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-spec-webapp/src/main/templates/plugin-context-header.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/templates/plugin-context-header.xml rename to demos/demo-spec-webapp/src/main/templates/plugin-context-header.xml diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml rename to demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml rename to demos/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/web.xml b/demos/demo-spec-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/WEB-INF/web.xml rename to demos/demo-spec-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/authfail.html b/demos/demo-spec-webapp/src/main/webapp/authfail.html similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/authfail.html rename to demos/demo-spec-webapp/src/main/webapp/authfail.html diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/dynamic.jsp b/demos/demo-spec-webapp/src/main/webapp/dynamic.jsp similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/dynamic.jsp rename to demos/demo-spec-webapp/src/main/webapp/dynamic.jsp diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/images/jetty_banner.gif b/demos/demo-spec-webapp/src/main/webapp/images/jetty_banner.gif similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/images/jetty_banner.gif rename to demos/demo-spec-webapp/src/main/webapp/images/jetty_banner.gif diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/images/small_powered_by.gif b/demos/demo-spec-webapp/src/main/webapp/images/small_powered_by.gif similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/images/small_powered_by.gif rename to demos/demo-spec-webapp/src/main/webapp/images/small_powered_by.gif diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html b/demos/demo-spec-webapp/src/main/webapp/index.html similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html rename to demos/demo-spec-webapp/src/main/webapp/index.html diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/login.html b/demos/demo-spec-webapp/src/main/webapp/login.html similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/login.html rename to demos/demo-spec-webapp/src/main/webapp/login.html diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/logout.jsp b/demos/demo-spec-webapp/src/main/webapp/logout.jsp similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/logout.jsp rename to demos/demo-spec-webapp/src/main/webapp/logout.jsp diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/stylesheet.css b/demos/demo-spec-webapp/src/main/webapp/stylesheet.css similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/stylesheet.css rename to demos/demo-spec-webapp/src/main/webapp/stylesheet.css diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/test/jetty-plugin-env.xml b/demos/demo-spec-webapp/src/test/jetty-plugin-env.xml similarity index 100% rename from tests/test-webapps/test-servlet-spec/test-spec-webapp/src/test/jetty-plugin-env.xml rename to demos/demo-spec-webapp/src/test/jetty-plugin-env.xml diff --git a/demos/pom.xml b/demos/pom.xml new file mode 100644 index 00000000000..82c5ae0d787 --- /dev/null +++ b/demos/pom.xml @@ -0,0 +1,27 @@ + + + + org.eclipse.jetty + jetty-project + 10.0.0-SNAPSHOT + + + 4.0.0 + org.eclipse.jetty.demos + demos-parent + Jetty Demos :: Parent + pom + + + true + + + + demo-async-rest + demo-jaas-webapp + demo-jndi-webapp + demo-jetty-webapp + demo-proxy-webapp + demo-spec-webapp + + diff --git a/examples/pom.xml b/examples/pom.xml index 51879170c77..c8d83e55f0a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -54,11 +54,6 @@ - - async-rest embedded diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml deleted file mode 100644 index 4cadc3756dc..00000000000 --- a/jetty-distribution/pom.xml +++ /dev/null @@ -1,426 +0,0 @@ - - - org.eclipse.jetty - jetty-project - 10.0.0-SNAPSHOT - - 4.0.0 - jetty-distribution - Jetty :: Distribution Assemblies - pom - - - ${project.build.directory}/distribution - ${project.build.directory}/home - ${assembly-directory}/jetty-home - ${assembly-directory}/demo-base - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-base-assembly-tree - prepare-package - - copy-resources - - - false - true - ${assembly-directory} - - - ${basedir}/src/main/resources - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - unpack-jetty-home - prepare-package - - unpack - - - - - org.eclipse.jetty - jetty-home - ${project.version} - tar.gz - true - ${temp-home-directory} - - - META-INF/** - - - - copy - prepare-package - - copy - - - - - org.eclipse.jetty - test-jetty-webapp - ${project.version} - war - true - ** - ${base-directory}/webapps - test.war - - - org.eclipse.jetty.tests - test-jaas-webapp - ${project.version} - war - true - ** - ${base-directory}/webapps - test-jaas.war - - - org.eclipse.jetty.tests - test-jndi-webapp - ${project.version} - war - true - ** - ${base-directory}/webapps - test-jndi.war - - - org.eclipse.jetty.tests - test-spec-webapp - ${project.version} - war - true - ** - ${base-directory}/webapps - test-spec.war - - - org.eclipse.jetty.tests - test-proxy-webapp - ${project.version} - war - true - ** - ${base-directory}/webapps - javadoc-proxy.war - - - org.eclipse.jetty.example-async-rest - example-async-rest-webapp - ${project.version} - war - true - ** - ${base-directory}/webapps - async-rest.war - - - - - - - unpack-test-webapp-config - prepare-package - - unpack - - - - - org.eclipse.jetty - test-jetty-webapp - ${project.version} - config - jar - true - ${base-directory} - - - META-INF/** - - - - - unpack-test-jaas-config - prepare-package - - unpack - - - - - org.eclipse.jetty.tests - test-jaas-webapp - ${project.version} - config - jar - true - ${base-directory} - - - META-INF/** - - - - - unpack-test-jndi-config - prepare-package - - unpack - - - - - org.eclipse.jetty.tests - test-jndi-webapp - ${project.version} - config - jar - true - ${base-directory} - - - META-INF/** - - - - - unpack-test-spec-config - prepare-package - - unpack - - - - - org.eclipse.jetty.tests - test-spec-webapp - ${project.version} - config - jar - true - ${base-directory} - - - META-INF/** - - - - unpack-documentation - prepare-package - - unpack - - - - - org.eclipse.jetty - jetty-documentation - ${project.version} - html - zip - true - ${base-directory}/webapps/doc - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - populate distribution from home - prepare-package - - run - - - - - - - - - - - - - - - - - - set jetty.sh - prepare-package - - run - - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - - setup demo-base-startd - package - - org.eclipse.jetty.start.Main - - jetty.home=${home-directory} - jetty.base=${base-directory} - --create-startd - --add-module=server,requestlog,deploy,websocket,ext,resources,client,annotations,jndi,servlets,jsp,jstl,http,https,demo - - - - java - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - src/main/assembly/jetty-assembly.xml - - posix - false - - - - package - - single - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - true - - - - - org.codehaus.mojo - findbugs-maven-plugin - - true - - - - - - - - - org.eclipse.jetty - jetty-home - ${project.version} - tar.gz - true - - - - org.eclipse.jetty - test-jetty-webapp - war - ${project.version} - true - - - org.eclipse.jetty.tests - test-jaas-webapp - ${project.version} - war - true - - - org.eclipse.jetty.tests - test-jndi-webapp - ${project.version} - war - true - - - org.eclipse.jetty.tests - test-spec-webapp - ${project.version} - war - true - - - org.eclipse.jetty.tests - test-proxy-webapp - war - ${project.version} - true - - - org.eclipse.jetty.example-async-rest - example-async-rest-webapp - ${project.version} - war - true - - - - org.eclipse.jetty - jetty-documentation - ${project.version} - html - zip - true - - - diff --git a/jetty-distribution/src/main/assembly/jetty-assembly.xml b/jetty-distribution/src/main/assembly/jetty-assembly.xml deleted file mode 100644 index 7a3fe1c4da0..00000000000 --- a/jetty-distribution/src/main/assembly/jetty-assembly.xml +++ /dev/null @@ -1,50 +0,0 @@ - - assembly - - tar.gz - zip - - - - ${assembly-directory} - - - ** - - - **/META-INF/** - *-config.jar - - **/.DS_Store - **/Thumbs.db - **/desktop.ini - - **/*~ - **/*.bak - **/*.backup - **/*.old - **/*.swp - **/*.debug - **/*.dump - **/*.log - **/~* - - **/*.orig - **/*.diff - **/*.patch - **/.gitignore - - **/*.iml - **/*.ipr - **/*.iws - **/*.idea - **/.classpath - **/.project - **/.settings - - **/*.versionsBackup - **/*.releaseBackup - - - - diff --git a/jetty-distribution/src/main/assembly/jetty-src.xml b/jetty-distribution/src/main/assembly/jetty-src.xml deleted file mode 100644 index 37657e368a0..00000000000 --- a/jetty-distribution/src/main/assembly/jetty-src.xml +++ /dev/null @@ -1,48 +0,0 @@ - - src - - zip - - - - ${basedir}/../ - - - **/** - - - **/target/** - - **/.DS_Store - **/Thumbs.db - **/desktop.ini - - **/*~ - **/*.bak - **/*.backup - **/*.old - **/*.swp - **/*.debug - **/*.dump - **/*.log - **/~* - - **/*.orig - **/*.diff - **/*.patch - **/.gitignore - - **/*.iml - **/*.ipr - **/*.iws - **/*.idea - **/.classpath - **/.project - **/.settings - - **/*.versionsBackup - **/*.releaseBackup - - - - diff --git a/jetty-distribution/src/main/assembly/site-component.xml b/jetty-distribution/src/main/assembly/site-component.xml deleted file mode 100644 index c87eab9547d..00000000000 --- a/jetty-distribution/src/main/assembly/site-component.xml +++ /dev/null @@ -1,18 +0,0 @@ - - site-component - - jar - - - - ${basedir}/target/dist-src - jetty-distribution-${version}-site-component - - target/site/** - README** - VERSION** - LICENSES/** - - - - \ No newline at end of file diff --git a/jetty-distribution/src/main/resources/README.txt b/jetty-distribution/src/main/resources/README.txt deleted file mode 100644 index 79a8c3bbdbd..00000000000 --- a/jetty-distribution/src/main/resources/README.txt +++ /dev/null @@ -1,49 +0,0 @@ -RUNNING JETTY - -Assuming unix commands the general form of running jetty is: - - $ JETTY_HOME=/path/to/jetty-home - $ cd /path/to/jetty-base - $ java -jar $JETTY_HOME/start.jar - -To see all the options to the start command: - $ java -jar $JETTY_HOME/start.jar --help - - -RUNNING THE DEMO_BASE - -To see the configuration of the included demo-base - $ cd demo-base - $ java -jar $JETTY_HOME/start.jar --list-config - -To run the demo (from the demo-base directory): - $ java -jar $JETTY_HOME/start.jar - - -RUNNING A WAR - -This distribution contains a jetty-base directory with a minimal configuration. -To enable http and webapp deployment for this base - $ JETTY_HOME=$PWD/jetty-home - $ cd jetty-base - $ java -jar $JETTY_HOME/start.jar --add-to-start=http,deploy - $ cp /path/to/mywebapp.war webapps - -To see what other modules can be configured: - $ java -jar $JETTY_HOME/start.jar --list-modules - -This war in this base can then be run with - $ java -jar $JETTY_HOME/start.jar - - -CREATING A NEW JETTY BASE - -A new Jetty base can be created anywhere on the file system and with any name: - $ mkdir /path/to/my-jetty-base - $ cd /path/to/my-jetty-base - $ java -jar $JETTY_HOME/start.jar --create-startd --add-to-start=server,http,deploy - $ cp /path/to/mywebapp.war webapps - -This base can then be run with - - $ java -jar $JETTY_HOME/start.jar diff --git a/jetty-distribution/src/main/resources/demo-base/webapps/README.TXT b/jetty-distribution/src/main/resources/demo-base/webapps/README.TXT deleted file mode 100644 index d6fb93b8996..00000000000 --- a/jetty-distribution/src/main/resources/demo-base/webapps/README.TXT +++ /dev/null @@ -1,12 +0,0 @@ - -This directory is scanned by the demo WebAppDeployer provider -created in the etc/jetty-demo.xml file and enabled by the -start.d/900-demo.ini file. - -To disable the demo, either remove the start.d/900-demo.ini or issue the following command: - - java -jar start.jar --disable=demo - - -For normal webapp deployment, use the webapps directory. - diff --git a/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/images/jetty-header.jpg b/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/images/jetty-header.jpg deleted file mode 100644 index f40c3644cc0..00000000000 Binary files a/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/images/jetty-header.jpg and /dev/null differ diff --git a/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/images/webtide_logo.jpg b/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/images/webtide_logo.jpg deleted file mode 100644 index b949919f08b..00000000000 Binary files a/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/images/webtide_logo.jpg and /dev/null differ diff --git a/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html b/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html deleted file mode 100644 index bd3a1af8027..00000000000 --- a/jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - -Welcome to Jetty-9 - - - - - - -
-

Welcome to Jetty 10

- -

- The Jetty project is a 100% Java Servlet - Container which supports asynchronous server and client - implementations of the HTTP, - Websocket and HTTP/2 protocols. The - project is 100% Open Source and hosted by the Eclipse Foundation at http://www.eclipse.org/jetty. -

-
- - - -
-

Jetty Blog

-