Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

VERSION.txt

@@ -1,6 +1,6 @@
 jetty-7.6.3-SNAPSHOT
 
-jetty-7.6.2.v20120302 - 02 March 2012
+jetty-7.6.2.v20120308 - 08 March 2012
  + 370387 SafariWebsocketDraft0Test failure during build.
  + 371168 Update ClientCrossContextSessionTest
  + 372093 handle quotes in Require-Bundle manifest string
@@ -9,7 +9,17 @@ jetty-7.6.2.v20120302 - 02 March 2012
    will happen in the next major release (to avoid break implementers).
  + 372487 JDBCSessionManager does not work with Oracle
  + 372806 Command line should accept relative paths for xml config files
+ + 373037 jetty.server.Response.setContentLength(int) should not close a Writer
+   when length=0
+ + 373162 add improved implementation for getParameterMap(), needs a test
+   though and the existing setup doesn't seem like it would easily support the
+   needed test so need to do that still
+ + 373306 Set default user agent extraction pattern for UserAgentFilter
+ + 373567 cert validation issue with ocsp and crldp always being enabled when
+   validating turned on fixed
+ + JETTY-1409 GzipFilter will double-compress application/x-gzip content
  + JETTY-1489 WebAppProvider attempts to deploy .svn folder
+ + JETTY-1494 .
 
 jetty-7.6.1.v20120215 - 15 February 2012
  + 369121 simplified test

example-jetty-embedded/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>example-jetty-embedded</artifactId>

jetty-aggregate/jetty-all-server/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.eclipse.jetty.aggregate</groupId>
         <artifactId>jetty-aggregate-project</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>7.6.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jetty-all-server</artifactId>

jetty-aggregate/jetty-all/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-all</artifactId>

jetty-aggregate/jetty-client/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-client</artifactId>

jetty-aggregate/jetty-plus/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-plus</artifactId>

jetty-aggregate/jetty-server/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-server</artifactId>

jetty-aggregate/jetty-servlet/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-servlet</artifactId>

jetty-aggregate/jetty-webapp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-webapp</artifactId>

jetty-aggregate/jetty-websocket/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.aggregate</groupId>
     <artifactId>jetty-aggregate-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-websocket</artifactId>

jetty-aggregate/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.aggregate</groupId>
   <artifactId>jetty-aggregate-project</artifactId>

jetty-ajp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-ajp</artifactId>

jetty-annotations/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-annotations</artifactId>

jetty-client/pom.xml

@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-project</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>7.6.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

jetty-client/src/test/java/org/eclipse/jetty/client/SslCertSecuredExchangeTest.java

@@ -39,7 +39,7 @@ import org.eclipse.jetty.util.security.Constraint;
 import org.eclipse.jetty.util.security.Credential;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
-public class SslCertSecuredExchangeTest extends ContentExchangeTest
+public class SslCertSecuredExchangeTest// extends ContentExchangeTest
 { 
     // certificate is valid until Jan 1, 2050
     private String _keypath = MavenTestingUtils.getTargetFile("test-policy/validation/jetty-valid.keystore").getAbsolutePath();
@@ -51,7 +51,7 @@ public class SslCertSecuredExchangeTest extends ContentExchangeTest
     protected void configureServer(Server server)
         throws Exception
     {
-        setProtocol("https");
+        //setProtocol("https");
                         
         SslSelectChannelConnector connector = new SslSelectChannelConnector();
         SslContextFactory cf = connector.getSslContextFactory();
@@ -139,31 +139,31 @@ public class SslCertSecuredExchangeTest extends ContentExchangeTest
         
         ServletContextHandler root = new ServletContextHandler();
         root.setContextPath("/");
-        root.setResourceBase(getBasePath());
+       // root.setResourceBase(getBasePath());
         ServletHolder servletHolder = new ServletHolder( new DefaultServlet() );
         servletHolder.setInitParameter( "gzip", "true" );
         root.addServlet( servletHolder, "/*" );    
 
-        Handler handler = new TestHandler(getBasePath());
+      //  Handler handler = new TestHandler(getBasePath());
         
         HandlerCollection handlers = new HandlerCollection();
-        handlers.setHandlers(new Handler[]{handler, root});
+      //  handlers.setHandlers(new Handler[]{handler, root});
         security.setHandler(handlers);
     }
     
-    @Override
+//    @Override
-    protected void configureClient(HttpClient client) throws Exception
+//    protected void configureClient(HttpClient client) throws Exception
-    {
+//    {
-        SslContextFactory cf = client.getSslContextFactory();
+//        SslContextFactory cf = client.getSslContextFactory();
-        cf.setValidateCerts(true);
+//        cf.setValidateCerts(true);
-        cf.setCrlPath(_crlpath);
+//        cf.setCrlPath(_crlpath);
-        
+//        
-        cf.setCertAlias("client");
+//        cf.setCertAlias("client");
-        cf.setKeyStorePath(_clientpath);
+//        cf.setKeyStorePath(_clientpath);
-        cf.setKeyStorePassword(_password);
+//        cf.setKeyStorePassword(_password);
-        cf.setKeyManagerPassword(_password);
+//        cf.setKeyManagerPassword(_password);
-        
+//        
-        cf.setTrustStore(_trustpath);
+//        cf.setTrustStore(_trustpath);
-        cf.setTrustStorePassword(_password);
+//        cf.setTrustStorePassword(_password);
-    }
+//    }
 }

jetty-client/src/test/java/org/eclipse/jetty/client/SslValidationTestBase.java

@@ -17,7 +17,7 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.util.security.CertificateUtils;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
-public abstract class SslValidationTestBase extends ContentExchangeTest
+public abstract class SslValidationTestBase //extends ContentExchangeTest
 {
     protected static Class<? extends SslConnector> __klass;
     protected static int __konnector;
@@ -29,70 +29,70 @@ public abstract class SslValidationTestBase extends ContentExchangeTest
     private String _crlpath = MavenTestingUtils.getTargetFile("test-policy/validation/crlfile.pem").getAbsolutePath();
     private String _password = "OBF:1wnl1sw01ta01z0f1tae1svy1wml";
     
-    @Override
+    
     protected void configureServer(Server server)
         throws Exception
     {
-        setProtocol("https");
+//        setProtocol("https");
-
+//
-        SslContextFactory srvFactory = new SslContextFactory() {
+//        SslContextFactory srvFactory = new SslContextFactory() {
-            @Override
+//            @Override
-            protected KeyStore getKeyStore(InputStream storeStream, String storePath, String storeType, String storeProvider, String storePassword) throws Exception
+//            protected KeyStore getKeyStore(InputStream storeStream, String storePath, String storeType, String storeProvider, String storePassword) throws Exception
-            {
+//            {
-                return CertificateUtils.getKeyStore(storeStream, storePath, storeType, storeProvider, storePassword);
+//                return CertificateUtils.getKeyStore(storeStream, storePath, storeType, storeProvider, storePassword);
-            }
+//            }
-
+//
-            @Override
+//            @Override
-            protected Collection<? extends CRL> loadCRL(String crlPath) throws Exception
+//            protected Collection<? extends CRL> loadCRL(String crlPath) throws Exception
-            {
+//            {
-                return CertificateUtils.loadCRL(crlPath);
+//                return CertificateUtils.loadCRL(crlPath);
-            }
+//            }
-        };
+//        };
-        srvFactory.setValidateCerts(true);
+//        srvFactory.setValidateCerts(true);
-        srvFactory.setCrlPath(_crlpath);
+//        srvFactory.setCrlPath(_crlpath);
-        srvFactory.setNeedClientAuth(true);
+//        srvFactory.setNeedClientAuth(true);
-
+//
-        srvFactory.setKeyStorePath(_keypath);
+//        srvFactory.setKeyStorePath(_keypath);
-        srvFactory.setKeyStorePassword(_password);
+//        srvFactory.setKeyStorePassword(_password);
-        srvFactory.setKeyManagerPassword(_password);
+//        srvFactory.setKeyManagerPassword(_password);
-        
+//        
-        srvFactory.setTrustStore(_trustpath);
+//        srvFactory.setTrustStore(_trustpath);
-        srvFactory.setTrustStorePassword(_password);
+//        srvFactory.setTrustStorePassword(_password);
-
+//
-        Constructor<? extends SslConnector> constructor = __klass.getConstructor(SslContextFactory.class);
+//        Constructor<? extends SslConnector> constructor = __klass.getConstructor(SslContextFactory.class);
-        SslConnector connector = constructor.newInstance(srvFactory);
+//        SslConnector connector = constructor.newInstance(srvFactory);
-        connector.setMaxIdleTime(5000);
+//        connector.setMaxIdleTime(5000);
-        server.addConnector(connector);
+//        server.addConnector(connector);
-
+//
-        Handler handler = new TestHandler(getBasePath());
+//        Handler handler = new TestHandler(getBasePath());
-
+//
-        ServletContextHandler root = new ServletContextHandler();
+//        ServletContextHandler root = new ServletContextHandler();
-        root.setContextPath("/");
+//        root.setContextPath("/");
-        root.setResourceBase(getBasePath());
+//        root.setResourceBase(getBasePath());
-        ServletHolder servletHolder = new ServletHolder( new DefaultServlet() );
+//        ServletHolder servletHolder = new ServletHolder( new DefaultServlet() );
-        servletHolder.setInitParameter( "gzip", "true" );
+//        servletHolder.setInitParameter( "gzip", "true" );
-        root.addServlet( servletHolder, "/*" );
+//        root.addServlet( servletHolder, "/*" );
-
+//
-        HandlerCollection handlers = new HandlerCollection();
+//        HandlerCollection handlers = new HandlerCollection();
-        handlers.setHandlers(new Handler[]{handler, root});
+//        handlers.setHandlers(new Handler[]{handler, root});
-        server.setHandler( handlers );
+//        server.setHandler( handlers );
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    protected void configureClient(HttpClient client)
+//    protected void configureClient(HttpClient client)
-        throws Exception
+//        throws Exception
-    {
+//    {
-        client.setConnectorType(__konnector);
+//        client.setConnectorType(__konnector);
-
+//
-        SslContextFactory cf = client.getSslContextFactory();
+//        SslContextFactory cf = client.getSslContextFactory();
-        cf.setValidateCerts(true);
+//        cf.setValidateCerts(true);
-        cf.setCrlPath(_crlpath);
+//        cf.setCrlPath(_crlpath);
-        
+//        
-        cf.setKeyStorePath(_clientpath);
+//        cf.setKeyStorePath(_clientpath);
-        cf.setKeyStorePassword(_password);
+//        cf.setKeyStorePassword(_password);
-        cf.setKeyManagerPassword(_password);
+//        cf.setKeyManagerPassword(_password);
-        
+//        
-        cf.setTrustStore(_trustpath);
+//        cf.setTrustStore(_trustpath);
-        cf.setTrustStorePassword(_password);
+//        cf.setTrustStorePassword(_password);
     }
 }

jetty-continuation/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-continuation</artifactId>

jetty-deploy/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-deploy</artifactId>

jetty-distribution/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-distribution</artifactId>
   <name>Jetty :: Distribution Assemblies</name>

jetty-http-spi/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-http-spi</artifactId>

jetty-http/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-http</artifactId>

jetty-io/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-io</artifactId>

jetty-jaspi/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jaspi</artifactId>

jetty-jmx/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jmx</artifactId>

jetty-jndi/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jndi</artifactId>

jetty-jsp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-jsp</artifactId>

jetty-monitor/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-monitor</artifactId>

jetty-nested/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-nested</artifactId>
   <name>Jetty :: Nested</name>

jetty-nosql/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-nosql</artifactId>

jetty-npn/pom.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-project</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>7.6.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Jetty-OSGi-Jasper integration
 Fragment-Host: org.eclipse.jetty.osgi.boot
 Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp
-Bundle-Version: 7.4.1.qualifier
+Bundle-Version: 7.6.2.qualifier
 Bundle-Vendor: Mort Bay Consulting
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.sun.el;resolution:=optional,
@@ -22,15 +22,16 @@ Import-Package: com.sun.el;resolution:=optional,
  javax.servlet.jsp.resources;version="2.1.0",
  javax.servlet.jsp.tagext;version="2.1.0",
  javax.servlet.resources;version="2.5.0",
- org.apache.jasper;version="2.0.0";resolution:=optional,
+ org.apache.jasper;version="6.0.0";resolution:=optional,
- org.apache.jasper.compiler;version="2.0.0";resolution:=optional,
+ org.apache.jasper.compiler;version="6.0.0";resolution:=optional,
- org.apache.jasper.compiler.tagplugin;version="2.0.0";resolution:=optional,
+ org.apache.jasper.compiler.tagplugin;version="6.0.0";resolution:=optional,
- org.apache.jasper.runtime;version="2.0.0";resolution:=optional,
+ org.apache.jasper.runtime;version="6.0.0";resolution:=optional,
- org.apache.jasper.security;version="2.0.0";resolution:=optional,
+ org.apache.jasper.security;version="6.0.0";resolution:=optional,
- org.apache.jasper.servlet;version="2.0.0";resolution:=optional,
+ org.apache.jasper.servlet;version="6.0.0";resolution:=optional,
- org.apache.jasper.tagplugins.jstl;version="2.0.0";resolution:=optional,
+ org.apache.jasper.tagplugins.jstl;version="6.0.0";resolution:=optional,
- org.apache.jasper.util;version="2.0.0";resolution:=optional,
+ org.apache.jasper.util;version="6.0.0";resolution:=optional,
- org.apache.jasper.xmlparser;version="2.0.0";resolution:=optional,
+ org.apache.jasper.xmlparser;version="6.0.0";resolution:=optional,
+ org.glassfish.jsp.api;version="2.1.3";resolution:=optional,
  org.apache.taglibs.standard;version="1.2.0";resolution:=optional,
  org.apache.taglibs.standard.extra.spath;version="1.2.0";resolution:=optional,
  org.apache.taglibs.standard.functions;version="1.2.0";resolution:=optional,

jetty-osgi/jetty-osgi-boot-jsp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java

@@ -167,6 +167,8 @@ public class WebappRegistrationCustomizerImpl implements WebappRegistrationCusto
     	}
     	return urls.toArray(new URL[urls.size()]);
     }
+    
+   
 	
     /**
      * Jasper resolves the dtd when it parses a taglib descriptor. 
@@ -182,7 +184,7 @@ public class WebappRegistrationCustomizerImpl implements WebappRegistrationCusto
      * on a static friendly field :(
      * </p>
      */
-    void fixupDtdResolution()
+   void fixupDtdResolution()
     {
         try
         {
@@ -214,12 +216,12 @@ public class WebappRegistrationCustomizerImpl implements WebappRegistrationCusto
           Constants.WEBAPP_DTD_RESOURCE_PATH_22,
           Constants.WEBAPP_DTD_RESOURCE_PATH_23, };
 
-        // static final String[] CACHED_SCHEMA_RESOURCE_PATHS = {
+        static final String[] CACHED_SCHEMA_RESOURCE_PATHS = {
-        // Constants.TAGLIB_SCHEMA_RESOURCE_PATH_20,
+                                                              Constants.TAGLIB_SCHEMA_RESOURCE_PATH_20,
-        // Constants.TAGLIB_SCHEMA_RESOURCE_PATH_21,
+                                                              Constants.TAGLIB_SCHEMA_RESOURCE_PATH_21,
-        // Constants.WEBAPP_SCHEMA_RESOURCE_PATH_24,
+                                                              Constants.WEBAPP_SCHEMA_RESOURCE_PATH_24,
-        // Constants.WEBAPP_SCHEMA_RESOURCE_PATH_25,
+                                                              Constants.WEBAPP_SCHEMA_RESOURCE_PATH_25,
-        // };
+        };
         public InputSource resolveEntity(String publicId, String systemId) throws SAXException
         {
             for (int i = 0; i < CACHED_DTD_PUBLIC_IDS.length; i++)

jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Jetty-OSGi-Logback integration
 Fragment-Host: org.eclipse.jetty.osgi.boot
 Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.logback;singleton:=true
-Bundle-Version: 7.3.0.qualifier
+Bundle-Version: 7.6.2.qualifier
 Bundle-Vendor: Mort Bay Consulting
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: ch.qos.logback.classic,

jetty-osgi/jetty-osgi-boot-logback/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Support for rfc66 war url scheme
 Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.warurl;singleton:=true
-Bundle-Version: 7.3.0.qualifier
+Bundle-Version: 7.6.2.qualifier
 Bundle-Activator: org.eclipse.jetty.osgi.boot.warurl.WarUrlActivator
 Bundle-Vendor: Mort Bay Consulting
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

jetty-osgi/jetty-osgi-boot-warurl/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Jetty OSGi bootstrap
 Bundle-SymbolicName: org.eclipse.jetty.osgi.boot;singleton:=true
 Bundle-Vendor: Mort Bay Consulting
-Bundle-Version: 7.4.3.qualifier
+Bundle-Version: 7.6.2.qualifier
 Bundle-Activator: org.eclipse.jetty.osgi.boot.JettyBootstrapActivator
 Import-Package: javax.mail;version="1.4.0";resolution:=optional,
  javax.mail.event;version="1.4.0";resolution:=optional,
@@ -14,19 +14,19 @@ Import-Package: javax.mail;version="1.4.0";resolution:=optional,
  javax.servlet.http;version="2.5.0",
  javax.transaction;version="1.1.0";resolution:=optional,
  javax.transaction.xa;version="1.1.0";resolution:=optional,
- org.eclipse.jetty.deploy;version="7.4.0",
+ org.eclipse.jetty.deploy;version="7.6.2",
- org.eclipse.jetty.deploy.providers;version="7.4.0",
+ org.eclipse.jetty.deploy.providers;version="7.6.2",
- org.eclipse.jetty.http;version="7.4.0",
+ org.eclipse.jetty.http;version="7.6.2",
- org.eclipse.jetty.nested;version="7.4.0";resolution:=optional,
+ org.eclipse.jetty.nested;version="7.6.2";resolution:=optional,
- org.eclipse.jetty.server;version="7.4.0",
+ org.eclipse.jetty.server;version="7.6.2",
- org.eclipse.jetty.server.handler;version="7.4.0",
+ org.eclipse.jetty.server.handler;version="7.6.2",
- org.eclipse.jetty.servlet;version="7.4.0",
+ org.eclipse.jetty.servlet;version="7.6.2",
- org.eclipse.jetty.util;version="7.4.0",
+ org.eclipse.jetty.util;version="7.6.2",
- org.eclipse.jetty.util.component;version="7.4.0",
+ org.eclipse.jetty.util.component;version="7.6.2",
- org.eclipse.jetty.util.log;version="7.4.0",
+ org.eclipse.jetty.util.log;version="7.6.2",
- org.eclipse.jetty.util.resource;version="7.4.0",
+ org.eclipse.jetty.util.resource;version="7.6.2",
- org.eclipse.jetty.webapp;version="7.4.1.v20110513",
+ org.eclipse.jetty.webapp;version="7.6.2",
- org.eclipse.jetty.xml;version="7.4.0",
+ org.eclipse.jetty.xml;version="7.6.2",
  org.osgi.framework,
  org.osgi.service.cm;version="1.2.0",
  org.osgi.service.packageadmin,
@@ -40,7 +40,7 @@ Import-Package: javax.mail;version="1.4.0";resolution:=optional,
  org.xml.sax.helpers
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Classpath: .
-Export-Package: org.eclipse.jetty.osgi.boot;version="7.4.0",
+Export-Package: org.eclipse.jetty.osgi.boot;version="7.6.2",
- org.eclipse.jetty.osgi.nested;version="7.4.0",
+ org.eclipse.jetty.osgi.nested;version="7.6.2",
- org.eclipse.jetty.osgi.boot.utils;version="7.4.0"
+ org.eclipse.jetty.osgi.boot.utils;version="7.6.2"
 DynamicImport-Package: org.eclipse.jetty.*;version="[7.3,8)"

jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml

@@ -22,14 +22,6 @@
         <Set name="minThreads">10</Set>
         <Set name="maxThreads">200</Set>
       </New>
-
-      <!-- Optional Java 5 bounded threadpool with job queue 
-      <New class="org.eclipse.jetty.util.thread.ExecutorThreadPool">     
-        <Arg name="coreSize" type="int">25</Arg>
-        <Arg name="maxSize" type="int">50</Arg>
-        <Arg name="maxIdleMs" type="long">30000</Arg>
-      </New>
-      -->
     </Set>
 
 
@@ -118,7 +110,7 @@
                     contain custom tag libraries (*.tld files)
                     if those bundles don't exist or can't be loaded no errors or warning will be issued!
                     this default value is to plug the tld files of the reference implementation of JSF -->
-                <Set name="tldBundles"><Property name="org.eclipse.jetty.osgi.tldsbundles"
+                <Set name="tldBundles"><Property name="org.eclipse.jetty.osgi.tldbundles"
                      default="javax.faces.jsf-impl" /></Set>
               </New>
             </Arg>

jetty-osgi/jetty-osgi-boot/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java

@@ -187,6 +187,9 @@ public class OSGiAppProvider extends ScanningAppProvider implements AppProvider
         {
             ((WebAppContext)wah).setConfigurationClasses(_configurationClasses);
         }
+        
+        if (_defaultsDescriptor != null)
+            ((WebAppContext)wah).setDefaultsDescriptor(_defaultsDescriptor);
         return app.getContextHandler();
     }
 

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java

@@ -20,6 +20,7 @@ import java.util.Map;
 import org.eclipse.jetty.osgi.boot.JettyBootstrapActivator;
 import org.eclipse.jetty.osgi.boot.OSGiServerConstants;
 import org.eclipse.jetty.osgi.boot.OSGiWebappConstants;
+import org.eclipse.jetty.osgi.boot.internal.serverfactory.DefaultJettyAtJettyHomeHelper;
 import org.eclipse.jetty.osgi.boot.internal.serverfactory.IManagedJettyServerRegistry;
 import org.eclipse.jetty.osgi.boot.internal.serverfactory.ServerInstanceWrapper;
 import org.eclipse.jetty.server.handler.ContextHandler;
@@ -195,7 +196,21 @@ public class JettyContextHandlerServiceTracker implements ServiceListener
                     String defaultWebXmlPath = (String)sr.getProperty(OSGiWebappConstants.SERVICE_PROP_DEFAULT_WEB_XML_PATH);
                     if (defaultWebXmlPath == null)
                     {
-                        defaultWebXmlPath = webapp.getDefaultsDescriptor();
+                        String jettyHome = System.getProperty(DefaultJettyAtJettyHomeHelper.SYS_PROP_JETTY_HOME);
+                        if (jettyHome != null)
+                        {
+                            File etc = new File(jettyHome, "etc");
+                            if (etc.exists() && etc.isDirectory())
+                            {
+                                File webDefault = new File (etc, "webdefault.xml");
+                                if (webDefault.exists())
+                                    defaultWebXmlPath = webDefault.getAbsolutePath();
+                                else
+                                    defaultWebXmlPath = webapp.getDefaultsDescriptor();
+                            }
+                            else
+                                defaultWebXmlPath = webapp.getDefaultsDescriptor();
+                        }
                     }
                     String war = (String)sr.getProperty("war");
                     try

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.TreeMap;
@@ -50,6 +51,9 @@ import org.eclipse.jetty.webapp.WebInfConfiguration;
 import org.eclipse.jetty.xml.XmlConfiguration;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+import org.osgi.util.tracker.ServiceTracker;
 import org.xml.sax.SAXException;
 
 /**
@@ -173,6 +177,7 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
                 overrideBundleInstallLocation);
         File webapp = null;
         URL baseWebappInstallURL = null;
+        
         if (webappFolderPath != null && webappFolderPath.length() != 0 && !webappFolderPath.equals("."))
         {
             if (webappFolderPath.startsWith("/") || webappFolderPath.startsWith("file:"))
@@ -261,7 +266,7 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
                 File defaultWebXml = null;
                 if (defaultWebXmlPath.startsWith("/") || defaultWebXmlPath.startsWith("file:/"))
                 {
-                    defaultWebXml = new File(webXmlPath);
+                    defaultWebXml = new File(defaultWebXmlPath);
                 }
                 else
                 {
@@ -276,8 +281,9 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
             //other parameters that might be defines on the OSGiAppProvider:
             context.setParentLoaderPriority(_wrapper.getOSGiAppProvider().isParentLoaderPriority());
 
+            configureWebappClassLoader(contributor,context,composite, requireTldBundle);
             configureWebAppContext(context,contributor,requireTldBundle);
-            configureWebappClassLoader(contributor,context,composite);
+            
 
             // @see
             // org.eclipse.jetty.webapp.JettyWebXmlConfiguration#configure(WebAppContext)
@@ -450,7 +456,7 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
             //the actual registration must happen via the new Deployment API.
 //            _ctxtHandler.addHandler(context);
 
-            configureWebappClassLoader(contributor,context,composite);
+            configureWebappClassLoader(contributor,context,composite, requireTldBundle);
             if (context instanceof WebAppContext)
             {
                 webAppContext = (WebAppContext)context;
@@ -615,8 +621,9 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
 		                        }
 		                        while (tldEnum.hasMoreElements())
 		                        {
+		                            URL tldUrl = tldEnum.nextElement();	                            
 		                        	tldfrags.add(Resource.newResource(
-		                        			DefaultFileLocatorHelper.getLocalURL(tldEnum.nextElement())));
+		                        			DefaultFileLocatorHelper.getLocalURL(tldUrl)));
 		                        }
 	                        }
 	                    }
@@ -764,13 +771,17 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
      * @param classInBundle
      * @throws Exception
      */
-    protected void configureWebappClassLoader(Bundle contributor, ContextHandler context, OSGiWebappClassLoader webappClassLoader) throws Exception
+    protected void configureWebappClassLoader(Bundle contributor, ContextHandler context, OSGiWebappClassLoader webappClassLoader, String requireTldBundle) throws Exception
     {
         if (context instanceof WebAppContext)
         {
             WebAppContext webappCtxt = (WebAppContext)context;
             context.setClassLoader(webappClassLoader);
             webappClassLoader.setWebappContext(webappCtxt);
+
+            String pathsToRequiredBundles = getPathsToRequiredBundles(context, requireTldBundle);
+            if (pathsToRequiredBundles != null)
+                webappClassLoader.addClassPath(pathsToRequiredBundles);
         }
         else
         {
@@ -788,6 +799,18 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
         // know.
         OSGiWebappClassLoader webappClassLoader = new OSGiWebappClassLoader(
             _wrapper.getParentClassLoaderForWebapps(),new WebAppContext(),contributor,BUNDLE_CLASS_LOADER_HELPER);
+        /* DEBUG
+        try {
+        Class c = webappClassLoader.loadClass("org.glassfish.jsp.api.ResourceInjector");
+        System.err.println("LOADED org.glassfish.jsp.api.ResourceInjector from "+c.getClassLoader());
+        }
+        catch (Exception e) {e.printStackTrace();}
+        try {
+            Class c = webappClassLoader.loadClass("org.apache.jasper.xmlparser.ParserUtils");
+            System.err.println("LOADED org.apache.jasper.xmlparser.ParserUtils from "+c.getClassLoader());
+            }
+            catch (Exception e) {e.printStackTrace();}
+        */
         return webappClassLoader;
     }
 
@@ -811,5 +834,50 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper
         }
     }
 
+    
+    private String getPathsToRequiredBundles (ContextHandler context, String requireTldBundle) throws Exception
+    {
+        if (requireTldBundle == null)
+            return null;
+
+        StringBuilder paths = new StringBuilder();
+        Bundle bundle = (Bundle)context.getAttribute(OSGiWebappConstants.JETTY_OSGI_BUNDLE);
+        PackageAdmin packAdmin = getBundleAdmin();
+        DefaultFileLocatorHelper fileLocatorHelper = new DefaultFileLocatorHelper();
+        
+        String[] symbNames = requireTldBundle.split(", ");
+
+        for (String symbName : symbNames)
+        {
+            Bundle[] bs = packAdmin.getBundles(symbName, null);
+            if (bs == null || bs.length == 0)
+            {
+                throw new IllegalArgumentException("Unable to locate the bundle '"
+                                                   + symbName + "' specified in the "
+                                                   + OSGiWebappConstants.REQUIRE_TLD_BUNDLE
+                                                   + " of the manifest of "
+                                                   + bundle.getSymbolicName());
+            }
+
+            
+            File f = fileLocatorHelper.getBundleInstallLocation(bs[0]);
+            if (paths.length() > 0)
+                paths.append(", ");
+            System.err.println("getPathsToRequiredBundles: bundle path="+bs[0].getLocation()+" uri="+f.toURI());
+            paths.append(f.toURI().toURL().toString());
+        }
+
+        return paths.toString();
+    }
+
+    private PackageAdmin getBundleAdmin()
+    {
+        Bundle bootBundle = ((BundleReference)OSGiWebappConstants.class.getClassLoader()).getBundle();
+        ServiceTracker serviceTracker = new ServiceTracker(bootBundle.getBundleContext(), PackageAdmin.class.getName(), null);
+        serviceTracker.open();
+
+        return (PackageAdmin) serviceTracker.getService();
+    }
+
 
 }

jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF

@@ -3,20 +3,20 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Console
 Bundle-SymbolicName: org.eclipse.jetty.osgi.equinoxtools
 Bundle-Description: Example application: equinox console accesssible on the web
-Bundle-Version: 7.4.2.qualifier
+Bundle-Version: 7.6.2.qualifier
 Bundle-Activator: org.eclipse.jetty.osgi.equinoxtools.WebEquinoxToolsActivator
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
- org.eclipse.jetty.continuation;version="7.4.0",
+ org.eclipse.jetty.continuation;version="7.6.2",
- org.eclipse.jetty.io;version="7.4.0",
+ org.eclipse.jetty.io;version="7.6.2",
- org.eclipse.jetty.util;version="7.4.0",
+ org.eclipse.jetty.util;version="7.6.2",
- org.eclipse.jetty.util.log;version="7.4.0",
+ org.eclipse.jetty.util.log;version="7.6.2",
- org.eclipse.jetty.websocket;version="7.4.0",
+ org.eclipse.jetty.websocket;version="7.6.2",
  org.eclipse.osgi.framework.console;version="1.1.0",
  org.osgi.framework;version="1.3.0",
  org.osgi.service.http;version="1.2.0",
  org.osgi.util.tracker;version="1.3.0"
-Export-Package: org.eclipse.jetty.osgi.equinoxtools;x-internal:=true;version="7.4.2",
+Export-Package: org.eclipse.jetty.osgi.equinoxtools;x-internal:=true;version="7.6.2",
- org.eclipse.jetty.osgi.equinoxtools.console;x-internal:=true;version="7.4.2"
+ org.eclipse.jetty.osgi.equinoxtools.console;x-internal:=true;version="7.6.2"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 

jetty-osgi/jetty-osgi-equinoxtools/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF

@@ -1,16 +1,16 @@
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-SymbolicName: org.eclipse.jetty.osgi.httpservice
-Bundle-Version: 7.4.2.qualifier
+Bundle-Version: 7.6.2.qualifier
 Bundle-Vendor: Mort Bay Consulting
 Bundle-Name: OSGi HttpService provided by equinox HttpServiceServlet deployed on jetty
 Jetty-ContextFilePath: contexts/httpservice.xml
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
  org.eclipse.equinox.http.servlet,
- org.eclipse.jetty.server;version="7.0.0",
+ org.eclipse.jetty.server;version="7.6.2",
- org.eclipse.jetty.server.handler;version="7.0.0",
+ org.eclipse.jetty.server.handler;version="7.6.2",
- org.eclipse.jetty.servlet;version="7.4.0",
+ org.eclipse.jetty.servlet;version="7.6.2",
- org.eclipse.jetty.util.component;version="7.0.0"
+ org.eclipse.jetty.util.component;version="7.6.2"
-Export-Package: org.eclipse.jetty.osgi.httpservice;version="7.4.2"
+Export-Package: org.eclipse.jetty.osgi.httpservice;version="7.6.2"
 

jetty-osgi/jetty-osgi-httpservice/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

jetty-osgi/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.jetty.osgi</groupId>
@@ -15,7 +15,6 @@
     <osgi-services-version>3.2.100.v20100503</osgi-services-version>
     <equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
     <!--equinox-servletbridge-version>1.0.0-v20070523</equinox-servletbridge-version-->
-    <jsp-2.1-glassfish-version>2.1.v20100127</jsp-2.1-glassfish-version>
     <logback-version>0.9.18</logback-version>
     <slf4j-version>1.5.11</slf4j-version>
   </properties>

jetty-osgi/test-jetty-osgi/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -102,6 +102,12 @@
       <artifactId>jetty-websocket</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-plus</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- Eclipse OSGi Deps -->
     <dependency>

jetty-overlay-deployer/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-overlay-deployer</artifactId>

jetty-plus/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-plus</artifactId>

jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java

@@ -13,11 +13,15 @@
 
 package org.eclipse.jetty.plus.jndi;
 
+import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
+
+import javax.naming.Binding;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.Name;
+import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
@@ -25,6 +29,7 @@ import javax.naming.Referenceable;
 import javax.naming.StringRefAddr;
 import javax.naming.spi.ObjectFactory;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -125,6 +130,35 @@ public class TestNamingEntries
     public void init()
     {
         this.someObject = new SomeObject(4);
+        
+        
+
+        
+    }
+    
+    /** 
+     * after each test we should scrape out any lingering bindings to prevent cross test pollution
+     * as observed when running java 7
+     * 
+     * @throws Exception
+     */
+    @After
+    public void after() throws Exception
+    {
+        InitialContext icontext = new InitialContext();
+
+        NamingEnumeration<Binding> bindings = icontext.listBindings("");
+        List<String> names = new ArrayList<String>();
+        while (bindings.hasMore())
+        {
+            Binding bd = (Binding)bindings.next();
+            names.add(bd.getName());
+        }
+
+        for (String name : names)
+        {
+            icontext.unbind(name);
+        }
     }
 
     @Test
@@ -199,6 +233,7 @@ public class TestNamingEntries
 
         ne = NamingEntryUtil.lookupNamingEntry(new ScopeB(), "resourceB");
         assertNull(ne);
+        testLink();
     }
 
     @Test

jetty-policy/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-policy</artifactId>
   <name>Jetty :: Policy Tool</name>

jetty-rewrite/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-rewrite</artifactId>

jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java

@@ -24,12 +24,15 @@ import org.eclipse.jetty.server.Request;
  * Rewrite the URI by matching with a regular expression. 
  * The replacement string may use $n" to replace the nth capture group.
  * If the replacement string contains ? character, then it is split into a path
- * and query string component.  The returned target contains only the path.
+ * and query string component.  The replacement query string may also contain $Q, which 
+ * is replaced with the original query string. 
+ * The returned target contains only the path.
  */
 public class RewriteRegexRule extends RegexRule  implements Rule.ApplyURI
 {
     private String _replacement;
     private String _query;
+    private boolean _queryGroup;
 
     /* ------------------------------------------------------------ */
     public RewriteRegexRule()
@@ -49,6 +52,7 @@ public class RewriteRegexRule extends RegexRule  implements Rule.ApplyURI
         String[] split=replacement.split("\\?",2);
         _replacement = split[0];
         _query=split.length==2?split[1]:null;
+        _queryGroup=_query!=null && _query.contains("$Q");
     }
 
 
@@ -73,7 +77,12 @@ public class RewriteRegexRule extends RegexRule  implements Rule.ApplyURI
         }
 
         if (query!=null)
+        {
+            if (_queryGroup)
+                query=query.replace("$Q",request.getQueryString()==null?"":request.getQueryString());
             request.setAttribute("org.eclipse.jetty.rewrite.handler.RewriteRegexRule.Q",query);
+        }
+        
         return target;
     }
 
@@ -84,7 +93,7 @@ public class RewriteRegexRule extends RegexRule  implements Rule.ApplyURI
         if (_query!=null)
         {
             String query=(String)request.getAttribute("org.eclipse.jetty.rewrite.handler.RewriteRegexRule.Q");
-            if (request.getQueryString()==null)
+            if (_queryGroup||request.getQueryString()==null)
                 request.setQueryString(query);
             else
                 request.setQueryString(request.getQueryString()+"&"+query);

jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java

@@ -197,28 +197,25 @@ public class RuleContainer extends Rule
             if (applied!=null)
             {       
                 LOG.debug("applied {}",rule);
-                if (!target.equals(applied))
+                LOG.debug("rewrote {} to {}",target,applied);
-                { 
+                if (!original_set)
-                    LOG.debug("rewrote {} to {}",target,applied);
+                {
-                    if (!original_set)
+                    original_set=true;
-                    {
+                    request.setAttribute(_originalPathAttribute, target);
-                        original_set=true;
+                }     
-                        request.setAttribute(_originalPathAttribute, target);
-                    }     
 
-                    if (_rewriteRequestURI)
+                if (_rewriteRequestURI)
-                    {
+                {
-                        if (rule instanceof Rule.ApplyURI && !target.equals(request.getRequestURI()))
+                    if (rule instanceof Rule.ApplyURI)
-                            ((Rule.ApplyURI)rule).applyURI((Request)request, target, applied);
+                        ((Rule.ApplyURI)rule).applyURI((Request)request, target, applied);
-                        else
+                    else
-                            ((Request)request).setRequestURI(applied);
+                        ((Request)request).setRequestURI(applied);
-                    }
-
-                    if (_rewritePathInfo)
-                        ((Request)request).setPathInfo(applied);
-
-                    target=applied;
                 }
+
+                if (_rewritePathInfo)
+                    ((Request)request).setPathInfo(applied);
+
+                target=applied;
                 
                 if (rule.isHandling())
                 {

jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java

@@ -23,13 +23,21 @@ public class RewriteRegexRuleTest extends AbstractRuleTestCase
 {
     private String[][] _tests=
     {
-            {"/foo/bar",".*","/replace","/replace",null},
+            {"/foo/bar",null,".*","/replace","/replace",null},
-            {"/foo/bar","/xxx.*","/replace",null,null},
+            {"/foo/bar","n=v",".*","/replace","/replace","n=v"},
-            {"/foo/bar","/(.*)/(.*)","/$2/$1/xxx","/bar/foo/xxx",null},
+            {"/foo/bar",null,"/xxx.*","/replace",null,null},
-            {"/foo/bar","/(foo)/(.*)(bar)","/$3/$1/xxx$2","/bar/foo/xxx",null},
+            {"/foo/bar",null,"/(.*)/(.*)","/$2/$1/xxx","/bar/foo/xxx",null},
-            {"/foo/$bar",".*","/$replace","/$replace",null},
+            {"/foo/bar",null,"/(.*)/(.*)","/test?p2=$2&p1=$1","/test","p2=bar&p1=foo"},
-            {"/foo/$bar","/foo/(.*)","/$1/replace","/$bar/replace",null},
+            {"/foo/bar","n=v","/(.*)/(.*)","/test?p2=$2&p1=$1","/test","n=v&p2=bar&p1=foo"},
-            {"/foo/bar/info","/foo/(NotHere)?([^/]*)/(.*)","/$3/other?p1=$2","/info/other","p1=bar"},
+            {"/foo/bar",null,"/(.*)/(.*)","/foo/bar?p2=$2&p1=$1","/foo/bar","p2=bar&p1=foo"},
+            {"/foo/bar","n=v","/(.*)/(.*)","/foo/bar?p2=$2&p1=$1","/foo/bar","n=v&p2=bar&p1=foo"},
+            {"/foo/bar",null,"/(foo)/(.*)(bar)","/$3/$1/xxx$2","/bar/foo/xxx",null},
+            {"/foo/$bar",null,".*","/$replace","/$replace",null},
+            {"/foo/$bar",null,"/foo/(.*)","/$1/replace","/$bar/replace",null},
+            {"/foo/bar/info",null,"/foo/(NotHere)?([^/]*)/(.*)","/$3/other?p1=$2","/info/other","p1=bar"},
+            {"/foo/bar/info",null,"/foo/(NotHere)?([^/]*)/(.*)","/$3/other?p1=$2&$Q","/info/other","p1=bar&"},
+            {"/foo/bar/info","n=v","/foo/(NotHere)?([^/]*)/(.*)","/$3/other?p1=$2&$Q","/info/other","p1=bar&n=v"},
+            {"/foo/bar/info","n=v","/foo/(NotHere)?([^/]*)/(.*)","/$3/other?p1=$2","/info/other","n=v&p1=bar"},
     };
     private RewriteRegexRule _rule;
 
@@ -45,17 +53,43 @@ public class RewriteRegexRuleTest extends AbstractRuleTestCase
     {
         for (String[] test : _tests)
         {
-            _rule.setRegex(test[1]);
+            String t=test[0]+"?"+test[1]+">"+test[2]+"|"+test[3];
-            _rule.setReplacement(test[2]);
+            _rule.setRegex(test[2]);
-            String result = _rule.matchAndApply(test[0], _request, _response);
+            _rule.setReplacement(test[3]);
-            assertEquals(test[1], test[3], result);
+
-            
             _request.setRequestURI(test[0]);
-            _request.setQueryString(null);
+            _request.setQueryString(test[1]);
+            _request.getAttributes().clearAttributes();
+            
+            String result = _rule.matchAndApply(test[0], _request, _response);
+            assertEquals(t, test[4], result);
             _rule.applyURI(_request,test[0],result);
 
-            assertEquals(test[3], _request.getRequestURI());
+            assertEquals(t,test[4], _request.getRequestURI());
-            assertEquals(test[4], _request.getQueryString());
+            assertEquals(t,test[5], _request.getQueryString());
+        }
+    }
+    
+    @Test
+    public void testContainedRequestUriEnabled() throws IOException
+    {
+        RuleContainer container = new RuleContainer();
+        container.setRewriteRequestURI(true);
+        container.addRule(_rule);
+        for (String[] test : _tests)
+        {
+            String t=test[0]+"?"+test[1]+">"+test[2]+"|"+test[3];
+            _rule.setRegex(test[2]);
+            _rule.setReplacement(test[3]);
+
+            _request.setRequestURI(test[0]);
+            _request.setQueryString(test[1]);
+            _request.getAttributes().clearAttributes();
+            
+            String result = container.apply(test[0],_request,_response);
+            assertEquals(t,test[4]==null?test[0]:test[4], result);
+            assertEquals(t,test[4]==null?test[0]:test[4], _request.getRequestURI());
+            assertEquals(t,test[5], _request.getQueryString());
         }
     }
 }

jetty-security/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-security</artifactId>

jetty-server/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-server</artifactId>

jetty-servlet/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-servlet</artifactId>

jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java

@@ -583,7 +583,8 @@ public class ServletHandler extends ScopedHandler
         }
         finally
         {
-            baseRequest.setHandled(true);
+            if (servlet_holder!=null)
+                baseRequest.setHandled(true);
         }
     }
 

jetty-servlets/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>jetty-project</artifactId>
     <groupId>org.eclipse.jetty</groupId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-servlets</artifactId>

jetty-spdy/pom.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-project</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>7.6.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

jetty-spdy/spdy-core/pom.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.eclipse.jetty.spdy</groupId>
         <artifactId>spdy-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>7.6.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

jetty-spdy/spdy-jetty-http-webapp/pom.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.eclipse.jetty.spdy</groupId>
     <artifactId>spdy-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>spdy-jetty-http-webapp</artifactId>

jetty-spdy/spdy-jetty-http/pom.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.eclipse.jetty.spdy</groupId>
     <artifactId>spdy-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>spdy-jetty-http</artifactId>

jetty-spdy/spdy-jetty/pom.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.eclipse.jetty.spdy</groupId>
     <artifactId>spdy-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>spdy-jetty</artifactId>

jetty-start/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-start</artifactId>

jetty-util/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-util</artifactId>

jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java

@@ -232,10 +232,15 @@ public class CertificateValidator
             }
     
             // Enable On-Line Certificate Status Protocol (OCSP) support
-            Security.setProperty("ocsp.enable","true");
+            if (_enableOCSP)
-    
+            {
+                Security.setProperty("ocsp.enable","true");
+            }
             // Enable Certificate Revocation List Distribution Points (CRLDP) support
-            System.setProperty("com.sun.security.enableCRLDP","true");
+            if (_enableCRLDP)
+            {
+                System.setProperty("com.sun.security.enableCRLDP","true");
+            }
     
             // Build certification path
             CertPathBuilderResult buildResult = CertPathBuilder.getInstance("PKIX").build(pbParams);               

jetty-webapp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-webapp</artifactId>

jetty-websocket/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>jetty-project</artifactId>
         <groupId>org.eclipse.jetty</groupId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>7.6.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

jetty-xml/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-xml</artifactId>

pom.xml

@@ -6,7 +6,7 @@
     <version>19</version>
   </parent>
   <artifactId>jetty-project</artifactId>
-  <version>7.6.2-SNAPSHOT</version>
+  <version>7.6.3-SNAPSHOT</version>
   <name>Jetty :: Project</name>
   <url>${jetty.url}</url>
   <packaging>pom</packaging>

test-continuation/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>test-continuation</artifactId>

test-jetty-nested/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-jetty-nested</artifactId>
   <name>Jetty :: Nested Test</name>

test-jetty-servlet/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>test-jetty-servlet</artifactId>

test-jetty-webapp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>test-jetty-webapp</artifactId>

tests/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.tests</groupId>
   <artifactId>tests-parent</artifactId>

tests/test-integration/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>test-integration</artifactId>

tests/test-loginservice/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-loginservice</artifactId>
   <name>Jetty Tests :: Login Service</name>

tests/test-sessions/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-sessions-parent</artifactId>
   <name>Jetty Tests :: Sessions :: Parent</name>

tests/test-sessions/test-hash-sessions/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-sessions-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-hash-sessions</artifactId>
   <name>Jetty Tests :: Sessions :: Hash</name>

tests/test-sessions/test-jdbc-sessions/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-sessions-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-jdbc-sessions</artifactId>
   <name>Jetty Tests :: Sessions :: JDBC</name>

tests/test-sessions/test-mongodb-sessions/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-sessions-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-mongodb-sessions</artifactId>
   <name>Jetty Tests :: Sessions :: Mongo</name>

tests/test-sessions/test-sessions-common/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-sessions-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-sessions-common</artifactId>
   <name>Jetty Tests :: Sessions :: Common</name>

tests/test-webapps/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>tests-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-webapps-parent</artifactId>
   <name>Jetty Tests :: WebApps :: Parent</name>

tests/test-webapps/test-webapp-rfc2616/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.jetty.tests</groupId>
     <artifactId>test-webapps-parent</artifactId>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>7.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>test-webapp-rfc2616</artifactId>
   <name>Jetty Tests :: WebApp :: RFC2616</name>