From 020f12e9488935a7a9c6d9a7d48157673a6147ab Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 26 May 2009 01:16:27 +0000 Subject: [PATCH] renamed non runtime modules git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@283 7e9141cc-0065-0410-87d8-b60c137991c4 --- {jetty-distribution => distribution}/pom.xml | 6 +++--- .../src/main/assembly/jetty-src.xml | 0 .../src/main/assembly/jetty.xml | 0 .../src/main/assembly/site-component.xml | 0 .../src/main/resources/README.txt | 0 .../main/resources/bin/build_release_bundles.sh | 0 .../src/main/resources/bin/jetty-xinetd.sh | 0 .../src/main/resources/bin/jetty.sh | 0 .../main/resources/contexts-available/README.TXT | 0 .../src/main/resources/contexts/README.TXT | 0 .../src/main/resources/contexts/javadoc.xml | 0 .../src/main/resources/javadoc/contents.html | 0 .../src/main/resources/resources/jetty.policy | 0 .../main/resources/resources/log4j.properties | 0 .../pom.xml | 4 ++-- .../org/eclipse/jetty/embedded/FileServer.java | 0 .../org/eclipse/jetty/embedded/LikeJettyXml.java | 0 .../eclipse/jetty/embedded/ManyConnectors.java | 0 .../org/eclipse/jetty/embedded/ManyContexts.java | 0 .../org/eclipse/jetty/embedded/ManyHandlers.java | 0 .../jetty/embedded/ManyServletContexts.java | 0 .../eclipse/jetty/embedded/MinimalServlets.java | 0 .../org/eclipse/jetty/embedded/OneContext.java | 0 .../org/eclipse/jetty/embedded/OneHandler.java | 0 .../jetty/embedded/OneServletContext.java | 0 .../org/eclipse/jetty/embedded/OneWebApp.java | 0 jetty-integrations/pom.xml | 15 --------------- jetty-rewrite/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-webapp/pom.xml | 4 ++-- pom.xml | 13 ++++++------- {jetty-start => start}/pom.xml | 6 +++--- .../java/org/eclipse/jetty/start/Classpath.java | 0 .../org/eclipse/jetty/start/CustomPolicy.java | 0 .../main/java/org/eclipse/jetty/start/Main.java | 0 .../java/org/eclipse/jetty/start/Monitor.java | 0 .../main/java/org/eclipse/jetty/start/README.txt | 0 .../java/org/eclipse/jetty/start/Version.java | 0 .../org/eclipse/jetty/start/start.config | 0 .../pom.xml | 4 ++-- .../org/eclipse/jetty/testing/HttpTester.java | 0 .../org/eclipse/jetty/testing/ServletTester.java | 0 .../eclipse/jetty/testing/HttpTesterTest.java | 0 .../org/eclipse/jetty/testing/ServletTest.java | 0 .../jetty-chat.jmx | 0 {jetty-test-webapp => test-jetty-webapp}/pom.xml | 6 +++--- .../src/main/config/contexts/demo.xml | 0 .../main/config/contexts/test.d/override-web.xml | 0 .../src/main/config/contexts/test.xml | 0 .../src/main/java/com/acme/ChatServlet.java | 0 .../src/main/java/com/acme/CookieDump.java | 0 .../src/main/java/com/acme/Counter.java | 0 .../src/main/java/com/acme/DispatchServlet.java | 0 .../src/main/java/com/acme/Dump.java | 0 .../src/main/java/com/acme/HelloWorld.java | 0 .../src/main/java/com/acme/SessionDump.java | 0 .../src/main/java/com/acme/TagListener.java | 0 .../src/main/java/com/acme/TestFilter.java | 0 .../src/main/java/com/acme/TestListener.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../src/main/webapp/WEB-INF/acme-taglib.tld | 0 .../src/main/webapp/WEB-INF/acme-taglib2.tld | 0 .../src/main/webapp/WEB-INF/jetty-web.xml | 0 .../src/main/webapp/WEB-INF/tags/CVS/Entries | 0 .../src/main/webapp/WEB-INF/tags/CVS/Repository | 0 .../src/main/webapp/WEB-INF/tags/CVS/Root | 0 .../src/main/webapp/WEB-INF/tags/panel.tag | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/auth/file.txt | 0 .../src/main/webapp/auth/relax.txt | 0 .../src/main/webapp/cgi-bin/hello.sh | 0 .../src/main/webapp/d.txt | 0 .../src/main/webapp/da.txt | 0 .../src/main/webapp/da.txt.gz | Bin .../src/main/webapp/dat.txt | 0 .../src/main/webapp/data.txt | 0 .../src/main/webapp/data.txt.gz | Bin .../src/main/webapp/error404.html | 0 .../src/main/webapp/favicon.ico | Bin .../src/main/webapp/index.html | 0 .../src/main/webapp/jetty_banner.gif | Bin .../src/main/webapp/logon.html | 0 .../src/main/webapp/logonError.html | 0 .../src/main/webapp/rewrite.html | 0 .../test/java/com/acme/DispatchServletTest.java | 0 .../test/java/org/eclipse/jetty/DemoServer.java | 0 86 files changed, 23 insertions(+), 39 deletions(-) rename {jetty-distribution => distribution}/pom.xml (99%) rename {jetty-distribution => distribution}/src/main/assembly/jetty-src.xml (100%) rename {jetty-distribution => distribution}/src/main/assembly/jetty.xml (100%) rename {jetty-distribution => distribution}/src/main/assembly/site-component.xml (100%) rename {jetty-distribution => distribution}/src/main/resources/README.txt (100%) rename {jetty-distribution => distribution}/src/main/resources/bin/build_release_bundles.sh (100%) rename {jetty-distribution => distribution}/src/main/resources/bin/jetty-xinetd.sh (100%) rename {jetty-distribution => distribution}/src/main/resources/bin/jetty.sh (100%) rename {jetty-distribution => distribution}/src/main/resources/contexts-available/README.TXT (100%) rename {jetty-distribution => distribution}/src/main/resources/contexts/README.TXT (100%) rename {jetty-distribution => distribution}/src/main/resources/contexts/javadoc.xml (100%) rename {jetty-distribution => distribution}/src/main/resources/javadoc/contents.html (100%) rename {jetty-distribution => distribution}/src/main/resources/resources/jetty.policy (100%) rename {jetty-distribution => distribution}/src/main/resources/resources/log4j.properties (100%) rename {jetty-embedded-examples => example-jetty-embedded}/pom.xml (90%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/FileServer.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/OneContext.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/OneHandler.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java (100%) rename {jetty-embedded-examples => example-jetty-embedded}/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java (100%) delete mode 100644 jetty-integrations/pom.xml rename {jetty-start => start}/pom.xml (86%) rename {jetty-start => start}/src/main/java/org/eclipse/jetty/start/Classpath.java (100%) rename {jetty-start => start}/src/main/java/org/eclipse/jetty/start/CustomPolicy.java (100%) rename {jetty-start => start}/src/main/java/org/eclipse/jetty/start/Main.java (100%) rename {jetty-start => start}/src/main/java/org/eclipse/jetty/start/Monitor.java (100%) rename {jetty-start => start}/src/main/java/org/eclipse/jetty/start/README.txt (100%) rename {jetty-start => start}/src/main/java/org/eclipse/jetty/start/Version.java (100%) rename {jetty-start => start}/src/main/resources/org/eclipse/jetty/start/start.config (100%) rename {jetty-servlet-tester => test-jetty-servlet}/pom.xml (89%) rename {jetty-servlet-tester => test-jetty-servlet}/src/main/java/org/eclipse/jetty/testing/HttpTester.java (100%) rename {jetty-servlet-tester => test-jetty-servlet}/src/main/java/org/eclipse/jetty/testing/ServletTester.java (100%) rename {jetty-servlet-tester => test-jetty-servlet}/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java (100%) rename {jetty-servlet-tester => test-jetty-servlet}/src/test/java/org/eclipse/jetty/testing/ServletTest.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/jetty-chat.jmx (100%) rename {jetty-test-webapp => test-jetty-webapp}/pom.xml (97%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/config/contexts/demo.xml (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/config/contexts/test.d/override-web.xml (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/config/contexts/test.xml (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/ChatServlet.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/CookieDump.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/Counter.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/DispatchServlet.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/Dump.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/HelloWorld.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/SessionDump.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/TagListener.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/TestFilter.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/java/com/acme/TestListener.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/WEB-INF/acme-taglib.tld (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/WEB-INF/acme-taglib2.tld (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/WEB-INF/jetty-web.xml (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/WEB-INF/tags/CVS/Entries (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/WEB-INF/tags/CVS/Repository (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/WEB-INF/tags/CVS/Root (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/WEB-INF/tags/panel.tag (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/WEB-INF/web.xml (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/auth/file.txt (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/auth/relax.txt (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/cgi-bin/hello.sh (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/d.txt (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/da.txt (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/da.txt.gz (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/dat.txt (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/data.txt (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/data.txt.gz (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/error404.html (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/favicon.ico (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/index.html (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/jetty_banner.gif (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/logon.html (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/logonError.html (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/main/webapp/rewrite.html (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/test/java/com/acme/DispatchServletTest.java (100%) rename {jetty-test-webapp => test-jetty-webapp}/src/test/java/org/eclipse/jetty/DemoServer.java (100%) diff --git a/jetty-distribution/pom.xml b/distribution/pom.xml similarity index 99% rename from jetty-distribution/pom.xml rename to distribution/pom.xml index fa93b216ec9..8fd63c2523b 100644 --- a/jetty-distribution/pom.xml +++ b/distribution/pom.xml @@ -83,7 +83,7 @@ org.eclipse.jetty - jetty-test-webapp + test-jetty-webapp ${project.version} config jar @@ -343,7 +343,7 @@ org.eclipse.jetty - jetty-test-webapp + test-jetty-webapp ${project.version} war true @@ -505,7 +505,7 @@ org.eclipse.jetty - jetty-test-webapp + test-jetty-webapp war ${project.version} diff --git a/jetty-distribution/src/main/assembly/jetty-src.xml b/distribution/src/main/assembly/jetty-src.xml similarity index 100% rename from jetty-distribution/src/main/assembly/jetty-src.xml rename to distribution/src/main/assembly/jetty-src.xml diff --git a/jetty-distribution/src/main/assembly/jetty.xml b/distribution/src/main/assembly/jetty.xml similarity index 100% rename from jetty-distribution/src/main/assembly/jetty.xml rename to distribution/src/main/assembly/jetty.xml diff --git a/jetty-distribution/src/main/assembly/site-component.xml b/distribution/src/main/assembly/site-component.xml similarity index 100% rename from jetty-distribution/src/main/assembly/site-component.xml rename to distribution/src/main/assembly/site-component.xml diff --git a/jetty-distribution/src/main/resources/README.txt b/distribution/src/main/resources/README.txt similarity index 100% rename from jetty-distribution/src/main/resources/README.txt rename to distribution/src/main/resources/README.txt diff --git a/jetty-distribution/src/main/resources/bin/build_release_bundles.sh b/distribution/src/main/resources/bin/build_release_bundles.sh similarity index 100% rename from jetty-distribution/src/main/resources/bin/build_release_bundles.sh rename to distribution/src/main/resources/bin/build_release_bundles.sh diff --git a/jetty-distribution/src/main/resources/bin/jetty-xinetd.sh b/distribution/src/main/resources/bin/jetty-xinetd.sh similarity index 100% rename from jetty-distribution/src/main/resources/bin/jetty-xinetd.sh rename to distribution/src/main/resources/bin/jetty-xinetd.sh diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/distribution/src/main/resources/bin/jetty.sh similarity index 100% rename from jetty-distribution/src/main/resources/bin/jetty.sh rename to distribution/src/main/resources/bin/jetty.sh diff --git a/jetty-distribution/src/main/resources/contexts-available/README.TXT b/distribution/src/main/resources/contexts-available/README.TXT similarity index 100% rename from jetty-distribution/src/main/resources/contexts-available/README.TXT rename to distribution/src/main/resources/contexts-available/README.TXT diff --git a/jetty-distribution/src/main/resources/contexts/README.TXT b/distribution/src/main/resources/contexts/README.TXT similarity index 100% rename from jetty-distribution/src/main/resources/contexts/README.TXT rename to distribution/src/main/resources/contexts/README.TXT diff --git a/jetty-distribution/src/main/resources/contexts/javadoc.xml b/distribution/src/main/resources/contexts/javadoc.xml similarity index 100% rename from jetty-distribution/src/main/resources/contexts/javadoc.xml rename to distribution/src/main/resources/contexts/javadoc.xml diff --git a/jetty-distribution/src/main/resources/javadoc/contents.html b/distribution/src/main/resources/javadoc/contents.html similarity index 100% rename from jetty-distribution/src/main/resources/javadoc/contents.html rename to distribution/src/main/resources/javadoc/contents.html diff --git a/jetty-distribution/src/main/resources/resources/jetty.policy b/distribution/src/main/resources/resources/jetty.policy similarity index 100% rename from jetty-distribution/src/main/resources/resources/jetty.policy rename to distribution/src/main/resources/resources/jetty.policy diff --git a/jetty-distribution/src/main/resources/resources/log4j.properties b/distribution/src/main/resources/resources/log4j.properties similarity index 100% rename from jetty-distribution/src/main/resources/resources/log4j.properties rename to distribution/src/main/resources/resources/log4j.properties diff --git a/jetty-embedded-examples/pom.xml b/example-jetty-embedded/pom.xml similarity index 90% rename from jetty-embedded-examples/pom.xml rename to example-jetty-embedded/pom.xml index 1c5ba8eef16..575231ff357 100644 --- a/jetty-embedded-examples/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -5,8 +5,8 @@ 7.0.0.M3-SNAPSHOT 4.0.0 - jetty-embedded-examples - Jetty :: Embedded Examples + example-jetty-embedded + Example :: Jetty Embedded Jetty Embedded Examples diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/FileServer.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/FileServer.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ManyServletContexts.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/OneContext.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/OneContext.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneContext.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/OneHandler.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/OneHandler.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneServletContext.java diff --git a/jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java similarity index 100% rename from jetty-embedded-examples/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java rename to example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java diff --git a/jetty-integrations/pom.xml b/jetty-integrations/pom.xml deleted file mode 100644 index 31d6cfe8b5c..00000000000 --- a/jetty-integrations/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - org.eclipse.jetty - jetty-project - 7.0.0.M3-SNAPSHOT - - 4.0.0 - jetty-integrations - Jetty :: Third Party Integration Parent - Third Party Integration Parent - pom - - ${pom.version} - - diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index f3736df0e0a..6cdaf8db49a 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -71,7 +71,7 @@ org.eclipse.jetty - jetty-servlet-tester + test-jetty-servlet ${project.version} test diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index fa42dde6a5d..51c80066bdc 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -72,7 +72,7 @@ org.eclipse.jetty - jetty-servlet-tester + test-jetty-servlet ${project.version} test diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 0b58d1d3daf..4c20af4d27c 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -6,8 +6,8 @@ 4.0.0 jetty-webapp - Jetty :: Webapp Application Support - Jetty web application support + Jetty :: Web Applications + Jetty web application src/main/resources diff --git a/pom.xml b/pom.xml index ae47cd5b057..2283ddd87e1 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ jetty-client jetty-xml jetty-security - + jetty-jaspi jetty-servlet jetty-webapp jetty-servlets @@ -138,12 +138,11 @@ jetty-annotations jetty-plus jetty-rewrite - jetty-servlet-tester - jetty-start - jetty-embedded-examples - jetty-test-webapp - jetty-integrations - jetty-distribution + start + test-jetty-servlet + test-jetty-webapp + example-jetty-embedded + distribution diff --git a/jetty-start/pom.xml b/start/pom.xml similarity index 86% rename from jetty-start/pom.xml rename to start/pom.xml index c9f05d987d3..6ff159253f6 100644 --- a/jetty-start/pom.xml +++ b/start/pom.xml @@ -5,9 +5,9 @@ 7.0.0.M3-SNAPSHOT 4.0.0 - jetty-start - Jetty :: Start - The jetty startup artifact. + start + Start + The start utility diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Classpath.java b/start/src/main/java/org/eclipse/jetty/start/Classpath.java similarity index 100% rename from jetty-start/src/main/java/org/eclipse/jetty/start/Classpath.java rename to start/src/main/java/org/eclipse/jetty/start/Classpath.java diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/CustomPolicy.java b/start/src/main/java/org/eclipse/jetty/start/CustomPolicy.java similarity index 100% rename from jetty-start/src/main/java/org/eclipse/jetty/start/CustomPolicy.java rename to start/src/main/java/org/eclipse/jetty/start/CustomPolicy.java diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/start/src/main/java/org/eclipse/jetty/start/Main.java similarity index 100% rename from jetty-start/src/main/java/org/eclipse/jetty/start/Main.java rename to start/src/main/java/org/eclipse/jetty/start/Main.java diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Monitor.java b/start/src/main/java/org/eclipse/jetty/start/Monitor.java similarity index 100% rename from jetty-start/src/main/java/org/eclipse/jetty/start/Monitor.java rename to start/src/main/java/org/eclipse/jetty/start/Monitor.java diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/README.txt b/start/src/main/java/org/eclipse/jetty/start/README.txt similarity index 100% rename from jetty-start/src/main/java/org/eclipse/jetty/start/README.txt rename to start/src/main/java/org/eclipse/jetty/start/README.txt diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Version.java b/start/src/main/java/org/eclipse/jetty/start/Version.java similarity index 100% rename from jetty-start/src/main/java/org/eclipse/jetty/start/Version.java rename to start/src/main/java/org/eclipse/jetty/start/Version.java diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config b/start/src/main/resources/org/eclipse/jetty/start/start.config similarity index 100% rename from jetty-start/src/main/resources/org/eclipse/jetty/start/start.config rename to start/src/main/resources/org/eclipse/jetty/start/start.config diff --git a/jetty-servlet-tester/pom.xml b/test-jetty-servlet/pom.xml similarity index 89% rename from jetty-servlet-tester/pom.xml rename to test-jetty-servlet/pom.xml index 693afd3f109..41c35c3d88d 100644 --- a/jetty-servlet-tester/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -5,9 +5,9 @@ 7.0.0.M3-SNAPSHOT 4.0.0 - jetty-servlet-tester + test-jetty-servlet jar - Jetty :: Servlet Tester + Test :: Jetty Servlet Tester org.eclipse.jetty diff --git a/jetty-servlet-tester/src/main/java/org/eclipse/jetty/testing/HttpTester.java b/test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java similarity index 100% rename from jetty-servlet-tester/src/main/java/org/eclipse/jetty/testing/HttpTester.java rename to test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java diff --git a/jetty-servlet-tester/src/main/java/org/eclipse/jetty/testing/ServletTester.java b/test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java similarity index 100% rename from jetty-servlet-tester/src/main/java/org/eclipse/jetty/testing/ServletTester.java rename to test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java diff --git a/jetty-servlet-tester/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java b/test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java similarity index 100% rename from jetty-servlet-tester/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java rename to test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java diff --git a/jetty-servlet-tester/src/test/java/org/eclipse/jetty/testing/ServletTest.java b/test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/ServletTest.java similarity index 100% rename from jetty-servlet-tester/src/test/java/org/eclipse/jetty/testing/ServletTest.java rename to test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/ServletTest.java diff --git a/jetty-test-webapp/jetty-chat.jmx b/test-jetty-webapp/jetty-chat.jmx similarity index 100% rename from jetty-test-webapp/jetty-chat.jmx rename to test-jetty-webapp/jetty-chat.jmx diff --git a/jetty-test-webapp/pom.xml b/test-jetty-webapp/pom.xml similarity index 97% rename from jetty-test-webapp/pom.xml rename to test-jetty-webapp/pom.xml index 41a7e9def57..1bef5ab23da 100644 --- a/jetty-test-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -6,8 +6,8 @@ 4.0.0 org.eclipse.jetty - jetty-test-webapp - Jetty :: Webapp Example + test-jetty-webapp + Test :: Jetty Test Webapp war @@ -125,7 +125,7 @@ org.eclipse.jetty - jetty-servlet-tester + test-jetty-servlet ${project.version} test diff --git a/jetty-test-webapp/src/main/config/contexts/demo.xml b/test-jetty-webapp/src/main/config/contexts/demo.xml similarity index 100% rename from jetty-test-webapp/src/main/config/contexts/demo.xml rename to test-jetty-webapp/src/main/config/contexts/demo.xml diff --git a/jetty-test-webapp/src/main/config/contexts/test.d/override-web.xml b/test-jetty-webapp/src/main/config/contexts/test.d/override-web.xml similarity index 100% rename from jetty-test-webapp/src/main/config/contexts/test.d/override-web.xml rename to test-jetty-webapp/src/main/config/contexts/test.d/override-web.xml diff --git a/jetty-test-webapp/src/main/config/contexts/test.xml b/test-jetty-webapp/src/main/config/contexts/test.xml similarity index 100% rename from jetty-test-webapp/src/main/config/contexts/test.xml rename to test-jetty-webapp/src/main/config/contexts/test.xml diff --git a/jetty-test-webapp/src/main/java/com/acme/ChatServlet.java b/test-jetty-webapp/src/main/java/com/acme/ChatServlet.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/ChatServlet.java rename to test-jetty-webapp/src/main/java/com/acme/ChatServlet.java diff --git a/jetty-test-webapp/src/main/java/com/acme/CookieDump.java b/test-jetty-webapp/src/main/java/com/acme/CookieDump.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/CookieDump.java rename to test-jetty-webapp/src/main/java/com/acme/CookieDump.java diff --git a/jetty-test-webapp/src/main/java/com/acme/Counter.java b/test-jetty-webapp/src/main/java/com/acme/Counter.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/Counter.java rename to test-jetty-webapp/src/main/java/com/acme/Counter.java diff --git a/jetty-test-webapp/src/main/java/com/acme/DispatchServlet.java b/test-jetty-webapp/src/main/java/com/acme/DispatchServlet.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/DispatchServlet.java rename to test-jetty-webapp/src/main/java/com/acme/DispatchServlet.java diff --git a/jetty-test-webapp/src/main/java/com/acme/Dump.java b/test-jetty-webapp/src/main/java/com/acme/Dump.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/Dump.java rename to test-jetty-webapp/src/main/java/com/acme/Dump.java diff --git a/jetty-test-webapp/src/main/java/com/acme/HelloWorld.java b/test-jetty-webapp/src/main/java/com/acme/HelloWorld.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/HelloWorld.java rename to test-jetty-webapp/src/main/java/com/acme/HelloWorld.java diff --git a/jetty-test-webapp/src/main/java/com/acme/SessionDump.java b/test-jetty-webapp/src/main/java/com/acme/SessionDump.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/SessionDump.java rename to test-jetty-webapp/src/main/java/com/acme/SessionDump.java diff --git a/jetty-test-webapp/src/main/java/com/acme/TagListener.java b/test-jetty-webapp/src/main/java/com/acme/TagListener.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/TagListener.java rename to test-jetty-webapp/src/main/java/com/acme/TagListener.java diff --git a/jetty-test-webapp/src/main/java/com/acme/TestFilter.java b/test-jetty-webapp/src/main/java/com/acme/TestFilter.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/TestFilter.java rename to test-jetty-webapp/src/main/java/com/acme/TestFilter.java diff --git a/jetty-test-webapp/src/main/java/com/acme/TestListener.java b/test-jetty-webapp/src/main/java/com/acme/TestListener.java similarity index 100% rename from jetty-test-webapp/src/main/java/com/acme/TestListener.java rename to test-jetty-webapp/src/main/java/com/acme/TestListener.java diff --git a/jetty-test-webapp/src/main/webapp/META-INF/MANIFEST.MF b/test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from jetty-test-webapp/src/main/webapp/META-INF/MANIFEST.MF rename to test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/acme-taglib.tld b/test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib.tld similarity index 100% rename from jetty-test-webapp/src/main/webapp/WEB-INF/acme-taglib.tld rename to test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib.tld diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/acme-taglib2.tld b/test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib2.tld similarity index 100% rename from jetty-test-webapp/src/main/webapp/WEB-INF/acme-taglib2.tld rename to test-jetty-webapp/src/main/webapp/WEB-INF/acme-taglib2.tld diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from jetty-test-webapp/src/main/webapp/WEB-INF/jetty-web.xml rename to test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/tags/CVS/Entries b/test-jetty-webapp/src/main/webapp/WEB-INF/tags/CVS/Entries similarity index 100% rename from jetty-test-webapp/src/main/webapp/WEB-INF/tags/CVS/Entries rename to test-jetty-webapp/src/main/webapp/WEB-INF/tags/CVS/Entries diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/tags/CVS/Repository b/test-jetty-webapp/src/main/webapp/WEB-INF/tags/CVS/Repository similarity index 100% rename from jetty-test-webapp/src/main/webapp/WEB-INF/tags/CVS/Repository rename to test-jetty-webapp/src/main/webapp/WEB-INF/tags/CVS/Repository diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/tags/CVS/Root b/test-jetty-webapp/src/main/webapp/WEB-INF/tags/CVS/Root similarity index 100% rename from jetty-test-webapp/src/main/webapp/WEB-INF/tags/CVS/Root rename to test-jetty-webapp/src/main/webapp/WEB-INF/tags/CVS/Root diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/tags/panel.tag b/test-jetty-webapp/src/main/webapp/WEB-INF/tags/panel.tag similarity index 100% rename from jetty-test-webapp/src/main/webapp/WEB-INF/tags/panel.tag rename to test-jetty-webapp/src/main/webapp/WEB-INF/tags/panel.tag diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/web.xml b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jetty-test-webapp/src/main/webapp/WEB-INF/web.xml rename to test-jetty-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/jetty-test-webapp/src/main/webapp/auth/file.txt b/test-jetty-webapp/src/main/webapp/auth/file.txt similarity index 100% rename from jetty-test-webapp/src/main/webapp/auth/file.txt rename to test-jetty-webapp/src/main/webapp/auth/file.txt diff --git a/jetty-test-webapp/src/main/webapp/auth/relax.txt b/test-jetty-webapp/src/main/webapp/auth/relax.txt similarity index 100% rename from jetty-test-webapp/src/main/webapp/auth/relax.txt rename to test-jetty-webapp/src/main/webapp/auth/relax.txt diff --git a/jetty-test-webapp/src/main/webapp/cgi-bin/hello.sh b/test-jetty-webapp/src/main/webapp/cgi-bin/hello.sh similarity index 100% rename from jetty-test-webapp/src/main/webapp/cgi-bin/hello.sh rename to test-jetty-webapp/src/main/webapp/cgi-bin/hello.sh diff --git a/jetty-test-webapp/src/main/webapp/d.txt b/test-jetty-webapp/src/main/webapp/d.txt similarity index 100% rename from jetty-test-webapp/src/main/webapp/d.txt rename to test-jetty-webapp/src/main/webapp/d.txt diff --git a/jetty-test-webapp/src/main/webapp/da.txt b/test-jetty-webapp/src/main/webapp/da.txt similarity index 100% rename from jetty-test-webapp/src/main/webapp/da.txt rename to test-jetty-webapp/src/main/webapp/da.txt diff --git a/jetty-test-webapp/src/main/webapp/da.txt.gz b/test-jetty-webapp/src/main/webapp/da.txt.gz similarity index 100% rename from jetty-test-webapp/src/main/webapp/da.txt.gz rename to test-jetty-webapp/src/main/webapp/da.txt.gz diff --git a/jetty-test-webapp/src/main/webapp/dat.txt b/test-jetty-webapp/src/main/webapp/dat.txt similarity index 100% rename from jetty-test-webapp/src/main/webapp/dat.txt rename to test-jetty-webapp/src/main/webapp/dat.txt diff --git a/jetty-test-webapp/src/main/webapp/data.txt b/test-jetty-webapp/src/main/webapp/data.txt similarity index 100% rename from jetty-test-webapp/src/main/webapp/data.txt rename to test-jetty-webapp/src/main/webapp/data.txt diff --git a/jetty-test-webapp/src/main/webapp/data.txt.gz b/test-jetty-webapp/src/main/webapp/data.txt.gz similarity index 100% rename from jetty-test-webapp/src/main/webapp/data.txt.gz rename to test-jetty-webapp/src/main/webapp/data.txt.gz diff --git a/jetty-test-webapp/src/main/webapp/error404.html b/test-jetty-webapp/src/main/webapp/error404.html similarity index 100% rename from jetty-test-webapp/src/main/webapp/error404.html rename to test-jetty-webapp/src/main/webapp/error404.html diff --git a/jetty-test-webapp/src/main/webapp/favicon.ico b/test-jetty-webapp/src/main/webapp/favicon.ico similarity index 100% rename from jetty-test-webapp/src/main/webapp/favicon.ico rename to test-jetty-webapp/src/main/webapp/favicon.ico diff --git a/jetty-test-webapp/src/main/webapp/index.html b/test-jetty-webapp/src/main/webapp/index.html similarity index 100% rename from jetty-test-webapp/src/main/webapp/index.html rename to test-jetty-webapp/src/main/webapp/index.html diff --git a/jetty-test-webapp/src/main/webapp/jetty_banner.gif b/test-jetty-webapp/src/main/webapp/jetty_banner.gif similarity index 100% rename from jetty-test-webapp/src/main/webapp/jetty_banner.gif rename to test-jetty-webapp/src/main/webapp/jetty_banner.gif diff --git a/jetty-test-webapp/src/main/webapp/logon.html b/test-jetty-webapp/src/main/webapp/logon.html similarity index 100% rename from jetty-test-webapp/src/main/webapp/logon.html rename to test-jetty-webapp/src/main/webapp/logon.html diff --git a/jetty-test-webapp/src/main/webapp/logonError.html b/test-jetty-webapp/src/main/webapp/logonError.html similarity index 100% rename from jetty-test-webapp/src/main/webapp/logonError.html rename to test-jetty-webapp/src/main/webapp/logonError.html diff --git a/jetty-test-webapp/src/main/webapp/rewrite.html b/test-jetty-webapp/src/main/webapp/rewrite.html similarity index 100% rename from jetty-test-webapp/src/main/webapp/rewrite.html rename to test-jetty-webapp/src/main/webapp/rewrite.html diff --git a/jetty-test-webapp/src/test/java/com/acme/DispatchServletTest.java b/test-jetty-webapp/src/test/java/com/acme/DispatchServletTest.java similarity index 100% rename from jetty-test-webapp/src/test/java/com/acme/DispatchServletTest.java rename to test-jetty-webapp/src/test/java/com/acme/DispatchServletTest.java diff --git a/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java b/test-jetty-webapp/src/test/java/org/eclipse/jetty/DemoServer.java similarity index 100% rename from jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java rename to test-jetty-webapp/src/test/java/org/eclipse/jetty/DemoServer.java