From 55842580aaaef11f959e4eb5c8ae05b8c330026f Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Tue, 11 Oct 2011 08:25:05 -0500 Subject: [PATCH 1/7] Updating VERSION.txt top section --- VERSION.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index d4cfaec76b8..d4d387316c4 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,6 @@ -jetty-7.5.3-SNAPSHOT +jetty-7.5.3v20111011 - 11 October 2011 + + 348978 migrate jetty-http-spi + + 358649 StdErrLog system properties for package/class logging LEVEL. jetty-7.5.2.v20111006 - 06 October 2011 + 336443 add missing comma in DigestAuthenticator string From b6ac542604a004fab288b51574218bc235ef2491 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Tue, 11 Oct 2011 08:47:00 -0500 Subject: [PATCH 2/7] [maven-release-plugin] prepare release jetty-7.5.3.v20111011 --- example-jetty-embedded/pom.xml | 2 +- jetty-aggregate/jetty-all-server/pom.xml | 2 +- jetty-aggregate/jetty-all/pom.xml | 2 +- jetty-aggregate/jetty-client/pom.xml | 2 +- jetty-aggregate/jetty-plus/pom.xml | 2 +- jetty-aggregate/jetty-server/pom.xml | 2 +- jetty-aggregate/jetty-servlet/pom.xml | 2 +- jetty-aggregate/jetty-webapp/pom.xml | 2 +- jetty-aggregate/pom.xml | 2 +- jetty-ajp/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-http-spi/pom.xml | 5 ++--- 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-jsp-2.1/pom.xml | 2 +- jetty-monitor/pom.xml | 2 +- jetty-nested/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-logback/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-equinoxtools/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-policy/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- test-continuation-jetty6/pom.xml | 2 +- test-continuation/pom.xml | 2 +- test-jetty-nested/pom.xml | 2 +- test-jetty-servlet/pom.xml | 2 +- test-jetty-webapp/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- tests/test-sessions/test-hash-sessions/pom.xml | 2 +- tests/test-sessions/test-jdbc-sessions/pom.xml | 2 +- tests/test-sessions/test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 61 files changed, 62 insertions(+), 63 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index 102f155bb8a..bac0649bb14 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 example-jetty-embedded diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index 398b25065c6..803172025a7 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-all-server diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index 24057f7ac15..6daed51c45e 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-all diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index d63c53a7f39..45b317f9184 100644 --- a/jetty-aggregate/jetty-client/pom.xml +++ b/jetty-aggregate/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-client diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index ff11d391eea..05ad2a83e90 100644 --- a/jetty-aggregate/jetty-plus/pom.xml +++ b/jetty-aggregate/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-plus diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index 47d4487bb36..2d7a393c0c4 100644 --- a/jetty-aggregate/jetty-server/pom.xml +++ b/jetty-aggregate/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-server diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index 03a4eadc291..0b1e734d0aa 100644 --- a/jetty-aggregate/jetty-servlet/pom.xml +++ b/jetty-aggregate/jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-servlet diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index 570b5ead020..77f8ee98999 100644 --- a/jetty-aggregate/jetty-webapp/pom.xml +++ b/jetty-aggregate/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-webapp diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 5c03956dda1..87c4c7b1c5d 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index ac1107d04f1..c2569e59dcd 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 90e721ad208..c45521a658d 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 06504864282..b55e983572e 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 13faa931542..0c83eeacbf3 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index e714da9248e..2f9d4586b8d 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 09325a9de48..f67fca49f78 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 00139b61df6..a1081d2da47 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -1,9 +1,8 @@ - + org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 9d9bc870e35..307f56f0f2e 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 org.eclipse.jetty diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index e437c1c66f4..21e4ae5ce91 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 org.eclipse.jetty diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index fb9789c59b1..f39d3889278 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index c50b23fa707..77e59a97970 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 6a5a3b721cd..93e8f9ab131 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-jndi diff --git a/jetty-jsp-2.1/pom.xml b/jetty-jsp-2.1/pom.xml index ccdcc2ab645..9fd60f51cd5 100644 --- a/jetty-jsp-2.1/pom.xml +++ b/jetty-jsp-2.1/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-jsp-2.1 diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index b2df7a275a5..c7577c5db19 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-monitor diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index 1508998c81b..cb225baa72b 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 jetty-nested Jetty :: Nested diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index ad453da63b5..711550a3879 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index abf1b4b5b95..245c7d694fd 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml index 0804ab16f1e..6064141650a 100644 --- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 36041c8924e..da92827b275 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 3b6f8761f99..9c4141e0fd6 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml index 22fb1e65c9c..fb8eceff5a7 100644 --- a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml +++ b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index b66be50f400..7813d9237e3 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 ../pom.xml 4.0.0 diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index f871c2ab8b1..e7f95533f77 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 ../pom.xml org.eclipse.jetty.osgi diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index a7d298f154b..71309580b76 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 85bff5e488f..889293a7e18 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index ce978fc9b90..ea31a1b8d87 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index 2b3db3d02f3..f10a0eff50f 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 org.eclipse.jetty jetty-policy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index ae7778f61c5..84e4bb22b9c 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 62da79fc1a6..c3c2b4df58e 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 4b182af979c..cf41ac8f911 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 143e3b58e98..ac2b95ad24e 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 8ef34f0c786..bcd8c8f6bd8 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-servlets diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 741ed9df97d..9ddb1fa501f 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index a3ec0331189..1c722e865f6 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 83ce67b1b56..91b9e6e89a5 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 9c4fba4ae7e..f49307544ca 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index df34ff79abd..b09327af061 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 527838da0e5..0cba492975f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 19 jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 Jetty :: Project ${jetty.url} pom diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml index b1710d66fb9..0413c7e90e7 100644 --- a/test-continuation-jetty6/pom.xml +++ b/test-continuation-jetty6/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 test-continuation-jetty6 diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 6cf888c776f..8451f47e8e8 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 test-continuation diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml index ee26fa4cf6d..791283b516f 100644 --- a/test-jetty-nested/pom.xml +++ b/test-jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 test-jetty-nested Jetty :: Nested Test diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 75e959db852..4b7b4a8ef80 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index 51019e0b9cd..0ecdeae7e10 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 org.eclipse.jetty diff --git a/tests/pom.xml b/tests/pom.xml index fd232368b9d..5798b2cfd90 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 7.5.3-SNAPSHOT + 7.5.3.v20111011 org.eclipse.jetty.tests tests-parent diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 59ca3e26173..85a1c6dc768 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 7.5.3-SNAPSHOT + 7.5.3.v20111011 4.0.0 test-integration diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index aa291999427..1fd7919451a 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.5.3-SNAPSHOT + 7.5.3.v20111011 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index cb841beca60..432a4f4ac77 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.5.3-SNAPSHOT + 7.5.3.v20111011 test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index 2e324dd94b8..e6d13c351e9 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.5.3-SNAPSHOT + 7.5.3.v20111011 test-hash-sessions Jetty Tests :: Sessions :: Hash diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 0d15f11bb36..27b29d8d4ab 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.5.3-SNAPSHOT + 7.5.3.v20111011 test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 66bd4758ed0..f0525652f1c 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.5.3-SNAPSHOT + 7.5.3.v20111011 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index e2d41980057..71cacb00b93 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.5.3-SNAPSHOT + 7.5.3.v20111011 test-webapps-parent Jetty Tests :: WebApps :: Parent diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index fb57eec67f5..6352c75ce1e 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.5.3-SNAPSHOT + 7.5.3.v20111011 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 7d10182034b33ff3db20632b926c4438c851e784 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Tue, 11 Oct 2011 08:47:07 -0500 Subject: [PATCH 3/7] [maven-release-plugin] prepare for next development iteration --- example-jetty-embedded/pom.xml | 2 +- jetty-aggregate/jetty-all-server/pom.xml | 2 +- jetty-aggregate/jetty-all/pom.xml | 2 +- jetty-aggregate/jetty-client/pom.xml | 2 +- jetty-aggregate/jetty-plus/pom.xml | 2 +- jetty-aggregate/jetty-server/pom.xml | 2 +- jetty-aggregate/jetty-servlet/pom.xml | 2 +- jetty-aggregate/jetty-webapp/pom.xml | 2 +- jetty-aggregate/pom.xml | 2 +- jetty-ajp/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-http-spi/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-jsp-2.1/pom.xml | 2 +- jetty-monitor/pom.xml | 2 +- jetty-nested/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-logback/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-equinoxtools/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-policy/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- test-continuation-jetty6/pom.xml | 2 +- test-continuation/pom.xml | 2 +- test-jetty-nested/pom.xml | 2 +- test-jetty-servlet/pom.xml | 2 +- test-jetty-webapp/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- tests/test-sessions/test-hash-sessions/pom.xml | 2 +- tests/test-sessions/test-jdbc-sessions/pom.xml | 2 +- tests/test-sessions/test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 61 files changed, 61 insertions(+), 61 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index bac0649bb14..021c678580b 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 example-jetty-embedded diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index 803172025a7..29966c6ac59 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-all-server diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index 6daed51c45e..5a77460bc34 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-all diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index 45b317f9184..d4752f3ddb3 100644 --- a/jetty-aggregate/jetty-client/pom.xml +++ b/jetty-aggregate/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-client diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index 05ad2a83e90..ed64961b5b1 100644 --- a/jetty-aggregate/jetty-plus/pom.xml +++ b/jetty-aggregate/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index 2d7a393c0c4..39d9aeb15cb 100644 --- a/jetty-aggregate/jetty-server/pom.xml +++ b/jetty-aggregate/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index 0b1e734d0aa..3545f13e718 100644 --- a/jetty-aggregate/jetty-servlet/pom.xml +++ b/jetty-aggregate/jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index 77f8ee98999..0b0e218f3f8 100644 --- a/jetty-aggregate/jetty-webapp/pom.xml +++ b/jetty-aggregate/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 87c4c7b1c5d..95709419d10 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index c2569e59dcd..a6272a6b9a6 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index c45521a658d..730fb6b6a41 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index b55e983572e..976b5cd7797 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 0c83eeacbf3..dcd09df4cf0 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 2f9d4586b8d..7cadea26837 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index f67fca49f78..35dd919cf00 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index a1081d2da47..f4204154f1b 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 307f56f0f2e..ad9abfd0446 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 21e4ae5ce91..f4c816d3f27 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index f39d3889278..66a813af6fb 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 77e59a97970..3b3f0b177b1 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 93e8f9ab131..e9b89cdb92c 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jsp-2.1/pom.xml b/jetty-jsp-2.1/pom.xml index 9fd60f51cd5..9f4a419d79f 100644 --- a/jetty-jsp-2.1/pom.xml +++ b/jetty-jsp-2.1/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-jsp-2.1 diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index c7577c5db19..8298960557d 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-monitor diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index cb225baa72b..9a625784fcb 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT jetty-nested Jetty :: Nested diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 711550a3879..7660293e01b 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 245c7d694fd..70d3b2c02e1 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml index 6064141650a..be3565e4f5b 100644 --- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index da92827b275..69f1d4f9178 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 9c4141e0fd6..b063f746195 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml index fb8eceff5a7..1c0f1e535a9 100644 --- a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml +++ b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 7813d9237e3..88b815d322b 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index e7f95533f77..e06101a6774 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT ../pom.xml org.eclipse.jetty.osgi diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 71309580b76..c4b1a3e9888 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 889293a7e18..94f302eb353 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index ea31a1b8d87..145dd57640e 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index f10a0eff50f..fc4e8a7e8b8 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT org.eclipse.jetty jetty-policy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 84e4bb22b9c..5a1f026adc1 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index c3c2b4df58e..f08e4e768a2 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index cf41ac8f911..9cd880908e3 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index ac2b95ad24e..09908ee58f9 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index bcd8c8f6bd8..a1e809a71b5 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 9ddb1fa501f..223482fb80e 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 1c722e865f6..ba57b47dd8d 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 91b9e6e89a5..b40f797c81b 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index f49307544ca..1011cf2ebb2 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index b09327af061..a8579dbd7a9 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 0cba492975f..12d10ef83a3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 19 jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT Jetty :: Project ${jetty.url} pom diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml index 0413c7e90e7..16f73ba368a 100644 --- a/test-continuation-jetty6/pom.xml +++ b/test-continuation-jetty6/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 test-continuation-jetty6 diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 8451f47e8e8..622977bcf77 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 test-continuation diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml index 791283b516f..6263fe10db2 100644 --- a/test-jetty-nested/pom.xml +++ b/test-jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT test-jetty-nested Jetty :: Nested Test diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 4b7b4a8ef80..913686c973a 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index 0ecdeae7e10..28f154ef2bc 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/tests/pom.xml b/tests/pom.xml index 5798b2cfd90..71be5773d95 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 7.5.3.v20111011 + 7.5.4-SNAPSHOT org.eclipse.jetty.tests tests-parent diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 85a1c6dc768..07c82cafc06 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 7.5.3.v20111011 + 7.5.4-SNAPSHOT 4.0.0 test-integration diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 1fd7919451a..981d3f6adc5 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.5.3.v20111011 + 7.5.4-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 432a4f4ac77..8422080a703 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.5.3.v20111011 + 7.5.4-SNAPSHOT test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index e6d13c351e9..bfc169deaf7 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.5.3.v20111011 + 7.5.4-SNAPSHOT test-hash-sessions Jetty Tests :: Sessions :: Hash diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 27b29d8d4ab..a8977083e65 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.5.3.v20111011 + 7.5.4-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index f0525652f1c..7508516f24c 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.5.3.v20111011 + 7.5.4-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 71cacb00b93..bdd30b579dd 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.5.3.v20111011 + 7.5.4-SNAPSHOT test-webapps-parent Jetty Tests :: WebApps :: Parent diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 6352c75ce1e..875eb80e439 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.5.3.v20111011 + 7.5.4-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 3e62343aae0f9a6d1d365fb154c65d50e721c394 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Tue, 11 Oct 2011 09:48:57 -0500 Subject: [PATCH 4/7] Updating VERSION.txt top section --- VERSION.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index d4d387316c4..47a4668db46 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,6 @@ -jetty-7.5.3v20111011 - 11 October 2011 +jetty-7.5.4-SNAPSHOT + +jetty-7.5.3.v20111011 - 11 October 2011 + 348978 migrate jetty-http-spi + 358649 StdErrLog system properties for package/class logging LEVEL. From eeb617f4d8e6a4155ccf6d5a8e25de4e6140449b Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Wed, 12 Oct 2011 21:00:42 -0500 Subject: [PATCH 5/7] Adding an example of a forwarding rewrite embedded server --- example-jetty-embedded/pom.xml | 10 + .../eclipse/jetty/embedded/ForwardServer.java | 221 ++++++++++++++++++ 2 files changed, 231 insertions(+) create mode 100644 example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ForwardServer.java diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index 021c678580b..93f8ad5ff4e 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -28,6 +28,11 @@ jetty-servlets ${project.version} + + org.eclipse.jetty + jetty-rewrite + ${project.version} + org.eclipse.jetty jetty-deploy @@ -42,6 +47,11 @@ org.eclipse.jetty jetty-ajp ${project.version} + + + org.eclipse.jetty.toolchain + jetty-test-helper + test org.eclipse.jetty diff --git a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ForwardServer.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ForwardServer.java new file mode 100644 index 00000000000..c3d26046db1 --- /dev/null +++ b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ForwardServer.java @@ -0,0 +1,221 @@ +package org.eclipse.jetty.embedded; + +//======================================================================== +//Copyright (c) 2004-2009 Mort Bay Consulting Pty. Ltd. +//------------------------------------------------------------------------ +//All rights reserved. This program and the accompanying materials +//are made available under the terms of the Eclipse Public License v1.0 +//and Apache License v2.0 which accompanies this distribution. +//The Eclipse Public License is available at +//http://www.eclipse.org/legal/epl-v10.html +//The Apache License v2.0 is available at +//http://www.opensource.org/licenses/apache2.0.php +//You may elect to redistribute this code under either of these licenses. +//======================================================================== + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.GenericServlet; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.rewrite.handler.RedirectPatternRule; +import org.eclipse.jetty.rewrite.handler.RewriteHandler; +import org.eclipse.jetty.rewrite.handler.RewritePatternRule; +import org.eclipse.jetty.rewrite.handler.Rule; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.handler.ResourceHandler; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.servlet.FilterMapping; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; + +public class ForwardServer +{ + + private static Server _server; + private static SelectChannelConnector _connector; + private static HandlerCollection _handlerCollection; + private static ServletContextHandler _contextHandler; + private static RewriteHandler _rewriteHandler; + + /* + * http://localhost:8080/random?echo=echoText -> echoText + * http://localhost:8080/?echo=echoText -> txeTohce + * http://localhost:8080/context?echo=echoText -> echoText + * http://localhost:8080/context -> Roger That! + * http://localhost:8080/random -> Roger That! + */ + + public static void main( String[] args ) throws Exception + { + _server = new Server(); + _server.setSendServerVersion(false); + _connector = new SelectChannelConnector(); + _connector.setPort(8080); + + + _rewriteHandler = new RewriteHandler(); + _rewriteHandler.setRewriteRequestURI(true); + _rewriteHandler.setRewritePathInfo(false); + _rewriteHandler.setOriginalPathAttribute("requestedPath"); + + RewritePatternRule rule0 = new RewritePatternRule(); + + rule0.setPattern("/sample/*"); + rule0.setReplacement("/context"); + rule0.setTerminating(true); + + RewritePatternRule rule1 = new RewritePatternRule(); + + rule1.setPattern("/goodies/*"); + rule1.setReplacement("/context"); + rule1.setTerminating(true); + + + RewritePatternRule rule2 = new RewritePatternRule(); + + rule2.setPattern("/*"); + rule2.setReplacement("/context"); + + _rewriteHandler.setRules(new Rule[]{rule0, rule1, rule2}); + + _handlerCollection = new HandlerCollection(); + + _contextHandler = new ServletContextHandler(); + + _contextHandler.setContextPath("/context"); + _handlerCollection.addHandler(_contextHandler); + + + _contextHandler.addServlet(RogerThatServlet.class, "/*"); + _contextHandler.addServlet(ReserveEchoServlet.class,"/recho/*"); + _contextHandler.addServlet(EchoServlet.class, "/echo/*"); + + _contextHandler.addFilter(ForwardFilter.class, "/*", FilterMapping.REQUEST); + + _rewriteHandler.setHandler(_handlerCollection); + + _server.setHandler(_rewriteHandler); + _server.addConnector( _connector ); + + _server.start(); + + + + } + + public static class RogerThatServlet extends GenericServlet + { + @Override + public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException + { + res.getWriter().print("Roger That!"); + } + } + + public static class EchoServlet extends GenericServlet + { + @Override + public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException + { + String echoText = req.getParameter("echo"); + + if ( echoText == null ) + { + throw new ServletException("echo is a required parameter"); + } + else + { + res.getWriter().print(echoText); + } + } + } + + public static class ReserveEchoServlet extends GenericServlet + { + @Override + public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException + { + String echoText = req.getParameter("echo"); + + if ( echoText == null ) + { + throw new ServletException("echo is a required parameter"); + } + else + { + res.getWriter().print(new StringBuffer(echoText).reverse().toString()); + } + } + } + + + /* + * Forward filter works with roger, echo and reverse echo servlets to test various + * forwarding bits using filters. + * + * when there is an echo parameter and the path info is / it forwards to the reverse echo + * anything else in the pathInfo and it sends straight to the echo servlet...otherwise its + * all roger servlet + */ + public static class ForwardFilter implements Filter + { + ServletContext servletContext; + + public void init(FilterConfig filterConfig) throws ServletException + { + servletContext = filterConfig.getServletContext().getContext("/context"); + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException + { + + if ( servletContext == null || !(request instanceof HttpServletRequest) || !(response instanceof HttpServletResponse)) + { + chain.doFilter(request,response); + return; + } + + HttpServletRequest req = (HttpServletRequest)request; + HttpServletResponse resp = (HttpServletResponse)response; + + System.out.println("getPathInfo() -" + req.getPathInfo()); + System.out.println("getServletInfo() -" + req.getServletPath()); + + + if ( req.getParameter("echo") != null && "/".equals(req.getPathInfo())) + { + RequestDispatcher dispatcher = servletContext.getRequestDispatcher("/recho"); + dispatcher.forward(request,response); + } + else if ( req.getParameter("echo") != null ) + { + RequestDispatcher dispatcher = servletContext.getRequestDispatcher("/echo"); + dispatcher.forward(request,response); + } + else + { + chain.doFilter(request,response); + return; + } + } + + public void destroy() + { + + } + } + +} From 160385606c63bd83db4b9f5d063edbd64357a935 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 13 Oct 2011 13:58:25 +1100 Subject: [PATCH 6/7] 358263 - JDBCSessionIdManager add setDatasource(DataSource) method --- .../jetty/server/session/JDBCSessionIdManager.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java index ad5b244d761..f9a01d68131 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java @@ -199,6 +199,16 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager } + public void setDatasource (DataSource ds) + { + _datasource = ds; + } + + public DataSource getDataSource () + { + return _datasource; + } + public String getDriverClassName() { return _driverClassName; @@ -471,6 +481,9 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager private void initializeDatabase () throws Exception { + if (_datasource != null) + return; //already set up + if (_jndiName!=null) { InitialContext ic = new InitialContext(); From 54d0944019d7f491ea0c72d82c970608a84694d3 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 13 Oct 2011 15:18:55 +1100 Subject: [PATCH 7/7] no ForwardServer --- .../eclipse/jetty/embedded/ForwardServer.java | 221 ------------------ 1 file changed, 221 deletions(-) delete mode 100644 example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ForwardServer.java diff --git a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ForwardServer.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ForwardServer.java deleted file mode 100644 index c3d26046db1..00000000000 --- a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/ForwardServer.java +++ /dev/null @@ -1,221 +0,0 @@ -package org.eclipse.jetty.embedded; - -//======================================================================== -//Copyright (c) 2004-2009 Mort Bay Consulting Pty. Ltd. -//------------------------------------------------------------------------ -//All rights reserved. This program and the accompanying materials -//are made available under the terms of the Eclipse Public License v1.0 -//and Apache License v2.0 which accompanies this distribution. -//The Eclipse Public License is available at -//http://www.eclipse.org/legal/epl-v10.html -//The Apache License v2.0 is available at -//http://www.opensource.org/licenses/apache2.0.php -//You may elect to redistribute this code under either of these licenses. -//======================================================================== - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.GenericServlet; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.eclipse.jetty.rewrite.handler.RedirectPatternRule; -import org.eclipse.jetty.rewrite.handler.RewriteHandler; -import org.eclipse.jetty.rewrite.handler.RewritePatternRule; -import org.eclipse.jetty.rewrite.handler.Rule; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.server.handler.ResourceHandler; -import org.eclipse.jetty.server.nio.SelectChannelConnector; -import org.eclipse.jetty.servlet.FilterMapping; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.toolchain.test.MavenTestingUtils; - -public class ForwardServer -{ - - private static Server _server; - private static SelectChannelConnector _connector; - private static HandlerCollection _handlerCollection; - private static ServletContextHandler _contextHandler; - private static RewriteHandler _rewriteHandler; - - /* - * http://localhost:8080/random?echo=echoText -> echoText - * http://localhost:8080/?echo=echoText -> txeTohce - * http://localhost:8080/context?echo=echoText -> echoText - * http://localhost:8080/context -> Roger That! - * http://localhost:8080/random -> Roger That! - */ - - public static void main( String[] args ) throws Exception - { - _server = new Server(); - _server.setSendServerVersion(false); - _connector = new SelectChannelConnector(); - _connector.setPort(8080); - - - _rewriteHandler = new RewriteHandler(); - _rewriteHandler.setRewriteRequestURI(true); - _rewriteHandler.setRewritePathInfo(false); - _rewriteHandler.setOriginalPathAttribute("requestedPath"); - - RewritePatternRule rule0 = new RewritePatternRule(); - - rule0.setPattern("/sample/*"); - rule0.setReplacement("/context"); - rule0.setTerminating(true); - - RewritePatternRule rule1 = new RewritePatternRule(); - - rule1.setPattern("/goodies/*"); - rule1.setReplacement("/context"); - rule1.setTerminating(true); - - - RewritePatternRule rule2 = new RewritePatternRule(); - - rule2.setPattern("/*"); - rule2.setReplacement("/context"); - - _rewriteHandler.setRules(new Rule[]{rule0, rule1, rule2}); - - _handlerCollection = new HandlerCollection(); - - _contextHandler = new ServletContextHandler(); - - _contextHandler.setContextPath("/context"); - _handlerCollection.addHandler(_contextHandler); - - - _contextHandler.addServlet(RogerThatServlet.class, "/*"); - _contextHandler.addServlet(ReserveEchoServlet.class,"/recho/*"); - _contextHandler.addServlet(EchoServlet.class, "/echo/*"); - - _contextHandler.addFilter(ForwardFilter.class, "/*", FilterMapping.REQUEST); - - _rewriteHandler.setHandler(_handlerCollection); - - _server.setHandler(_rewriteHandler); - _server.addConnector( _connector ); - - _server.start(); - - - - } - - public static class RogerThatServlet extends GenericServlet - { - @Override - public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException - { - res.getWriter().print("Roger That!"); - } - } - - public static class EchoServlet extends GenericServlet - { - @Override - public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException - { - String echoText = req.getParameter("echo"); - - if ( echoText == null ) - { - throw new ServletException("echo is a required parameter"); - } - else - { - res.getWriter().print(echoText); - } - } - } - - public static class ReserveEchoServlet extends GenericServlet - { - @Override - public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException - { - String echoText = req.getParameter("echo"); - - if ( echoText == null ) - { - throw new ServletException("echo is a required parameter"); - } - else - { - res.getWriter().print(new StringBuffer(echoText).reverse().toString()); - } - } - } - - - /* - * Forward filter works with roger, echo and reverse echo servlets to test various - * forwarding bits using filters. - * - * when there is an echo parameter and the path info is / it forwards to the reverse echo - * anything else in the pathInfo and it sends straight to the echo servlet...otherwise its - * all roger servlet - */ - public static class ForwardFilter implements Filter - { - ServletContext servletContext; - - public void init(FilterConfig filterConfig) throws ServletException - { - servletContext = filterConfig.getServletContext().getContext("/context"); - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException - { - - if ( servletContext == null || !(request instanceof HttpServletRequest) || !(response instanceof HttpServletResponse)) - { - chain.doFilter(request,response); - return; - } - - HttpServletRequest req = (HttpServletRequest)request; - HttpServletResponse resp = (HttpServletResponse)response; - - System.out.println("getPathInfo() -" + req.getPathInfo()); - System.out.println("getServletInfo() -" + req.getServletPath()); - - - if ( req.getParameter("echo") != null && "/".equals(req.getPathInfo())) - { - RequestDispatcher dispatcher = servletContext.getRequestDispatcher("/recho"); - dispatcher.forward(request,response); - } - else if ( req.getParameter("echo") != null ) - { - RequestDispatcher dispatcher = servletContext.getRequestDispatcher("/echo"); - dispatcher.forward(request,response); - } - else - { - chain.doFilter(request,response); - return; - } - } - - public void destroy() - { - - } - } - -}