From 961572d3793593c8224d074287890c7097c1042c Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 18 Sep 2009 19:05:14 +0000 Subject: [PATCH 1/4] [maven-release-plugin] prepare release jetty-7.0.0.RC6 git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x@934 7e9141cc-0065-0410-87d8-b60c137991c4 --- 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 | 4 ++-- jetty-http/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-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-xml/pom.xml | 2 +- pom.xml | 8 ++++---- test-continuation-jetty6/pom.xml | 2 +- test-continuation/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-webapps/pom.xml | 2 +- tests/test-webapps/test-webapp-logging-commons/pom.xml | 2 +- tests/test-webapps/test-webapp-logging-java/pom.xml | 2 +- tests/test-webapps/test-webapp-logging-log4j/pom.xml | 2 +- tests/test-webapps/test-webapp-logging-slf4j/pom.xml | 2 +- tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 44 files changed, 48 insertions(+), 48 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index 82d1dacbc723..ae240f01a683 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 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 77408e07cf63..f770b44c17f2 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.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index 139b372af229..cd691da5a3db 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.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index 6a5b360590d3..8579a58af04c 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.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index be6d29256251..291773f229f6 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.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index 814319dce797..d3d91621ef9f 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.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index 581dad5c1906..9b7c0c394a7b 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.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index af9643177632..072c770af9d9 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.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 462ae76b0879..7fb79f9dd7c9 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index e1c537331113..690907c01d33 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 2a7d4a406075..a6b2f2acfaf3 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 85ad3f179f43..d21f84d3f128 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-client diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index b430b6ed7900..e74695da1ec7 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 91039d72d5f6..462c05706663 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 4ba9fff46c02..87b3089c217c 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 jetty-distribution Jetty :: Distribution Assemblies @@ -44,7 +44,7 @@ - + diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 912cc35c3410..20fbbd3e71dc 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 1226373759b1..934b8f1e1746 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 0721cb962b49..809be56a6acf 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 18bad4a4accf..7d1f8b12e40c 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 574e1393a131..304459e5b628 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-jndi diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 9396114f385a..c4b5c9db2449 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index 9307e573c5cb..64581ffbb93a 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 org.eclipse.jetty jetty-policy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index af06f3668e12..bb012b17f467 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 26b6d607ba12..a8cc6a449506 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index dd2dd1fb3a43..b1f1064d081c 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 6280c65d32d6..5af946e5fe56 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 56e9a8a5e91b..7d5146fa885c 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-servlets diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 5edab24bfc0f..2990fe29bd1a 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index e17138337b5c..14726fafa485 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 1bb84de46c0d..f36f3807c9c9 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-webapp diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 5b085aa2db73..4c5f03e2baa9 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 528e02be9bd5..8ca6a9cf1440 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 Jetty :: Project ${jetty.url} pom @@ -26,9 +26,9 @@ UTF-8 - scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x - scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x - http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x + scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.0.0.RC6 + scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.0.0.RC6 + http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.0.0.RC6 install diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml index c75b5a97db5f..d269045d7ba1 100644 --- a/test-continuation-jetty6/pom.xml +++ b/test-continuation-jetty6/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 test-continuation-jetty6 diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 48aa192ef096..7f4a1e807455 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 test-continuation diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 095169654004..ca757686d52b 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index 3aaa1e590fc4..ba4446af2518 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 org.eclipse.jetty diff --git a/tests/pom.xml b/tests/pom.xml index 8754868f45dc..b026b8193c0f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 org.eclipse.jetty.tests tests-parent diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 8e98e1775a78..4936a15b45ca 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 4.0.0 test-integration diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 5565e4224f20..c286c49134f1 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 test-webapps-parent Jetty Tests :: WebApps :: Parent diff --git a/tests/test-webapps/test-webapp-logging-commons/pom.xml b/tests/test-webapps/test-webapp-logging-commons/pom.xml index 2427b6a37932..e333b4c4b4d9 100644 --- a/tests/test-webapps/test-webapp-logging-commons/pom.xml +++ b/tests/test-webapps/test-webapp-logging-commons/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 test-webapp-logging-commons Jetty Tests :: WebApp :: Commons Logging diff --git a/tests/test-webapps/test-webapp-logging-java/pom.xml b/tests/test-webapps/test-webapp-logging-java/pom.xml index 05474728677d..8550bae27aff 100644 --- a/tests/test-webapps/test-webapp-logging-java/pom.xml +++ b/tests/test-webapps/test-webapp-logging-java/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 test-webapp-logging-java Jetty Tests :: WebApp :: JavaSE Logging diff --git a/tests/test-webapps/test-webapp-logging-log4j/pom.xml b/tests/test-webapps/test-webapp-logging-log4j/pom.xml index cedbcc4debe7..0a2f909fcdac 100644 --- a/tests/test-webapps/test-webapp-logging-log4j/pom.xml +++ b/tests/test-webapps/test-webapp-logging-log4j/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 test-webapp-logging-log4j Jetty Tests :: WebApp :: Log4J Logging diff --git a/tests/test-webapps/test-webapp-logging-slf4j/pom.xml b/tests/test-webapps/test-webapp-logging-slf4j/pom.xml index f8b1f1eaca37..13f28ba5a1ac 100644 --- a/tests/test-webapps/test-webapp-logging-slf4j/pom.xml +++ b/tests/test-webapps/test-webapp-logging-slf4j/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.0.0.RC6-SNAPSHOT + 7.0.0.RC6 test-webapp-logging-slf4j Jetty Tests :: WebApp :: Slf4J Logging diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 39e0a79507f5..6db8898044ba 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.0.0.RC6-SNAPSHOT + 7.0.0.RC6 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From d93c13da58520d67ecc166f0b962d5cc558a4dde Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Fri, 18 Sep 2009 19:05:30 +0000 Subject: [PATCH 2/4] [maven-release-plugin] prepare for next development iteration git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x@936 7e9141cc-0065-0410-87d8-b60c137991c4 --- 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/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-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-xml/pom.xml | 2 +- pom.xml | 8 ++++---- test-continuation-jetty6/pom.xml | 2 +- test-continuation/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-webapps/pom.xml | 2 +- tests/test-webapps/test-webapp-logging-commons/pom.xml | 2 +- tests/test-webapps/test-webapp-logging-java/pom.xml | 2 +- tests/test-webapps/test-webapp-logging-log4j/pom.xml | 2 +- tests/test-webapps/test-webapp-logging-slf4j/pom.xml | 2 +- tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 44 files changed, 47 insertions(+), 47 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index ae240f01a683..9e0cc359a67a 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-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 f770b44c17f2..34709ca89f78 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.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index cd691da5a3db..b110fc574bc5 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.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index 8579a58af04c..a81c62ab39fc 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.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index 291773f229f6..83095fda963f 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.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index d3d91621ef9f..06d7eefad7bd 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.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index 9b7c0c394a7b..fa3463ed11e0 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.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index 072c770af9d9..e53a764685bd 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.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty.aggregate diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 7fb79f9dd7c9..6bc79a5c4670 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index 690907c01d33..ca3fea7dd421 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index a6b2f2acfaf3..31bddfd4420e 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index d21f84d3f128..0abf5f2d18a0 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-client diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index e74695da1ec7..793ce0494d14 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 462c05706663..f5fe0b3009ee 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 87b3089c217c..433eb76e81cc 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 20fbbd3e71dc..2ff5e5b19987 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 934b8f1e1746..d0d12d7222b6 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 809be56a6acf..546c1abb0f03 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 7d1f8b12e40c..c11c0ad70b08 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 304459e5b628..75addf63c185 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index c4b5c9db2449..9d9e9054223c 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index 64581ffbb93a..4cd75ef6963b 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT org.eclipse.jetty jetty-policy diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index bb012b17f467..d441d1cb6cd3 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index a8cc6a449506..0727717ead2a 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index b1f1064d081c..52da0fd53f6c 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 5af946e5fe56..d04d0e1be1db 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 7d5146fa885c..8c6b0548ffcd 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 2990fe29bd1a..17f3b5b4b4fd 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 14726fafa485..50fe47b41677 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index f36f3807c9c9..b9919f71fb26 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 4c5f03e2baa9..61dd4310e2bc 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 8ca6a9cf1440..338f9e64046a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT Jetty :: Project ${jetty.url} pom @@ -26,9 +26,9 @@ UTF-8 - scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.0.0.RC6 - scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.0.0.RC6 - http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.0.0.RC6 + scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x + scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x + http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x install diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml index d269045d7ba1..2d57972e7854 100644 --- a/test-continuation-jetty6/pom.xml +++ b/test-continuation-jetty6/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 test-continuation-jetty6 diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 7f4a1e807455..f561464f926a 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 test-continuation diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index ca757686d52b..4605915c4d9a 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index ba4446af2518..a39cb505e894 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/tests/pom.xml b/tests/pom.xml index b026b8193c0f..51daa15b48c5 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT org.eclipse.jetty.tests tests-parent diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 4936a15b45ca..2a02e12abe3f 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT 4.0.0 test-integration diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index c286c49134f1..07635a9c879d 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT test-webapps-parent Jetty Tests :: WebApps :: Parent diff --git a/tests/test-webapps/test-webapp-logging-commons/pom.xml b/tests/test-webapps/test-webapp-logging-commons/pom.xml index e333b4c4b4d9..cc3e3b504d8e 100644 --- a/tests/test-webapps/test-webapp-logging-commons/pom.xml +++ b/tests/test-webapps/test-webapp-logging-commons/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT test-webapp-logging-commons Jetty Tests :: WebApp :: Commons Logging diff --git a/tests/test-webapps/test-webapp-logging-java/pom.xml b/tests/test-webapps/test-webapp-logging-java/pom.xml index 8550bae27aff..6e993c2cfd6a 100644 --- a/tests/test-webapps/test-webapp-logging-java/pom.xml +++ b/tests/test-webapps/test-webapp-logging-java/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT test-webapp-logging-java Jetty Tests :: WebApp :: JavaSE Logging diff --git a/tests/test-webapps/test-webapp-logging-log4j/pom.xml b/tests/test-webapps/test-webapp-logging-log4j/pom.xml index 0a2f909fcdac..c06e108a69dc 100644 --- a/tests/test-webapps/test-webapp-logging-log4j/pom.xml +++ b/tests/test-webapps/test-webapp-logging-log4j/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT test-webapp-logging-log4j Jetty Tests :: WebApp :: Log4J Logging diff --git a/tests/test-webapps/test-webapp-logging-slf4j/pom.xml b/tests/test-webapps/test-webapp-logging-slf4j/pom.xml index 13f28ba5a1ac..14c30b7eeed9 100644 --- a/tests/test-webapps/test-webapp-logging-slf4j/pom.xml +++ b/tests/test-webapps/test-webapp-logging-slf4j/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.0.0.RC6 + 7.0.0.RC7-SNAPSHOT test-webapp-logging-slf4j Jetty Tests :: WebApp :: Slf4J Logging diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 6db8898044ba..3ff05c7bae22 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.0.0.RC6 + 7.0.0.RC7-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 35f6e679cfbdcf69887b0ef517f121fc7e3640e8 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 21 Sep 2009 02:45:01 +0000 Subject: [PATCH 3/4] 289958 StatisticsServlet incorrectly adds StatisticsHandler git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x@937 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 3 + .../jetty/servlet/StatisticsServlet.java | 18 ++-- .../jetty/servlet/StatisticsServletTest.java | 102 ++++++++++++++++++ 3 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 jetty-servlet/src/test/java/org/eclipse/jetty/servlet/StatisticsServletTest.java diff --git a/VERSION.txt b/VERSION.txt index beb8bee50518..b81c9ca7c9dd 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,6 @@ +jetty-7.0.0.RC7-SNAPSHOT + + 289958 StatisticsServlet incorrectly adds StatisticsHandler + jetty-7.0.0.RC6 September 18th 2009 + JETTY-719 Document state machine of jetty http client + JETTY-780 CNFE during startup of webapp with spring-context >= 2.5.1 diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java index 94d649107c71..5fe3f9845550 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/StatisticsServlet.java @@ -39,8 +39,6 @@ public class StatisticsServlet extends HttpServlet public void init() throws ServletException { - _memoryBean = ManagementFactory.getMemoryMXBean(); - ServletContext context = getServletContext(); ContextHandler.Context scontext = (ContextHandler.Context) context; Server _server = scontext.getContextHandler().getServer(); @@ -53,12 +51,11 @@ public void init() throws ServletException } else { - Log.info("Installing Statistics Handler"); - _statsHandler = new StatisticsHandler(); - _server.setHandler(_statsHandler); + Log.warn("Statistics Handler not installed!"); + return; } - - + + _memoryBean = ManagementFactory.getMemoryMXBean(); _connectors = _server.getConnectors(); if (getInitParameter("restrictToLocalhost") != null) @@ -75,7 +72,12 @@ public void doPost(HttpServletRequest sreq, HttpServletResponse sres) throws Ser protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - + if (_statsHandler == null) + { + Log.warn("Statistics Handler not installed!"); + resp.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); + return; + } if (_restrictToLocalhost) { if (!"127.0.0.1".equals(req.getRemoteAddr())) diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/StatisticsServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/StatisticsServletTest.java new file mode 100644 index 000000000000..0c4fae7fa72c --- /dev/null +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/StatisticsServletTest.java @@ -0,0 +1,102 @@ +// ======================================================================== +// Copyright (c) 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.servlet; + +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.LocalConnector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.StatisticsHandler; + +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + +public class StatisticsServletTest extends TestCase +{ + Server server; + LocalConnector connector; + ServletContextHandler context; + + protected void setUp() throws Exception + { + super.setUp(); + + server = new Server(); + server.setSendServerVersion(false); + context = new ServletContextHandler(); + context.setContextPath("/"); + ServletHolder holder = new ServletHolder(); + holder.setServlet(new org.eclipse.jetty.servlet.StatisticsServlet()); + holder.setInitParameter("restrictToLocalhost", "false"); + context.addServlet(holder, "/stats"); + + server.setHandler(context); + connector = new LocalConnector(); + server.addConnector(connector); + } + + protected void tearDown() throws Exception + { + super.tearDown(); + + if (server != null) + { + server.stop(); + } + } + + + public void testNoHandler () throws Exception + { + server.start(); + + StringBuffer req1 = new StringBuffer(); + req1.append("GET /stats HTTP/1.1\n"); + req1.append("Host: localhost\n"); + req1.append("\n"); + + String response = connector.getResponses(req1.toString()); + assertResponseContains("503", response); + } + + public void testWithHandler () throws Exception + { + StatisticsHandler statsHandler = new StatisticsHandler(); + statsHandler.setHandler(context); + server.setHandler(statsHandler); + server.start(); + + StringBuffer req1 = new StringBuffer(); + req1.append("GET /stats HTTP/1.1\n"); + req1.append("Host: localhost\n"); + req1.append("\n"); + + String response = connector.getResponses(req1.toString()); + assertResponseContains("Statistics gathering started ", response); + } + + + private void assertResponseContains(String expected, String response) + { + int idx = response.indexOf(expected); + if (idx == (-1)) + { + // Not found + StringBuffer err = new StringBuffer(); + err.append("Response does not contain expected string \"").append(expected).append("\""); + err.append("\n").append(response); + + System.err.println(err); + throw new AssertionFailedError(err.toString()); + } + } +} From 16dc3c6fdbf6c9efd4d700b03ed4f6e7ec6f1d71 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 21 Sep 2009 07:42:17 +0000 Subject: [PATCH 4/4] Remove printlns from jetty-plus git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/branches/jetty-7.0.0.x@941 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../org/eclipse/jetty/plus/annotation/Injection.java | 11 ++--------- .../jetty/plus/annotation/LifeCycleCallback.java | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index b81c9ca7c9dd..1cd037c2704b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,5 +1,6 @@ jetty-7.0.0.RC7-SNAPSHOT + 289958 StatisticsServlet incorrectly adds StatisticsHandler + + Remove printlns from jetty-plus jetty-7.0.0.RC6 September 18th 2009 + JETTY-719 Document state machine of jetty http client diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java index bab996a0647e..2c03312645cb 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java @@ -237,12 +237,10 @@ protected void injectField (Field field, Object injectable) { try { - System.err.println("Value to inject="+lookupInjectedValue()); boolean accessibility = field.isAccessible(); field.setAccessible(true); field.set(injectable, lookupInjectedValue()); field.setAccessible(accessibility); - System.err.println("Injected field "+_fieldName+" of class "+_className); } catch (Exception e) { @@ -265,12 +263,10 @@ protected void injectMethod (Method method, Object injectable) { try { - System.err.println("Value to inject="+lookupInjectedValue()); boolean accessibility = method.isAccessible(); method.setAccessible(true); method.invoke(injectable, new Object[] {lookupInjectedValue()}); method.setAccessible(accessibility); - System.err.println("Injected method "+_methodName+" of class "+_className); } catch (Exception e) { @@ -311,14 +307,12 @@ protected void loadMethod () if (_targetClass == null) _targetClass = Loader.loadClass(null, _className); - System.err.println("Loaded target class "+_targetClass.getName()); - - System.err.println("Looking for method "+_methodName +" with argument of type "+_paramCanonicalName+" on class "+_className); + Class arg = TypeUtil.fromName(_paramCanonicalName); if (arg == null) arg = Loader.loadClass(null, _paramCanonicalName); - System.err.println("Loaded type: "+arg.getName()); + _target = _targetClass.getDeclaredMethod(_methodName, new Class[] {arg}); } @@ -331,7 +325,6 @@ private boolean validateInjection () //JavaEE spec sec 5.2.4 if (_annotationResourceType != null) { - System.err.println("Validating against annotationResourceType="+_annotationResourceType); if (_target == null) return false; diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java index 1ac9876d8beb..0554901f46a2 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/LifeCycleCallback.java @@ -109,7 +109,6 @@ public void callback (Object instance) getTarget().setAccessible(true); getTarget().invoke(instance, __EMPTY_ARGS); getTarget().setAccessible(accessibility); - System.err.println("Calling callback on "+_className+"."+_methodName); } }