From 60682d4b6284846ab1ce61b92a9466c4838f087d Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 13 Jan 2012 08:14:16 -0600 Subject: [PATCH 01/11] Updating VERSION.txt top section --- VERSION.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index c2b8cbdd157..d8d5d83268b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,19 @@ -jetty-7.6.0-SNAPSHOT +jetty-7.6.0.RC4 - 13 January 2012 + + 365048 jetty Http client does not send proxy authentication when requesting + a Https-resource through a web-proxy. + + 366774 removed XSS vulnerbility + + 367099 Upgrade jetty-websocket for RFC 6455 - Addendum. + + 367716 simplified maxIdleTime logic + + 368035 WebSocketClientFactory does not invoke super.doStop(). + + 368060 do not encode sendRedirect URLs + + 368114 Protect against non-Strings in System properties for Log + + 368189 WebSocketClientFactory should not manage external thread pool. 368240 + - Improve AggregateLifeCycle handling of shared lifecycles + + 368215 Remove debug from jaspi + + 368240 Better handling of locally created ThreadPool. Forgot to null out + field. + + 368291 Change warning to info for NoSuchFieldException on + BeanELResolver.properties jetty-7.6.0.RC3 - 05 January 2012 + 367433 added tests to investigate @@ -8,7 +23,7 @@ jetty-7.6.0.RC3 - 05 January 2012 stopped. + 367591 corrected configuration.xml version to 7.6 + 367635 Added support for start.d directory - + 637638 limit number of form parameters to avoid DOS + + 367638 limit number of form parameters to avoid DOS + JETTY-1467 close half closed when idle jetty-7.6.0.RC2 - 22 December 2011 From ec589eed337d32ec24734a5e44401a653d3746f8 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 13 Jan 2012 08:37:19 -0600 Subject: [PATCH 02/11] [maven-release-plugin] prepare release jetty-7.6.0.RC4 --- 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/jetty-websocket/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-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/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 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index 3eb95b0ea27..dea2f5a68d7 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 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 072ff23321e..5ebd04801d8 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.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-all-server diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index 3a6eee3ac51..f85421bef81 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.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-all diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index e30ee5b160a..c896a39dbb3 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.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-client diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index ff9bf1f74c9..65dc282f02c 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.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-plus diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index 8d3cdddcb2f..b4ee29f55a2 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.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-server diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index 2e4f9bd47ee..b373055b75e 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.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-servlet diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index 47090b07d8f..85652b4a99f 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.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-webapp diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml index c650ef55103..4f9c32c3330 100644 --- a/jetty-aggregate/jetty-websocket/pom.xml +++ b/jetty-aggregate/jetty-websocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-websocket diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 7de1ac8d379..d45c8c826b4 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index c02155bea81..54b99cfff5c 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index a4b6c219f44..e19c719926a 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 02a0320bdd9..bad7d330987 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 6c4c47b893a..13a586f8e7e 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 528e7ce46c0..529d18de140 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 173d546d426..3d2c8ebf494 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index cf4900757c7..18a5313bb64 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 48de7f48335..23cc26daec3 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 548bab2f30a..bad7be3e90b 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-io diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index f06938ce0f8..31b748aa1e0 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 4b9a0dc2a9d..fd807c9fec6 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index bd9764512d6..5d36fef4ce1 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-jndi diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index bfff477df54..82ac428acc3 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-monitor diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index 40da79b3cfe..7e2c36e7ae7 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 jetty-nested Jetty :: Nested diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 43b99da8fe2..eaff21024f8 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 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 aed5c0202e0..8cb9fd1aff6 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.6.0-SNAPSHOT + 7.6.0.RC4 ../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 98a73a0ce47..6c4238ec592 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.6.0-SNAPSHOT + 7.6.0.RC4 ../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 24e2cc919fa..6d1720b8634 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.6.0-SNAPSHOT + 7.6.0.RC4 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 43ce529208f..d23f6822fac 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.6.0-SNAPSHOT + 7.6.0.RC4 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml index 665b3af9679..c5ba902de7b 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.6.0-SNAPSHOT + 7.6.0.RC4 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index cb8f9d76281..ec836bfda4e 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.6.0-SNAPSHOT + 7.6.0.RC4 ../pom.xml 4.0.0 diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index ae30fdd313e..b62bab46da2 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 ../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 eedcb97f358..c15e44e1e47 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.6.0-SNAPSHOT + 7.6.0.RC4 ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 75b8349308e..4c953432fe6 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 391eb9691c7..e9834588557 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index 192234b2626..8fcf4f24e68 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 jetty-policy Jetty :: Policy Tool diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index cdfe6d1c5b0..4884ee6b42d 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 397991f6299..794509fbf94 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 2b0dfa41526..9c78167694d 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 70ab5daf8a3..c3c01a9e92d 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 9e112abff9e..9517616851e 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-servlets diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 9fcfa2c2cc8..4e22f21b200 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 9e5dc45445a..160869b09b8 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index eb1971c5043..f9e51951a1d 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index cfb4b91e581..7e83c083d9c 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index b2a39954309..44342165efa 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 63315d4c21c..30864c6e04f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 19 jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 Jetty :: Project ${jetty.url} pom diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 498bf751457..ef255878f90 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 test-continuation diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml index 2f5b334f991..ad82150c4df 100644 --- a/test-jetty-nested/pom.xml +++ b/test-jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 test-jetty-nested Jetty :: Nested Test diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 65f98aa0f62..85c4c5e67ee 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index 4162b96e66e..a8b04a47303 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 test-jetty-webapp diff --git a/tests/pom.xml b/tests/pom.xml index 28cee13d78b..2dc0d802be9 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 7.6.0-SNAPSHOT + 7.6.0.RC4 org.eclipse.jetty.tests tests-parent diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 90bc814ddd0..858a5fa726a 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.0-SNAPSHOT + 7.6.0.RC4 4.0.0 test-integration diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index a5e08c91017..f5bace5540f 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.0-SNAPSHOT + 7.6.0.RC4 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 8c829fa6935..180b4fb0623 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.0-SNAPSHOT + 7.6.0.RC4 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 1152f8a40e2..0c84215dc45 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.6.0-SNAPSHOT + 7.6.0.RC4 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 567cfad6daa..9c921a52613 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.6.0-SNAPSHOT + 7.6.0.RC4 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 2979f679288..6ad1636e559 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.6.0-SNAPSHOT + 7.6.0.RC4 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index c34dda4cdc9..6caf4bafc63 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.0-SNAPSHOT + 7.6.0.RC4 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 b46690368a6..0744982a245 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.6.0-SNAPSHOT + 7.6.0.RC4 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 45cf0552fc1c791346db91459fd4c4a5f0a5240d Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 13 Jan 2012 08:37:25 -0600 Subject: [PATCH 03/11] [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/jetty-websocket/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-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/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 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index dea2f5a68d7..3eb95b0ea27 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-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 5ebd04801d8..072ff23321e 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.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-all-server diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index f85421bef81..3a6eee3ac51 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.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-all diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index c896a39dbb3..e30ee5b160a 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.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-client diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index 65dc282f02c..ff9bf1f74c9 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.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index b4ee29f55a2..8d3cdddcb2f 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.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index b373055b75e..2e4f9bd47ee 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.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index 85652b4a99f..47090b07d8f 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.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml index 4f9c32c3330..c650ef55103 100644 --- a/jetty-aggregate/jetty-websocket/pom.xml +++ b/jetty-aggregate/jetty-websocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-websocket diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index d45c8c826b4..7de1ac8d379 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index 54b99cfff5c..c02155bea81 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index e19c719926a..a4b6c219f44 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index bad7d330987..02a0320bdd9 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 13a586f8e7e..6c4c47b893a 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 529d18de140..528e7ce46c0 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 3d2c8ebf494..173d546d426 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 18a5313bb64..cf4900757c7 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 23cc26daec3..48de7f48335 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index bad7be3e90b..548bab2f30a 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 31b748aa1e0..f06938ce0f8 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index fd807c9fec6..4b9a0dc2a9d 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 5d36fef4ce1..bd9764512d6 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index 82ac428acc3..bfff477df54 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-monitor diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index 7e2c36e7ae7..40da79b3cfe 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT jetty-nested Jetty :: Nested diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index eaff21024f8..43b99da8fe2 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-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 8cb9fd1aff6..aed5c0202e0 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.6.0.RC4 + 7.6.0-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 6c4238ec592..98a73a0ce47 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.6.0.RC4 + 7.6.0-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 6d1720b8634..24e2cc919fa 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.6.0.RC4 + 7.6.0-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 d23f6822fac..43ce529208f 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.6.0.RC4 + 7.6.0-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 c5ba902de7b..665b3af9679 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.6.0.RC4 + 7.6.0-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 ec836bfda4e..cb8f9d76281 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.6.0.RC4 + 7.6.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index b62bab46da2..ae30fdd313e 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-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 c15e44e1e47..eedcb97f358 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.6.0.RC4 + 7.6.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 4c953432fe6..75b8349308e 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index e9834588557..391eb9691c7 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index 8fcf4f24e68..192234b2626 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT jetty-policy Jetty :: Policy Tool diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 4884ee6b42d..cdfe6d1c5b0 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 794509fbf94..397991f6299 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 9c78167694d..2b0dfa41526 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index c3c01a9e92d..70ab5daf8a3 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 9517616851e..9e112abff9e 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 4e22f21b200..9fcfa2c2cc8 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 160869b09b8..9e5dc45445a 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index f9e51951a1d..eb1971c5043 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 7e83c083d9c..cfb4b91e581 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 44342165efa..b2a39954309 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 30864c6e04f..63315d4c21c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 19 jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT Jetty :: Project ${jetty.url} pom diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index ef255878f90..498bf751457 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 test-continuation diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml index ad82150c4df..2f5b334f991 100644 --- a/test-jetty-nested/pom.xml +++ b/test-jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT test-jetty-nested Jetty :: Nested Test diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 85c4c5e67ee..65f98aa0f62 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index a8b04a47303..4162b96e66e 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 test-jetty-webapp diff --git a/tests/pom.xml b/tests/pom.xml index 2dc0d802be9..28cee13d78b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 7.6.0.RC4 + 7.6.0-SNAPSHOT org.eclipse.jetty.tests tests-parent diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 858a5fa726a..90bc814ddd0 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.0.RC4 + 7.6.0-SNAPSHOT 4.0.0 test-integration diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index f5bace5540f..a5e08c91017 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.0.RC4 + 7.6.0-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 180b4fb0623..8c829fa6935 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.0.RC4 + 7.6.0-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 0c84215dc45..1152f8a40e2 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.6.0.RC4 + 7.6.0-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 9c921a52613..567cfad6daa 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.6.0.RC4 + 7.6.0-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 6ad1636e559..2979f679288 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.6.0.RC4 + 7.6.0-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 6caf4bafc63..c34dda4cdc9 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.0.RC4 + 7.6.0-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 0744982a245..b46690368a6 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.6.0.RC4 + 7.6.0-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 38fa2d00d49f62b6441903c6fa0078ce8da485c4 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 13 Jan 2012 11:21:37 -0600 Subject: [PATCH 04/11] Updating VERSION.txt top section --- VERSION.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VERSION.txt b/VERSION.txt index d8d5d83268b..4ff3219db23 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-7.6.0-SNAPSHOT + jetty-7.6.0.RC4 - 13 January 2012 + 365048 jetty Http client does not send proxy authentication when requesting a Https-resource through a web-proxy. From fae4f3fda93cbe2b0fe6dec42c1dec54a491c69a Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 13 Jan 2012 23:35:13 +0200 Subject: [PATCH 05/11] Get rid of javax.activation. Java activation framework (JAF) or javax.activation:activation(maven) is an API that is integral part of every Java 5 level virtual machine. As such there is no point in still referencing/downloading/including or making any other operation with it. Simply removing references to it in build scripts makes it use the JVM provided one. Signed-off-by: Jesse McConnell --- jetty-aggregate/jetty-all-server/pom.xml | 9 --------- jetty-aggregate/jetty-all/pom.xml | 9 --------- jetty-aggregate/jetty-plus/pom.xml | 9 --------- jetty-distribution/pom.xml | 2 -- jetty-osgi/test-jetty-osgi/pom.xml | 2 -- pom.xml | 6 ------ 6 files changed, 37 deletions(-) diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index 072ff23321e..ed343ae1360 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -163,10 +163,6 @@ javax.mail mail - - javax.activation - activation - @@ -237,11 +233,6 @@ mail compile - - javax.activation - activation - compile - org.apache.geronimo.specs geronimo-jaspic_1.0_spec diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index 3a6eee3ac51..a59ba910ca0 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -147,10 +147,6 @@ javax.mail mail - - javax.activation - activation - @@ -221,11 +217,6 @@ mail compile - - javax.activation - activation - compile - org.apache.geronimo.specs geronimo-jaspic_1.0_spec diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index ff9bf1f74c9..e265fb4cb04 100644 --- a/jetty-aggregate/jetty-plus/pom.xml +++ b/jetty-aggregate/jetty-plus/pom.xml @@ -96,10 +96,6 @@ javax.mail mail - - javax.activation - activation - @@ -117,10 +113,5 @@ mail compile - - javax.activation - activation - compile - diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 173d546d426..53351fd1e15 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -12,7 +12,6 @@ http://download.eclipse.org/jetty/orbit target/distribution 3.6 - ${javax-activation-version}.0.v201005080500 1.0.0.v20100513-0750 2.1.0.v201004190952 ${javax-mail-version}.v201005082020 @@ -69,7 +68,6 @@ - diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index eedcb97f358..8a67c0316b8 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -14,7 +14,6 @@ http://download.eclipse.org/jetty/orbit/ target/distribution 3.6 - ${javax-activation-version}.0.v201005080500 1.0.0.v20100513-0750 2.1.0.v201004190952 ${javax-mail-version}.v201005082020 @@ -198,7 +197,6 @@ - diff --git a/pom.xml b/pom.xml index 63315d4c21c..534c7e60ef2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,6 @@ ${jetty.url} pom - 1.1 1.4.1 2.1.v20100127 1.1.1 @@ -402,11 +401,6 @@ mail ${javax-mail-version} - - javax.activation - activation - ${javax-activation-version} - junit junit From d4a23c2a65f966aefcd714ebc19512d1e73ccc6d Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 16 Jan 2012 13:58:44 +1100 Subject: [PATCH 06/11] 368633 fixed configure.dtd resource mappings --- .../src/test/resources/contexts/foo.xml | 2 +- .../org/eclipse/jetty/xml/XmlConfiguration.java | 17 +++++++++-------- .../eclipse/jetty/xml/XmlConfigurationTest.java | 8 ++++++++ .../org/eclipse/jetty/xml/configure.xml | 2 +- .../resources/org/eclipse/jetty/xml/mortbay.xml | 4 ++++ .../webapp-contexts/RFC2616/rfc2616-webapp.xml | 2 +- 6 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml diff --git a/jetty-deploy/src/test/resources/contexts/foo.xml b/jetty-deploy/src/test/resources/contexts/foo.xml index cb3e7ddbb94..4c730f0b490 100644 --- a/jetty-deploy/src/test/resources/contexts/foo.xml +++ b/jetty-deploy/src/test/resources/contexts/foo.xml @@ -1,5 +1,5 @@ - + /foo diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java index d5f4df3915c..3945d9c5933 100644 --- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java +++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java @@ -111,21 +111,22 @@ public class XmlConfiguration try { URL config60 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_6_0.dtd",true); - URL config71 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_7_1.dtd",true); - __parser.redirectEntity("configure.dtd",config71); + URL config76 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_7_6.dtd",true); + __parser.redirectEntity("configure.dtd",config76); __parser.redirectEntity("configure_1_0.dtd",config60); __parser.redirectEntity("configure_1_1.dtd",config60); __parser.redirectEntity("configure_1_2.dtd",config60); __parser.redirectEntity("configure_1_3.dtd",config60); __parser.redirectEntity("configure_6_0.dtd",config60); - __parser.redirectEntity("configure_7_1.dtd",config71); + __parser.redirectEntity("configure_7_6.dtd",config76); - __parser.redirectEntity("http://jetty.mortbay.org/configure.dtd",config71); - __parser.redirectEntity("http://jetty.eclipse.org/configure.dtd",config71); - __parser.redirectEntity("http://www.eclipse.org/jetty/configure.dtd",config71); + + __parser.redirectEntity("http://jetty.mortbay.org/configure.dtd",config76); + __parser.redirectEntity("http://jetty.eclipse.org/configure.dtd",config76); + __parser.redirectEntity("http://www.eclipse.org/jetty/configure.dtd",config76); - __parser.redirectEntity("-//Mort Bay Consulting//DTD Configure//EN",config71); - __parser.redirectEntity("-//Jetty//Configure//EN",config71); + __parser.redirectEntity("-//Mort Bay Consulting//DTD Configure//EN",config76); + __parser.redirectEntity("-//Jetty//Configure//EN",config76); } catch (ClassNotFoundException e) { diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java index 700d7508805..16965d4201f 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java @@ -25,6 +25,14 @@ import org.junit.Test; public class XmlConfigurationTest { protected String _configure="org/eclipse/jetty/xml/configure.xml"; + + @Test + public void testMortBay() throws Exception + { + URL url = XmlConfigurationTest.class.getClassLoader().getResource("org/eclipse/jetty/xml/mortbay.xml"); + XmlConfiguration configuration = new XmlConfiguration(url); + Object o=configuration.configure(); + } @Test public void testPassedObject() throws Exception diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml index fd0316bff67..32cda2bcff4 100644 --- a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configure.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml new file mode 100644 index 00000000000..2607bf8a191 --- /dev/null +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml @@ -0,0 +1,4 @@ + + + + diff --git a/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml b/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml index 3cd2269a190..9ed47d422b9 100644 --- a/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml +++ b/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml @@ -1,5 +1,5 @@ - + /rfc2616-webapp From ef9ac7760daf460e6201e3daab35815aa1f6aa8e Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 16 Jan 2012 15:24:31 +1100 Subject: [PATCH 07/11] 368635 moved lifecycle state reporting from toString to dump --- .../eclipse/jetty/io/nio/SelectorManager.java | 5 ++- .../jetty/server/AbstractConnector.java | 5 ++- .../jetty/server/handler/AbstractHandler.java | 2 +- .../util/component/AbstractLifeCycle.java | 5 --- .../util/component/AggregateLifeCycle.java | 33 ++++++++++--------- .../jetty/util/ssl/SslContextFactory.java | 5 ++- .../jetty/util/thread/QueuedThreadPool.java | 2 +- 7 files changed, 25 insertions(+), 32 deletions(-) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java index a28b46ab824..212a6e264c0 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java @@ -372,7 +372,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa /* ------------------------------------------------------------ */ public void dump(Appendable out, String indent) throws IOException { - out.append(String.valueOf(this)).append("\n"); + AggregateLifeCycle.dumpObject(out,this); AggregateLifeCycle.dump(out,indent,TypeUtil.asList(_selectSet)); } @@ -983,9 +983,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa public String toString() { Selector selector=_selector; - return String.format("%s %s keys=%d selected=%d", + return String.format("%s keys=%d selected=%d", super.toString(), - SelectorManager.this.getState(), selector != null && selector.isOpen() ? selector.keys().size() : -1, selector != null && selector.isOpen() ? selector.selectedKeys().size() : -1); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java index 2dd058a615a..e36ee95331b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java @@ -889,11 +889,10 @@ public abstract class AbstractConnector extends AggregateLifeCycle implements Ht @Override public String toString() { - return String.format("%s@%s:%d %s", + return String.format("%s@%s:%d", getClass().getSimpleName(), getHost()==null?"0.0.0.0":getHost(), - getLocalPort()<=0?getPort():getLocalPort(), - AbstractLifeCycle.getState(this)); + getLocalPort()<=0?getPort():getLocalPort()); } /* ------------------------------------------------------------ */ diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java index c17da968245..975e7991e53 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java @@ -94,7 +94,7 @@ public abstract class AbstractHandler extends AggregateLifeCycle implements Hand /* ------------------------------------------------------------ */ public void dumpThis(Appendable out) throws IOException { - out.append(toString()).append(' ').append(getState()).append('\n'); + out.append(toString()).append(" - ").append(getState()).append('\n'); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java index b0ef41ce86c..e99b87555e2 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java @@ -209,9 +209,4 @@ public abstract class AbstractLifeCycle implements LifeCycle public void lifeCycleStopped(LifeCycle event) {} public void lifeCycleStopping(LifeCycle event) {} } - - public String toString() - { - return super.toString()+"#"+getState(); - } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java index 05448362f92..33796a2ba7c 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AggregateLifeCycle.java @@ -339,7 +339,16 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable /* ------------------------------------------------------------ */ protected void dumpThis(Appendable out) throws IOException { - out.append(String.valueOf(this)).append("\n"); + out.append(String.valueOf(this)).append(" - ").append(getState()).append("\n"); + } + + /* ------------------------------------------------------------ */ + public static void dumpObject(Appendable out,Object o) throws IOException + { + if (o instanceof LifeCycle) + out.append(String.valueOf(o)).append(" - ").append((AbstractLifeCycle.getState((LifeCycle)o))).append("\n"); + else + out.append(String.valueOf(o)).append("\n"); } /* ------------------------------------------------------------ */ @@ -359,15 +368,11 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable out.append(indent).append(" +- "); if (b._bean instanceof Dumpable) ((Dumpable)b._bean).dump(out,indent+(i==size?" ":" | ")); - else - out.append(String.valueOf(b._bean)).append("\n"); + else + dumpObject(out,b._bean); } - else - { - out.append(indent).append(" +~ "); - out.append(String.valueOf(b._bean)).append("\n"); - } - + else + dumpObject(out,b._bean); } if (i!=size) @@ -395,16 +400,12 @@ public class AggregateLifeCycle extends AbstractLifeCycle implements Destroyable if (o instanceof Dumpable) ((Dumpable)o).dump(out,indent+(i==size?" ":" | ")); - else - out.append(String.valueOf(o)).append("\n"); + else + dumpObject(out,o); } if (i!=size) - out.append(indent).append(" |\n"); - + out.append(indent).append(" |\n"); } } - - - } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java index 956c294b885..94c0d93cf65 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java @@ -1524,11 +1524,10 @@ public class SslContextFactory extends AbstractLifeCycle /* ------------------------------------------------------------ */ public String toString() { - return String.format("%s@%x(%s,%s)#%s", + return String.format("%s@%x(%s,%s)", getClass().getSimpleName(), hashCode(), _keyStorePath, - _trustStorePath, - getState()); + _trustStorePath); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java index 1efec3536d0..981faa607c0 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java @@ -508,7 +508,7 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo @Override public String toString() { - return _name+"{"+getMinThreads()+"<="+getIdleThreads()+"<="+getThreads()+"/"+getMaxThreads()+","+(_jobs==null?-1:_jobs.size())+"}#"+getState(); + return _name+"{"+getMinThreads()+"<="+getIdleThreads()+"<="+getThreads()+"/"+getMaxThreads()+","+(_jobs==null?-1:_jobs.size())+"}"; } /* ------------------------------------------------------------ */ From 81c48518b63d7535a370befd95d1c5dcaf7a6443 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 16 Jan 2012 15:37:32 +1100 Subject: [PATCH 08/11] 368635 moved lifecycle state reporting from toString to dump --- .../src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java | 2 +- .../src/main/java/org/eclipse/jetty/servlet/Holder.java | 3 ++- .../java/org/eclipse/jetty/util/thread/QueuedThreadPool.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java index 475a2da3a73..f833cef3ab5 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java @@ -337,7 +337,7 @@ public class MBeanContainer extends AbstractLifeCycle implements Container.Liste public void dump(Appendable out, String indent) throws IOException { - out.append(toString()).append("\n"); + AggregateLifeCycle.dumpObject(out,this); AggregateLifeCycle.dump(out, indent, _beans.entrySet()); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java index cbbbb02ec9b..0622de2b65e 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java @@ -260,7 +260,8 @@ public class Holder extends AbstractLifeCycle implements Dumpable /* ------------------------------------------------------------ */ public void dump(Appendable out, String indent) throws IOException { - out.append(_name).append("==").append(_className).append("\n"); + out.append(_name).append("==").append(_className) + .append(" - ").append(AbstractLifeCycle.getState(this)).append("\n"); AggregateLifeCycle.dump(out,indent,_initParams.entrySet()); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java index 981faa607c0..e3cccc09dd8 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java @@ -498,7 +498,7 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo } } - out.append(String.valueOf(this)).append("\n"); + AggregateLifeCycle.dumpObject(out,this); AggregateLifeCycle.dump(out,indent,dump); } From 50fe23882aa937bfde6efa765aaefe20ce883efd Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 17 Jan 2012 15:24:52 +1100 Subject: [PATCH 09/11] 368787 always set token view to new header buffers in httpparser --- .../org/eclipse/jetty/http/HttpParser.java | 39 ++---- .../jetty/server/HttpConnectionTest.java | 4 +- .../jetty/server/HttpServerTestBase.java | 74 ++++++++++- .../eclipse/jetty/server/UnreadInputTest.java | 118 ------------------ 4 files changed, 85 insertions(+), 150 deletions(-) delete mode 100644 jetty-server/src/test/java/org/eclipse/jetty/server/UnreadInputTest.java diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java index f7327177407..485eb4307f4 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java @@ -63,8 +63,8 @@ public class HttpParser implements Parser private Buffer _body; // Buffer for large content private Buffer _buffer; // The current buffer in use (either _header or _content) private CachedBuffer _cached; - private View.CaseInsensitive _tok0; // Saved token: header name, request method or response version - private View.CaseInsensitive _tok1; // Saved token: header value, request URI or response code + private final View.CaseInsensitive _tok0; // Saved token: header name, request method or response version + private final View.CaseInsensitive _tok1; // Saved token: header value, request URI or response code private String _multiLineValue; private int _responseStatus; // If >0 then we are parsing a response private boolean _forceContentBuffer; @@ -93,13 +93,8 @@ public class HttpParser implements Parser _buffer=buffer; _handler=handler; - if (buffer != null) - { - _tok0=new View.CaseInsensitive(buffer); - _tok1=new View.CaseInsensitive(buffer); - _tok0.setPutIndex(_tok0.getIndex()); - _tok1.setPutIndex(_tok1.getIndex()); - } + _tok0=new View.CaseInsensitive(_header); + _tok1=new View.CaseInsensitive(_header); } /* ------------------------------------------------------------------------------- */ @@ -114,6 +109,8 @@ public class HttpParser implements Parser _buffers=buffers; _endp=endp; _handler=handler; + _tok0=new View.CaseInsensitive(); + _tok1=new View.CaseInsensitive(); } /* ------------------------------------------------------------------------------- */ @@ -256,17 +253,7 @@ public class HttpParser implements Parser return 0; if (_buffer==null) - { - if (_header == null) - { - _header=_buffers.getHeader(); - } - _buffer=_header; - _tok0=new View.CaseInsensitive(_header); - _tok1=new View.CaseInsensitive(_header); - _tok0.setPutIndex(_tok0.getIndex()); - _tok1.setPutIndex(_tok1.getIndex()); - } + _buffer=getHeaderBuffer(); if (_state == STATE_CONTENT && _contentPosition == _contentLength) @@ -1013,11 +1000,7 @@ public class HttpParser implements Parser { // Do we have a buffer? if (_buffer==null) - { - _buffer=_header=getHeaderBuffer(); - _tok0=new View.CaseInsensitive(_buffer); - _tok1=new View.CaseInsensitive(_buffer); - } + _buffer=getHeaderBuffer(); // Is there unconsumed content in body buffer if (_state>STATE_END && _buffer==_header && _header!=null && !_header.hasContent() && _body!=null && _body.hasContent()) @@ -1086,9 +1069,7 @@ public class HttpParser implements Parser // This is probably a pipelined header of the next request, so we need to // copy it to the header buffer. if (_header==null) - { - _header=_buffers.getHeader(); - } + getHeaderBuffer(); else { _header.setMarkIndex(-1); @@ -1165,6 +1146,8 @@ public class HttpParser implements Parser if (_header == null) { _header=_buffers.getHeader(); + _tok0.update(_header); + _tok1.update(_header); } return _header; } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java index 67207366582..1e258f33a9b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java @@ -448,8 +448,8 @@ public class HttpConnectionTest PrintWriter writer = response.getWriter(); writer.write("

FOO

"); writer.flush(); - writer.close(); - throw new RuntimeException("SHOULD NOT GET HERE"); + if (!writer.checkError()) + throw new RuntimeException("SHOULD NOT GET HERE"); } catch(Exception e) { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java index bb0d105a99f..78814183440 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java @@ -31,16 +31,21 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import junit.framework.Assert; + +import org.eclipse.jetty.http.HttpParser; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.StdErrLog; import org.junit.Test; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertThat; /** * @@ -492,7 +497,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture } finally { - System.err.println("Got "+total+" of "+(512*1024)); + //System.err.println("Got "+total+" of "+(512*1024)); client.close(); } } @@ -739,7 +744,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture IO.copy(is,bout); byte[] b=bout.toByteArray(); - System.err.println("OUTPUT: "+new String(b)); + //System.err.println("OUTPUT: "+new String(b)); int i=0; while (b[i]!='Z') i++; @@ -1205,4 +1210,69 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture + @Test + public void testUnreadInput () throws Exception + { + configureServer(new NoopHandler()); + final int REQS=5; + String content="This is a loooooooooooooooooooooooooooooooooo"+ + "ooooooooooooooooooooooooooooooooooooooooooooo"+ + "ooooooooooooooooooooooooooooooooooooooooooooo"+ + "ooooooooooooooooooooooooooooooooooooooooooooo"+ + "ooooooooooooooooooooooooooooooooooooooooooooo"+ + "ooooooooooooooooooooooooooooooooooooooooooooo"+ + "ooooooooooooooooooooooooooooooooooooooooooooo"+ + "ooooooooooooooooooooooooooooooooooooooooooooo"+ + "ooooooooooooooooooooooooooooooooooooooooooooo"+ + "oooooooooooonnnnnnnnnnnnnnnnggggggggg content"+ + new String(new char[65*1024]); + final byte[] bytes = content.getBytes(); + + Socket client=newSocket(HOST,_connector.getLocalPort()); + final OutputStream out=client.getOutputStream(); + + new Thread() + { + public void run() + { + try + { + for (int i=0; i Date: Tue, 17 Jan 2012 22:53:53 +1100 Subject: [PATCH 10/11] 368773 process data constraints without realm --- .../security/ConstraintSecurityHandler.java | 11 +- .../jetty/security/SecurityHandler.java | 37 +++- .../jetty/security/DataConstraintsTest.java | 178 ++++++++++++++++++ .../handler/AbstractHandlerContainer.java | 2 +- 4 files changed, 215 insertions(+), 13 deletions(-) create mode 100644 jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java index 44280872b43..e6356026ce2 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java @@ -358,7 +358,7 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr { if (connector.isIntegral(request)) return true; - if (connector.getConfidentialPort() > 0) + if (connector.getIntegralPort() > 0) { String url = connector.getIntegralScheme() + "://" + request.getServerName() + ":" + connector.getIntegralPort() + request.getRequestURI(); if (request.getQueryString() != null) @@ -440,6 +440,13 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr public void dump(Appendable out,String indent) throws IOException { dumpThis(out); - dump(out,indent,TypeUtil.asList(getHandlers()),getBeans(),Collections.singleton(_roles),_constraintMap.entrySet()); + dump(out,indent, + Collections.singleton(getLoginService()), + Collections.singleton(getIdentityService()), + Collections.singleton(getAuthenticator()), + Collections.singleton(_roles), + _constraintMap.entrySet(), + getBeans(), + TypeUtil.asList(getHandlers())); } } diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java index 7e4232c5795..da34f2d6337 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java @@ -244,16 +244,19 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti return _initParameters.put(key,value); } - /* ------------------------------------------------------------ */ protected LoginService findLoginService() { List list = getServer().getBeans(LoginService.class); - for (LoginService service : list) - if (service.getName()!=null && service.getName().equals(getRealmName())) - return service; - if (list.size()>0) + String realm=getRealmName(); + if (realm!=null) + { + for (LoginService service : list) + if (service.getName()!=null && service.getName().equals(realm)) + return service; + } + else if (list.size()==1) return list.get(0); return null; } @@ -414,7 +417,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti final Authenticator authenticator = _authenticator; - if (authenticator!=null && checkSecurity(baseRequest)) + if (checkSecurity(baseRequest)) { Object constraintInfo = prepareConstraintInfo(pathInContext, baseRequest); @@ -433,13 +436,24 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti boolean isAuthMandatory = isAuthMandatory(baseRequest, base_response, constraintInfo); + if (isAuthMandatory && authenticator==null) + { + LOG.warn("No authenticator for: "+constraintInfo); + if (!baseRequest.isHandled()) + { + response.sendError(Response.SC_FORBIDDEN); + baseRequest.setHandled(true); + } + return; + } + // check authentication Object previousIdentity = null; try { Authentication authentication = baseRequest.getAuthentication(); if (authentication==null || authentication==Authentication.NOT_CHECKED) - authentication=authenticator.validateRequest(request, response, isAuthMandatory); + authentication=authenticator==null?Authentication.UNAUTHENTICATED:authenticator.validateRequest(request, response, isAuthMandatory); if (authentication instanceof Authentication.Wrapped) { @@ -500,9 +514,11 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti else { baseRequest.setAuthentication(authentication); - previousIdentity = _identityService.associate(null); + if (_identityService!=null) + previousIdentity = _identityService.associate(null); handler.handle(pathInContext, baseRequest, request, response); - authenticator.secureResponse(request, response, isAuthMandatory, null); + if (authenticator!=null) + authenticator.secureResponse(request, response, isAuthMandatory, null); } } catch (ServerAuthException e) @@ -513,7 +529,8 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti } finally { - _identityService.disassociate(previousIdentity); + if (_identityService!=null) + _identityService.disassociate(previousIdentity); } } else diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java new file mode 100644 index 00000000000..8b3ab580418 --- /dev/null +++ b/jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java @@ -0,0 +1,178 @@ +// ======================================================================== +// 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. +// ======================================================================== + +package org.eclipse.jetty.security; + +import static org.junit.Assert.assertThat; +import static org.junit.matchers.JUnitMatchers.containsString; + +import java.io.IOException; +import java.util.Arrays; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.http.HttpSchemes; +import org.eclipse.jetty.io.EndPoint; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.LocalConnector; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.server.session.SessionHandler; +import org.eclipse.jetty.util.security.Constraint; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * @version $Revision: 1441 $ $Date: 2010-04-02 12:28:17 +0200 (Fri, 02 Apr 2010) $ + */ +public class DataConstraintsTest +{ + private Server _server; + private LocalConnector _connector; + private LocalConnector _connectorS; + private SessionHandler _session; + private ConstraintSecurityHandler _security; + + @Before + public void startServer() + { + _server = new Server(); + _connector = new LocalConnector(); + _connector.setIntegralPort(9998); + _connector.setIntegralScheme("FTP"); + _connector.setConfidentialPort(9999); + _connector.setConfidentialScheme("SPDY"); + _connectorS = new LocalConnector() + { + @Override + public void customize(EndPoint endpoint, Request request) throws IOException + { + super.customize(endpoint,request); + request.setScheme(HttpSchemes.HTTPS); + } + + @Override + public boolean isIntegral(Request request) + { + return true; + } + + @Override + public boolean isConfidential(Request request) + { + return true; + } + }; + _server.setConnectors(new Connector[]{_connector,_connectorS}); + + ContextHandler _context = new ContextHandler(); + _session = new SessionHandler(); + + _context.setContextPath("/ctx"); + _server.setHandler(_context); + _context.setHandler(_session); + + _security = new ConstraintSecurityHandler(); + _session.setHandler(_security); + + _security.setHandler(new AbstractHandler() + { + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.sendError(404); + } + }); + + } + + @After + public void stopServer() throws Exception + { + if (_server.isRunning()) + { + _server.stop(); + _server.join(); + } + } + + @Test + public void testIntegral() throws Exception + { + Constraint constraint0 = new Constraint(); + constraint0.setAuthenticate(false); + constraint0.setName("integral"); + constraint0.setDataConstraint(Constraint.DC_INTEGRAL); + ConstraintMapping mapping0 = new ConstraintMapping(); + mapping0.setPathSpec("/integral/*"); + mapping0.setConstraint(constraint0); + + _security.setConstraintMappings(Arrays.asList(new ConstraintMapping[] + { + mapping0 + })); + + _server.start(); + + String response; + response = _connector.getResponses("GET /ctx/some/thing HTTP/1.0\r\n\r\n"); + assertThat(response, containsString("HTTP/1.1 404 Not Found")); + + response = _connector.getResponses("GET /ctx/integral/info HTTP/1.0\r\n\r\n"); + assertThat(response, containsString("HTTP/1.1 302 Found")); + assertThat(response, containsString("Location: FTP://")); + assertThat(response, containsString(":9998")); + + response = _connectorS.getResponses("GET /ctx/integral/info HTTP/1.0\r\n\r\n"); + assertThat(response, containsString("HTTP/1.1 404 Not Found")); + + } + + @Test + public void testConfidential() throws Exception + { + Constraint constraint0 = new Constraint(); + constraint0.setAuthenticate(false); + constraint0.setName("confid"); + constraint0.setDataConstraint(Constraint.DC_CONFIDENTIAL); + ConstraintMapping mapping0 = new ConstraintMapping(); + mapping0.setPathSpec("/confid/*"); + mapping0.setConstraint(constraint0); + + _security.setConstraintMappings(Arrays.asList(new ConstraintMapping[] + { + mapping0 + })); + + _server.start(); + + String response; + response = _connector.getResponses("GET /ctx/some/thing HTTP/1.0\r\n\r\n"); + assertThat(response, containsString("HTTP/1.1 404 Not Found")); + + response = _connector.getResponses("GET /ctx/confid/info HTTP/1.0\r\n\r\n"); + assertThat(response, containsString("HTTP/1.1 302 Found")); + assertThat(response, containsString("Location: SPDY://")); + assertThat(response, containsString(":9999")); + + response = _connectorS.getResponses("GET /ctx/confid/info HTTP/1.0\r\n\r\n"); + assertThat(response, containsString("HTTP/1.1 404 Not Found")); + + } + +} diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java index 263a948ce1b..345c23a035c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java @@ -113,6 +113,6 @@ public abstract class AbstractHandlerContainer extends AbstractHandler implement public void dump(Appendable out,String indent) throws IOException { dumpThis(out); - dump(out,indent,TypeUtil.asList(getHandlers()),getBeans()); + dump(out,indent,getBeans(),TypeUtil.asList(getHandlers())); } } From 1537433b8199a412149619cdc372c484594ba9c0 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 17 Jan 2012 23:59:12 +1100 Subject: [PATCH 11/11] 368821 Only do SSL asyncDispatch for temp buffer fills --- .../eclipse/jetty/io/nio/SslConnection.java | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java index d531dc606e9..942b7f29652 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java @@ -274,40 +274,55 @@ public class SslConnection extends AbstractConnection implements AsyncConnection boolean some_progress=false; try { + // We need buffers to progress allocateBuffers(); + + // if we don't have a buffer to put received data into if (toFill==null) { + // use the unwrapbuffer to hold received data. _unwrapBuf.compact(); toFill=_unwrapBuf; } + // Else if the fill buffer is too small for the SSL session else if (toFill.capacity()<_session.getApplicationBufferSize()) { + // fill to the temporary unwrapBuffer boolean progress=process(null,toFlush); + + // if we received any data, if (_unwrapBuf!=null && _unwrapBuf.hasContent()) { + // transfer from temp buffer to fill buffer _unwrapBuf.skip(toFill.put(_unwrapBuf)); return true; } else + // return progress from recursive call return progress; } + // Else if there is some temporary data else if (_unwrapBuf!=null && _unwrapBuf.hasContent()) { + // transfer from temp buffer to fill buffer _unwrapBuf.skip(toFill.put(_unwrapBuf)); return true; } + // If we are here, we have a buffer ready into which we can put some read data. + // If we have no data to flush, flush the empty buffer if (toFlush==null) toFlush=__ZERO_BUFFER; + // While we are making progress processing SSL engine boolean progress=true; - while (progress) { progress=false; + + // Do any real IO int filled=0,flushed=0; - try { // Read any available data @@ -356,20 +371,6 @@ public class SslConnection extends AbstractConnection implements AsyncConnection task.run(); } - // Detect SUN JVM Bug!!! - /* TODO - if(initialStatus==HandshakeStatus.NOT_HANDSHAKING && - _engine.getHandshakeStatus()==HandshakeStatus.NEED_UNWRAP && sent==0 ) - { - // This should be NEED_WRAP - // The fix simply detects the signature of the bug and then close the connection (fail-fast) so that ff3 will delegate to using SSL instead of TLS. - // This is a jvm bug on java1.6 where the SSLEngine expects more data from the initial handshake when the client(ff3-tls) already had given it. - // See http://jira.codehaus.org/browse/JETTY-567 for more details - LOG.warn("{} JETTY-567",_session); - _endp.close(); - return false; - } - */ } break; @@ -401,10 +402,12 @@ public class SslConnection extends AbstractConnection implements AsyncConnection if (_endp.isOpen() && _engine.isOutboundDone() && !_outbound.hasContent()) _endp.shutdownOutput(); + // remember if any progress has been made some_progress|=progress; } - if (toFill.hasContent()) + // If we are reading into the temp buffer and it has some content, then we should be dispatched. + if (toFill==_unwrapBuf && _unwrapBuf.hasContent()) _aEndp.asyncDispatch(); } finally