[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jetty-commit] r2952 - in jetty/trunk: . example-jetty-embedded jetty-aggregate jetty-aggregate/jetty-all jetty-aggregate/jetty-all-server jetty-aggregate/jetty-client jetty-aggregate/jetty-plus jetty-aggregate/jetty-server jetty-aggregate/jetty-servlet jetty-aggregate/jetty-webapp jetty-ajp jetty-annotations jetty-client jetty-continuation jetty-deploy jetty-distribution jetty-http jetty-io jetty-jaspi jetty-jmx jetty-jndi jetty-jsp-2.1 jetty-nested jetty-osgi jetty-osgi/jetty-osgi-boot jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp jetty-osgi/jetty-osgi-boot-jsp jetty-osgi/jetty-osgi-boot-logback jetty-osgi/jetty-osgi-boot-warurl jetty-osgi/jetty-osgi-httpservice jetty-osgi/test-jetty-osgi jetty-plus jetty-policy jetty-rewrite jetty-security jetty-server jetty-servlet jetty-servlets jetty-start jetty-util jetty-webapp jetty-websocket jetty-xml test-continuation test-continuation-jetty6 test-jetty-servlet test-jetty-webapp tests tests/test-integration tests/test-loginservice tests/test-sessions tests/test-sessions/test-hash-sessions tests/test-sessions/test-jdbc-sessions tests/test-sessions/test-sessions-common tests/test-webapps tests/test-webapps/test-webapp-rfc2616

Author: gwilkins
Date: 2011-03-31 23:42:09 -0400 (Thu, 31 Mar 2011)
New Revision: 2952

Modified:
   jetty/trunk/example-jetty-embedded/pom.xml
   jetty/trunk/jetty-aggregate/jetty-all-server/pom.xml
   jetty/trunk/jetty-aggregate/jetty-all/pom.xml
   jetty/trunk/jetty-aggregate/jetty-client/pom.xml
   jetty/trunk/jetty-aggregate/jetty-plus/pom.xml
   jetty/trunk/jetty-aggregate/jetty-server/pom.xml
   jetty/trunk/jetty-aggregate/jetty-servlet/pom.xml
   jetty/trunk/jetty-aggregate/jetty-webapp/pom.xml
   jetty/trunk/jetty-aggregate/pom.xml
   jetty/trunk/jetty-ajp/pom.xml
   jetty/trunk/jetty-annotations/pom.xml
   jetty/trunk/jetty-client/pom.xml
   jetty/trunk/jetty-continuation/pom.xml
   jetty/trunk/jetty-deploy/pom.xml
   jetty/trunk/jetty-distribution/pom.xml
   jetty/trunk/jetty-http/pom.xml
   jetty/trunk/jetty-io/pom.xml
   jetty/trunk/jetty-jaspi/pom.xml
   jetty/trunk/jetty-jmx/pom.xml
   jetty/trunk/jetty-jndi/pom.xml
   jetty/trunk/jetty-jsp-2.1/pom.xml
   jetty/trunk/jetty-nested/pom.xml
   jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
   jetty/trunk/jetty-osgi/jetty-osgi-boot-logback/pom.xml
   jetty/trunk/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
   jetty/trunk/jetty-osgi/jetty-osgi-boot/pom.xml
   jetty/trunk/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java
   jetty/trunk/jetty-osgi/jetty-osgi-httpservice/pom.xml
   jetty/trunk/jetty-osgi/pom.xml
   jetty/trunk/jetty-osgi/test-jetty-osgi/pom.xml
   jetty/trunk/jetty-plus/pom.xml
   jetty/trunk/jetty-policy/pom.xml
   jetty/trunk/jetty-rewrite/pom.xml
   jetty/trunk/jetty-security/pom.xml
   jetty/trunk/jetty-server/pom.xml
   jetty/trunk/jetty-servlet/pom.xml
   jetty/trunk/jetty-servlets/pom.xml
   jetty/trunk/jetty-start/pom.xml
   jetty/trunk/jetty-util/pom.xml
   jetty/trunk/jetty-webapp/pom.xml
   jetty/trunk/jetty-websocket/README.txt
   jetty/trunk/jetty-websocket/pom.xml
   jetty/trunk/jetty-xml/pom.xml
   jetty/trunk/pom.xml
   jetty/trunk/test-continuation-jetty6/pom.xml
   jetty/trunk/test-continuation/pom.xml
   jetty/trunk/test-jetty-servlet/pom.xml
   jetty/trunk/test-jetty-webapp/pom.xml
   jetty/trunk/tests/pom.xml
   jetty/trunk/tests/test-integration/pom.xml
   jetty/trunk/tests/test-loginservice/pom.xml
   jetty/trunk/tests/test-sessions/pom.xml
   jetty/trunk/tests/test-sessions/test-hash-sessions/pom.xml
   jetty/trunk/tests/test-sessions/test-jdbc-sessions/pom.xml
   jetty/trunk/tests/test-sessions/test-sessions-common/pom.xml
   jetty/trunk/tests/test-webapps/pom.xml
   jetty/trunk/tests/test-webapps/test-webapp-rfc2616/pom.xml
Log:
Get ready for 7.4 release

Modified: jetty/trunk/example-jetty-embedded/pom.xml
===================================================================
--- jetty/trunk/example-jetty-embedded/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/example-jetty-embedded/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>example-jetty-embedded</artifactId>

Modified: jetty/trunk/jetty-aggregate/jetty-all/pom.xml
===================================================================
--- jetty/trunk/jetty-aggregate/jetty-all/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-aggregate/jetty-all/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: jetty/trunk/jetty-aggregate/jetty-all-server/pom.xml
===================================================================
--- jetty/trunk/jetty-aggregate/jetty-all-server/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-aggregate/jetty-all-server/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.eclipse.jetty.aggregate</groupId>
         <artifactId>jetty-aggregate-project</artifactId>
-        <version>7.3.2-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: jetty/trunk/jetty-aggregate/jetty-client/pom.xml
===================================================================
--- jetty/trunk/jetty-aggregate/jetty-client/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-aggregate/jetty-client/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: jetty/trunk/jetty-aggregate/jetty-plus/pom.xml
===================================================================
--- jetty/trunk/jetty-aggregate/jetty-plus/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-aggregate/jetty-plus/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: jetty/trunk/jetty-aggregate/jetty-server/pom.xml
===================================================================
--- jetty/trunk/jetty-aggregate/jetty-server/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-aggregate/jetty-server/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: jetty/trunk/jetty-aggregate/jetty-servlet/pom.xml
===================================================================
--- jetty/trunk/jetty-aggregate/jetty-servlet/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-aggregate/jetty-servlet/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: jetty/trunk/jetty-aggregate/jetty-webapp/pom.xml
===================================================================
--- jetty/trunk/jetty-aggregate/jetty-webapp/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-aggregate/jetty-webapp/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: jetty/trunk/jetty-aggregate/pom.xml
===================================================================
--- jetty/trunk/jetty-aggregate/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-aggregate/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.aggregate</groupId>
   <artifactId>jetty-aggregate-project</artifactId>

Modified: jetty/trunk/jetty-ajp/pom.xml
===================================================================
--- jetty/trunk/jetty-ajp/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-ajp/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-ajp</artifactId>

Modified: jetty/trunk/jetty-annotations/pom.xml
===================================================================
--- jetty/trunk/jetty-annotations/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-annotations/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-annotations</artifactId>

Modified: jetty/trunk/jetty-client/pom.xml
===================================================================
--- jetty/trunk/jetty-client/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-client/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-project</artifactId>
-        <version>7.3.2-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: jetty/trunk/jetty-continuation/pom.xml
===================================================================
--- jetty/trunk/jetty-continuation/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-continuation/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-continuation</artifactId>

Modified: jetty/trunk/jetty-deploy/pom.xml
===================================================================
--- jetty/trunk/jetty-deploy/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-deploy/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-deploy</artifactId>

Modified: jetty/trunk/jetty-distribution/pom.xml
===================================================================
--- jetty/trunk/jetty-distribution/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-distribution/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-distribution</artifactId>
   <name>Jetty :: Distribution Assemblies</name>

Modified: jetty/trunk/jetty-http/pom.xml
===================================================================
--- jetty/trunk/jetty-http/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-http/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>

Modified: jetty/trunk/jetty-io/pom.xml
===================================================================
--- jetty/trunk/jetty-io/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-io/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>

Modified: jetty/trunk/jetty-jaspi/pom.xml
===================================================================
--- jetty/trunk/jetty-jaspi/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-jaspi/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jaspi</artifactId>

Modified: jetty/trunk/jetty-jmx/pom.xml
===================================================================
--- jetty/trunk/jetty-jmx/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-jmx/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jmx</artifactId>

Modified: jetty/trunk/jetty-jndi/pom.xml
===================================================================
--- jetty/trunk/jetty-jndi/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-jndi/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jndi</artifactId>

Modified: jetty/trunk/jetty-jsp-2.1/pom.xml
===================================================================
--- jetty/trunk/jetty-jsp-2.1/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-jsp-2.1/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jsp-2.1</artifactId>

Modified: jetty/trunk/jetty-nested/pom.xml
===================================================================
--- jetty/trunk/jetty-nested/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-nested/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-nested</artifactId>
   <name>Jetty :: Nested</name>

Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot/pom.xml
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-boot/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-osgi/jetty-osgi-boot/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java	2011-04-01 03:42:09 UTC (rev 2952)
@@ -74,7 +74,7 @@
     	_registry = registry;
     }
 
-    public void stop()
+    public void stop() throws Exception
     {
         if (_scanner != null)
         {

Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot-logback/pom.xml
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-boot-logback/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-osgi/jetty-osgi-boot-logback/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-boot-warurl/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-osgi/jetty-osgi-boot-warurl/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: jetty/trunk/jetty-osgi/jetty-osgi-httpservice/pom.xml
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-httpservice/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-osgi/jetty-osgi-httpservice/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: jetty/trunk/jetty-osgi/pom.xml
===================================================================
--- jetty/trunk/jetty-osgi/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-osgi/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.jetty.osgi</groupId>

Modified: jetty/trunk/jetty-osgi/test-jetty-osgi/pom.xml
===================================================================
--- jetty/trunk/jetty-osgi/test-jetty-osgi/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-osgi/test-jetty-osgi/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: jetty/trunk/jetty-plus/pom.xml
===================================================================
--- jetty/trunk/jetty-plus/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-plus/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-plus</artifactId>

Modified: jetty/trunk/jetty-policy/pom.xml
===================================================================
--- jetty/trunk/jetty-policy/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-policy/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-policy</artifactId>

Modified: jetty/trunk/jetty-rewrite/pom.xml
===================================================================
--- jetty/trunk/jetty-rewrite/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-rewrite/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-rewrite</artifactId>

Modified: jetty/trunk/jetty-security/pom.xml
===================================================================
--- jetty/trunk/jetty-security/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-security/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-security</artifactId>

Modified: jetty/trunk/jetty-server/pom.xml
===================================================================
--- jetty/trunk/jetty-server/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-server/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-server</artifactId>

Modified: jetty/trunk/jetty-servlet/pom.xml
===================================================================
--- jetty/trunk/jetty-servlet/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-servlet/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-servlet</artifactId>

Modified: jetty/trunk/jetty-servlets/pom.xml
===================================================================
--- jetty/trunk/jetty-servlets/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-servlets/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-servlets</artifactId>

Modified: jetty/trunk/jetty-start/pom.xml
===================================================================
--- jetty/trunk/jetty-start/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-start/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-start</artifactId>

Modified: jetty/trunk/jetty-util/pom.xml
===================================================================
--- jetty/trunk/jetty-util/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-util/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-util</artifactId>

Modified: jetty/trunk/jetty-webapp/pom.xml
===================================================================
--- jetty/trunk/jetty-webapp/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-webapp/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-webapp</artifactId>

Modified: jetty/trunk/jetty-websocket/README.txt
===================================================================
--- jetty/trunk/jetty-websocket/README.txt	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-websocket/README.txt	2011-04-01 03:42:09 UTC (rev 2952)
@@ -14,10 +14,11 @@
 A TestServer and TestClient class are available, and can be run either directly from an IDE (if jetty source is
 imported), or from the command line with
 
-  java -cp jetty-aggregate/jetty-all/target/jetty-all-7.3.2-SNAPSHOT.jar:jetty-distribution/target/distribution/lib/servlet-api-2.5.jar
+
+  java -cp jetty-aggregate/jetty-all/target/jetty-all-7.x.y.jar:jetty-distribution/target/distribution/lib/servlet-api-2.5.jar
   org.eclipse.jetty.websocket.TestServer  --help 
 
-  java -cp jetty-aggregate/jetty-all/target/jetty-all-7.3.2-SNAPSHOT.jar:jetty-distribution/target/distribution/lib/servlet-api-2.5.jar
+  java -cp jetty-aggregate/jetty-all/target/jetty-all-7.x.y.jar:jetty-distribution/target/distribution/lib/servlet-api-2.5.jar
   org.eclipse.jetty.websocket.TestClient --help
 
 

Modified: jetty/trunk/jetty-websocket/pom.xml
===================================================================
--- jetty/trunk/jetty-websocket/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-websocket/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>

Modified: jetty/trunk/jetty-xml/pom.xml
===================================================================
--- jetty/trunk/jetty-xml/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/jetty-xml/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-xml</artifactId>

Modified: jetty/trunk/pom.xml
===================================================================
--- jetty/trunk/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -7,7 +7,7 @@
   </parent>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-project</artifactId>
-  <version>7.3.2-SNAPSHOT</version>
+  <version>7.4.0-SNAPSHOT</version>
   <name>Jetty :: Project</name>
   <url>${jetty.url}</url>
   <packaging>pom</packaging>

Modified: jetty/trunk/test-continuation/pom.xml
===================================================================
--- jetty/trunk/test-continuation/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/test-continuation/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>test-continuation</artifactId>

Modified: jetty/trunk/test-continuation-jetty6/pom.xml
===================================================================
--- jetty/trunk/test-continuation-jetty6/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/test-continuation-jetty6/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>test-continuation-jetty6</artifactId>

Modified: jetty/trunk/test-jetty-servlet/pom.xml
===================================================================
--- jetty/trunk/test-jetty-servlet/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/test-jetty-servlet/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>test-jetty-servlet</artifactId>

Modified: jetty/trunk/test-jetty-webapp/pom.xml
===================================================================
--- jetty/trunk/test-jetty-webapp/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/test-jetty-webapp/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>

Modified: jetty/trunk/tests/pom.xml
===================================================================
--- jetty/trunk/tests/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.tests</groupId>
   <artifactId>tests-parent</artifactId>

Modified: jetty/trunk/tests/test-integration/pom.xml
===================================================================
--- jetty/trunk/tests/test-integration/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/test-integration/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>test-integration</artifactId>

Modified: jetty/trunk/tests/test-loginservice/pom.xml
===================================================================
--- jetty/trunk/tests/test-loginservice/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/test-loginservice/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>test-loginservice</artifactId>
   <name>Jetty Tests :: Login Service</name>

Modified: jetty/trunk/tests/test-sessions/pom.xml
===================================================================
--- jetty/trunk/tests/test-sessions/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/test-sessions/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>test-sessions-parent</artifactId>
   <name>Jetty Tests :: Sessions :: Parent</name>

Modified: jetty/trunk/tests/test-sessions/test-hash-sessions/pom.xml
===================================================================
--- jetty/trunk/tests/test-sessions/test-hash-sessions/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/test-sessions/test-hash-sessions/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-sessions-parent</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>test-hash-sessions</artifactId>
   <name>Jetty Tests :: Sessions :: Hash</name>

Modified: jetty/trunk/tests/test-sessions/test-jdbc-sessions/pom.xml
===================================================================
--- jetty/trunk/tests/test-sessions/test-jdbc-sessions/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/test-sessions/test-jdbc-sessions/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-sessions-parent</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>test-jdbc-sessions</artifactId>
   <name>Jetty Tests :: Sessions :: JDBC</name>

Modified: jetty/trunk/tests/test-sessions/test-sessions-common/pom.xml
===================================================================
--- jetty/trunk/tests/test-sessions/test-sessions-common/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/test-sessions/test-sessions-common/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-sessions-parent</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>test-sessions-common</artifactId>
   <name>Jetty Tests :: Sessions :: Common</name>

Modified: jetty/trunk/tests/test-webapps/pom.xml
===================================================================
--- jetty/trunk/tests/test-webapps/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/test-webapps/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>test-webapps-parent</artifactId>
   <name>Jetty Tests :: WebApps :: Parent</name>

Modified: jetty/trunk/tests/test-webapps/test-webapp-rfc2616/pom.xml
===================================================================
--- jetty/trunk/tests/test-webapps/test-webapp-rfc2616/pom.xml	2011-04-01 03:04:55 UTC (rev 2951)
+++ jetty/trunk/tests/test-webapps/test-webapp-rfc2616/pom.xml	2011-04-01 03:42:09 UTC (rev 2952)
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-webapps-parent</artifactId>
-    <version>7.3.2-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>test-webapp-rfc2616</artifactId>
   <name>Jetty Tests :: WebApp :: RFC2616</name>