From 65d58882421180bd4e87c9f820ad91f43d2a3ceb Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 31 Mar 2009 22:58:05 +0000 Subject: [PATCH] ready for M0 push git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@62 7e9141cc-0065-0410-87d8-b60c137991c4 --- INCUBATION.txt | 17 +++++++++++++++ README.txt | 21 ++++++++++++++++--- jetty-ajp/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-assembly-descriptor/pom.xml | 4 ++-- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-embedded-examples/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet-tester/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-test-webapp/pom.xml | 2 +- .../java/org/eclipse/jetty/DemoServer.java | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- 29 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 INCUBATION.txt diff --git a/INCUBATION.txt b/INCUBATION.txt new file mode 100644 index 00000000000..3de5a5d5b41 --- /dev/null +++ b/INCUBATION.txt @@ -0,0 +1,17 @@ + +The Jetty @ eclipse project is based on the Jetty project at codehaus + + http://jetty.codehaus.org + +Ongoing development is now under the eclipse foundation + + http://www.eclipse.org/jetty/ + +The Jetty project is in incubation at the eclipse foundation + + http://wiki.eclipse.org/Development_Resources/Process_Guidelines/What_is_Incubation + +The Jetty project is in the parallel IP review process + + http://wiki.eclipse.org/Development_Resources/HOWTO/Parallel_IP_Process + diff --git a/README.txt b/README.txt index 23fe075f829..049bb04820d 100644 --- a/README.txt +++ b/README.txt @@ -1,9 +1,24 @@ -This is the Jetty 7 HTTP server and servlet container. +JETTY +===== -For more information about Jetty, please see the Jetty wiki: +The Jetty project is a 100% Java HTTP Server, HTTP Client +and Servlet Container. + + +The Jetty @ eclipse project is based on the Jetty project at codehaus + + http://jetty.codehaus.org + +Ongoing development is now under incubation at the eclipse foundation + + http://www.eclipse.org/jetty/ + + +Jetty @ eclipse is open source and is dual licensed using the apache 2.0 and +eclipse public license 1.0. You may choose either license when distributing +jetty. - http://docs.codehaus.org/display/JETTY/ BUILDING JETTY diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index 903a836e90a..4ebf95ccd9d 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 01f62be1905..7199211bdb9 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-assembly-descriptor/pom.xml b/jetty-assembly-descriptor/pom.xml index 0d7705563f3..496c845ab51 100644 --- a/jetty-assembly-descriptor/pom.xml +++ b/jetty-assembly-descriptor/pom.xml @@ -2,9 +2,9 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-assembly-descriptor Jetty :: Assembly Descriptor - \ No newline at end of file + diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 3835056f3a3..e0290e8f2e5 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-client diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 8f6c35ea8fa..585d1005b22 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 71faefadd27..a4df177f34c 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 05fe60f4ff5..091d8b7a7b9 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-embedded-examples/pom.xml b/jetty-embedded-examples/pom.xml index d629d747fd2..7753390ca80 100644 --- a/jetty-embedded-examples/pom.xml +++ b/jetty-embedded-examples/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-embedded diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index df29a98400c..c34e8c32aa9 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 56bdba25c1f..645ce13f0c9 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 3e47c8403cf..0f28ce181d3 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 171f3dcea62..9f657c5b1c8 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index d22f77a7ec2..13211520a9b 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 2705d90484c..d8b9e7aa5df 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index f6091d04d7d..0d6219e6732 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index ebeae8be075..1bca7faea97 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 6e018ed5fe1..beefa05465f 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet-tester/pom.xml b/jetty-servlet-tester/pom.xml index 1a6f9cd0e8c..e21e7e8bf30 100644 --- a/jetty-servlet-tester/pom.xml +++ b/jetty-servlet-tester/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-servlet-tester diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index ab2baca08b7..26b3ae98d78 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 6838444de9d..6d10ebebde3 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 0a2e86ee9b3..29bf85b24e3 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-test-webapp/pom.xml b/jetty-test-webapp/pom.xml index c7bdb292e69..5560385585f 100644 --- a/jetty-test-webapp/pom.xml +++ b/jetty-test-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java b/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java index 214984c7535..7a6b0db6f4b 100644 --- a/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java +++ b/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java @@ -13,7 +13,7 @@ public class DemoServer Server server = new Server(8080); WebAppContext context = new WebAppContext(); - context.setWar("./target/jetty-test-webapp-7.0.0.incubation0-SNAPSHOT"); + context.setWar("./target/jetty-test-webapp-7.0.0.M0-SNAPSHOT"); // TODO YUCK! context.setDefaultsDescriptor("../jetty-webapp/src/main/config/etc/webdefault.xml"); server.setHandler(context); diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 392fa043122..d6fb50c4475 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 31e54e81b8b..376bf138f9f 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index a57e109cf5b..e4bf929c082 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 6c518a9b79b..b93e9a1ccc2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.eclipse.jetty jetty-project - 7.0.0.incubation0-SNAPSHOT + 7.0.0.M0-SNAPSHOT Jetty :: Project pom