From 3e13a26ccd4003bba73a7b9102d8129fef824cf8 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 7 Mar 2012 12:14:55 +1100 Subject: [PATCH 01/13] Removing unnecessary stuff from poms and adding jetty-plus dep --- jetty-osgi/pom.xml | 1 - jetty-osgi/test-jetty-osgi/pom.xml | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index b7e6c33f64a..d95a1b9e025 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -15,7 +15,6 @@ 3.2.100.v20100503 1.0.0-v20070606 - 2.1.v20100127 0.9.18 1.5.11 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index f66f8c82074..f0cfa42690b 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -102,6 +102,12 @@ jetty-websocket runtime + + org.eclipse.jetty + jetty-plus + ${project.version} + runtime + From 8db57b56ba47b65de5363efaa9eafea068a12f37 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 8 Mar 2012 12:49:46 -0600 Subject: [PATCH 02/13] clean lingering bindings after each test to ensure that there is no cross test pollution --- .../jetty/plus/jndi/TestNamingEntries.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java b/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java index d18998b5b25..9371de66f3b 100644 --- a/jetty-plus/src/test/java/org/eclipse/jetty/plus/jndi/TestNamingEntries.java +++ b/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 bindings = icontext.listBindings(""); + List names = new ArrayList(); + 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 From 6c81941142b9efe2b5b80198268ae75687dc6374 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 8 Mar 2012 13:56:00 -0600 Subject: [PATCH 03/13] [Bug 373567] cert validation issue with ocsp and crldp always being enabled when validating turned on fixed --- .../jetty/util/security/CertificateValidator.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java index fb2d2843884..8e5024ac982 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateValidator.java +++ b/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); From b77ad34ef094c9df2ed2f20078a7b66dec0ec653 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 9 Mar 2012 11:40:52 +1100 Subject: [PATCH 04/13] Fix versions in manifests, fix typo in jetty-osgi-default.xml, ensure Required-TldBundles are on the classpath. Still doesn't work with version of jsp in jetty-7.6, as the jsp compiler cannot load the class org.glassfish.jsp.api.ResourceInjector, still trying to figure that out. --- .../jetty-osgi-boot-jsp/META-INF/MANIFEST.MF | 21 ++--- .../WebappRegistrationCustomizerImpl.java | 16 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../jetty-osgi-boot/META-INF/MANIFEST.MF | 34 ++++---- .../jettyhome/etc/jetty-osgi-default.xml | 10 +-- .../jetty/osgi/boot/OSGiAppProvider.java | 3 + .../JettyContextHandlerServiceTracker.java | 17 +++- .../webapp/WebBundleDeployerHelper.java | 78 +++++++++++++++++-- .../META-INF/MANIFEST.MF | 16 ++-- .../META-INF/MANIFEST.MF | 12 +-- 11 files changed, 146 insertions(+), 65 deletions(-) diff --git a/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF index df5a595516a..27738d24434 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF +++ b/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.compiler;version="2.0.0";resolution:=optional, - org.apache.jasper.compiler.tagplugin;version="2.0.0";resolution:=optional, - org.apache.jasper.runtime;version="2.0.0";resolution:=optional, - org.apache.jasper.security;version="2.0.0";resolution:=optional, - org.apache.jasper.servlet;version="2.0.0";resolution:=optional, - org.apache.jasper.tagplugins.jstl;version="2.0.0";resolution:=optional, - org.apache.jasper.util;version="2.0.0";resolution:=optional, - org.apache.jasper.xmlparser;version="2.0.0";resolution:=optional, + org.apache.jasper;version="6.0.0";resolution:=optional, + org.apache.jasper.compiler;version="6.0.0";resolution:=optional, + org.apache.jasper.compiler.tagplugin;version="6.0.0";resolution:=optional, + org.apache.jasper.runtime;version="6.0.0";resolution:=optional, + org.apache.jasper.security;version="6.0.0";resolution:=optional, + org.apache.jasper.servlet;version="6.0.0";resolution:=optional, + org.apache.jasper.tagplugins.jstl;version="6.0.0";resolution:=optional, + org.apache.jasper.util;version="6.0.0";resolution:=optional, + org.apache.jasper.xmlparser;version="6.0.0";resolution:=optional, + org.glassfish.jasper.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, diff --git a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java b/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java index 89a5f9e3714..e0bd887cecd 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java +++ b/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 :( *

*/ - 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 = { - // Constants.TAGLIB_SCHEMA_RESOURCE_PATH_20, - // Constants.TAGLIB_SCHEMA_RESOURCE_PATH_21, - // Constants.WEBAPP_SCHEMA_RESOURCE_PATH_24, - // Constants.WEBAPP_SCHEMA_RESOURCE_PATH_25, - // }; + static final String[] CACHED_SCHEMA_RESOURCE_PATHS = { + Constants.TAGLIB_SCHEMA_RESOURCE_PATH_20, + Constants.TAGLIB_SCHEMA_RESOURCE_PATH_21, + Constants.WEBAPP_SCHEMA_RESOURCE_PATH_24, + 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++) diff --git a/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF index 8587cac0b01..523e7195032 100644 --- a/jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF +++ b/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, diff --git a/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF index 28a7a1456e8..2a7d7cb71f9 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF +++ b/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 diff --git a/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF index e7dfce0738a..cbda22dd84e 100644 --- a/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF +++ b/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.providers;version="7.4.0", - org.eclipse.jetty.http;version="7.4.0", - org.eclipse.jetty.nested;version="7.4.0";resolution:=optional, - org.eclipse.jetty.server;version="7.4.0", - org.eclipse.jetty.server.handler;version="7.4.0", - org.eclipse.jetty.servlet;version="7.4.0", - org.eclipse.jetty.util;version="7.4.0", - org.eclipse.jetty.util.component;version="7.4.0", - org.eclipse.jetty.util.log;version="7.4.0", - org.eclipse.jetty.util.resource;version="7.4.0", - org.eclipse.jetty.webapp;version="7.4.1.v20110513", - org.eclipse.jetty.xml;version="7.4.0", + org.eclipse.jetty.deploy;version="7.6.2", + org.eclipse.jetty.deploy.providers;version="7.6.2", + org.eclipse.jetty.http;version="7.6.2", + org.eclipse.jetty.nested;version="7.6.2";resolution:=optional, + org.eclipse.jetty.server;version="7.6.2", + org.eclipse.jetty.server.handler;version="7.6.2", + org.eclipse.jetty.servlet;version="7.6.2", + org.eclipse.jetty.util;version="7.6.2", + org.eclipse.jetty.util.component;version="7.6.2", + org.eclipse.jetty.util.log;version="7.6.2", + org.eclipse.jetty.util.resource;version="7.6.2", + org.eclipse.jetty.webapp;version="7.6.2", + 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", - org.eclipse.jetty.osgi.nested;version="7.4.0", - org.eclipse.jetty.osgi.boot.utils;version="7.4.0" +Export-Package: org.eclipse.jetty.osgi.boot;version="7.6.2", + org.eclipse.jetty.osgi.nested;version="7.6.2", + org.eclipse.jetty.osgi.boot.utils;version="7.6.2" DynamicImport-Package: org.eclipse.jetty.*;version="[7.3,8)" diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml index 49bf343dc69..68a662d0338 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml @@ -22,14 +22,6 @@ 10 200 - - @@ -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 --> - diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java index fe3fa1ad792..34fd8c74db4 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java +++ b/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(); } diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java index 12b78cb957c..021c292f862 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java +++ b/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 diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java index ea8fc5192b9..b30d9a81d02 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java +++ b/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(); + } + } diff --git a/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF index 9097d5b9116..a9924522eb7 100644 --- a/jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF +++ b/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.io;version="7.4.0", - org.eclipse.jetty.util;version="7.4.0", - org.eclipse.jetty.util.log;version="7.4.0", - org.eclipse.jetty.websocket;version="7.4.0", + org.eclipse.jetty.continuation;version="7.6.2", + org.eclipse.jetty.io;version="7.6.2", + org.eclipse.jetty.util;version="7.6.2", + org.eclipse.jetty.util.log;version="7.6.2", + 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", - org.eclipse.jetty.osgi.equinoxtools.console;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.6.2" Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF index e148da82193..5a4355ae120 100644 --- a/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF +++ b/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.handler;version="7.0.0", - org.eclipse.jetty.servlet;version="7.4.0", - org.eclipse.jetty.util.component;version="7.0.0" -Export-Package: org.eclipse.jetty.osgi.httpservice;version="7.4.2" + org.eclipse.jetty.server;version="7.6.2", + org.eclipse.jetty.server.handler;version="7.6.2", + org.eclipse.jetty.servlet;version="7.6.2", + org.eclipse.jetty.util.component;version="7.6.2" +Export-Package: org.eclipse.jetty.osgi.httpservice;version="7.6.2" From aff3e3f28589bffd72577d314cb70207b8ee9a20 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 8 Mar 2012 20:20:43 -0600 Subject: [PATCH 05/13] removing some tests due to expired keystores --- .../client/SslCertSecuredExchangeTest.java | 40 +++--- .../jetty/client/SslValidationTestBase.java | 126 +++++++++--------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/SslCertSecuredExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/SslCertSecuredExchangeTest.java index 0b07a42403d..b00446f57b4 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/SslCertSecuredExchangeTest.java +++ b/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 - protected void configureClient(HttpClient client) throws Exception - { - SslContextFactory cf = client.getSslContextFactory(); - cf.setValidateCerts(true); - cf.setCrlPath(_crlpath); - - cf.setCertAlias("client"); - cf.setKeyStorePath(_clientpath); - cf.setKeyStorePassword(_password); - cf.setKeyManagerPassword(_password); - - cf.setTrustStore(_trustpath); - cf.setTrustStorePassword(_password); - } +// @Override +// protected void configureClient(HttpClient client) throws Exception +// { +// SslContextFactory cf = client.getSslContextFactory(); +// cf.setValidateCerts(true); +// cf.setCrlPath(_crlpath); +// +// cf.setCertAlias("client"); +// cf.setKeyStorePath(_clientpath); +// cf.setKeyStorePassword(_password); +// cf.setKeyManagerPassword(_password); +// +// cf.setTrustStore(_trustpath); +// cf.setTrustStorePassword(_password); +// } } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/SslValidationTestBase.java b/jetty-client/src/test/java/org/eclipse/jetty/client/SslValidationTestBase.java index 375020a71a1..50a733c4927 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/SslValidationTestBase.java +++ b/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 __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"); - - SslContextFactory srvFactory = new SslContextFactory() { - @Override - protected KeyStore getKeyStore(InputStream storeStream, String storePath, String storeType, String storeProvider, String storePassword) throws Exception - { - return CertificateUtils.getKeyStore(storeStream, storePath, storeType, storeProvider, storePassword); - } - - @Override - protected Collection loadCRL(String crlPath) throws Exception - { - return CertificateUtils.loadCRL(crlPath); - } - }; - srvFactory.setValidateCerts(true); - srvFactory.setCrlPath(_crlpath); - srvFactory.setNeedClientAuth(true); - - srvFactory.setKeyStorePath(_keypath); - srvFactory.setKeyStorePassword(_password); - srvFactory.setKeyManagerPassword(_password); - - srvFactory.setTrustStore(_trustpath); - srvFactory.setTrustStorePassword(_password); - - Constructor constructor = __klass.getConstructor(SslContextFactory.class); - SslConnector connector = constructor.newInstance(srvFactory); - connector.setMaxIdleTime(5000); - server.addConnector(connector); - - Handler handler = new TestHandler(getBasePath()); - - ServletContextHandler root = new ServletContextHandler(); - root.setContextPath("/"); - root.setResourceBase(getBasePath()); - ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); - servletHolder.setInitParameter( "gzip", "true" ); - root.addServlet( servletHolder, "/*" ); - - HandlerCollection handlers = new HandlerCollection(); - handlers.setHandlers(new Handler[]{handler, root}); - server.setHandler( handlers ); - } - - @Override - protected void configureClient(HttpClient client) - throws Exception - { - client.setConnectorType(__konnector); - - SslContextFactory cf = client.getSslContextFactory(); - cf.setValidateCerts(true); - cf.setCrlPath(_crlpath); - - cf.setKeyStorePath(_clientpath); - cf.setKeyStorePassword(_password); - cf.setKeyManagerPassword(_password); - - cf.setTrustStore(_trustpath); - cf.setTrustStorePassword(_password); +// setProtocol("https"); +// +// SslContextFactory srvFactory = new SslContextFactory() { +// @Override +// protected KeyStore getKeyStore(InputStream storeStream, String storePath, String storeType, String storeProvider, String storePassword) throws Exception +// { +// return CertificateUtils.getKeyStore(storeStream, storePath, storeType, storeProvider, storePassword); +// } +// +// @Override +// protected Collection loadCRL(String crlPath) throws Exception +// { +// return CertificateUtils.loadCRL(crlPath); +// } +// }; +// srvFactory.setValidateCerts(true); +// srvFactory.setCrlPath(_crlpath); +// srvFactory.setNeedClientAuth(true); +// +// srvFactory.setKeyStorePath(_keypath); +// srvFactory.setKeyStorePassword(_password); +// srvFactory.setKeyManagerPassword(_password); +// +// srvFactory.setTrustStore(_trustpath); +// srvFactory.setTrustStorePassword(_password); +// +// Constructor constructor = __klass.getConstructor(SslContextFactory.class); +// SslConnector connector = constructor.newInstance(srvFactory); +// connector.setMaxIdleTime(5000); +// server.addConnector(connector); +// +// Handler handler = new TestHandler(getBasePath()); +// +// ServletContextHandler root = new ServletContextHandler(); +// root.setContextPath("/"); +// root.setResourceBase(getBasePath()); +// ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); +// servletHolder.setInitParameter( "gzip", "true" ); +// root.addServlet( servletHolder, "/*" ); +// +// HandlerCollection handlers = new HandlerCollection(); +// handlers.setHandlers(new Handler[]{handler, root}); +// server.setHandler( handlers ); +// } +// +// @Override +// protected void configureClient(HttpClient client) +// throws Exception +// { +// client.setConnectorType(__konnector); +// +// SslContextFactory cf = client.getSslContextFactory(); +// cf.setValidateCerts(true); +// cf.setCrlPath(_crlpath); +// +// cf.setKeyStorePath(_clientpath); +// cf.setKeyStorePassword(_password); +// cf.setKeyManagerPassword(_password); +// +// cf.setTrustStore(_trustpath); +// cf.setTrustStorePassword(_password); } } From 67f3f05d7042a8e11f600bf077a0ee42caf0e4f7 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 8 Mar 2012 20:44:47 -0600 Subject: [PATCH 06/13] Updating VERSION.txt top section --- VERSION.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index f92e93231c5..379f4da7229 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,4 @@ -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 +7,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 From a63b3fdc5e6c29d9b4961889ac44edf1a9c2bce1 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 8 Mar 2012 21:09:37 -0600 Subject: [PATCH 07/13] [maven-release-plugin] prepare release jetty-7.6.2.v20120308 --- example-jetty-embedded/pom.xml | 2 +- jetty-aggregate/jetty-all-server/pom.xml | 2 +- jetty-aggregate/jetty-all/pom.xml | 2 +- jetty-aggregate/jetty-client/pom.xml | 2 +- jetty-aggregate/jetty-plus/pom.xml | 2 +- jetty-aggregate/jetty-server/pom.xml | 2 +- jetty-aggregate/jetty-servlet/pom.xml | 2 +- jetty-aggregate/jetty-webapp/pom.xml | 2 +- jetty-aggregate/jetty-websocket/pom.xml | 2 +- jetty-aggregate/pom.xml | 2 +- jetty-ajp/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jsp/pom.xml | 2 +- jetty-monitor/pom.xml | 2 +- jetty-nested/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-npn/pom.xml | 6 ++---- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-logback/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-equinoxtools/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-policy/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-spdy/pom.xml | 5 ++--- jetty-spdy/spdy-core/pom.xml | 6 ++---- jetty-spdy/spdy-jetty-http-webapp/pom.xml | 5 ++--- jetty-spdy/spdy-jetty-http/pom.xml | 5 ++--- jetty-spdy/spdy-jetty/pom.xml | 5 ++--- jetty-start/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- test-continuation/pom.xml | 2 +- test-jetty-nested/pom.xml | 2 +- test-jetty-servlet/pom.xml | 2 +- test-jetty-webapp/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- tests/test-sessions/test-hash-sessions/pom.xml | 2 +- tests/test-sessions/test-jdbc-sessions/pom.xml | 2 +- tests/test-sessions/test-mongodb-sessions/pom.xml | 2 +- tests/test-sessions/test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 68 files changed, 74 insertions(+), 82 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index a0c53ce5695..7fa75e8d60c 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 example-jetty-embedded diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index 31b79ddbfb1..fff663e075e 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-all-server diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index e4a0593e7f7..644a8a2cecd 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-all diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index 819cbe7174f..97d468056ac 100644 --- a/jetty-aggregate/jetty-client/pom.xml +++ b/jetty-aggregate/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-client diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index 40a65deac1c..e6bb57d718b 100644 --- a/jetty-aggregate/jetty-plus/pom.xml +++ b/jetty-aggregate/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-plus diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index b853d76d92f..fa25bb947d1 100644 --- a/jetty-aggregate/jetty-server/pom.xml +++ b/jetty-aggregate/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-server diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index cd32b86e965..2c9c565248b 100644 --- a/jetty-aggregate/jetty-servlet/pom.xml +++ b/jetty-aggregate/jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-servlet diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index fa250deeb72..d6cf4d96ec2 100644 --- a/jetty-aggregate/jetty-webapp/pom.xml +++ b/jetty-aggregate/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-webapp diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml index a17a741d1d3..9d06f81adb8 100644 --- a/jetty-aggregate/jetty-websocket/pom.xml +++ b/jetty-aggregate/jetty-websocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-websocket diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 472419aaa38..810ac19555d 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index 8fe8f311d52..e9675e1965f 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 5a8051c2c4d..c2720c218cc 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index f98e281b61f..b0fd96905b4 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 2cfa65e7005..ea9d7487844 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 72cb042eebf..a82e8a17b7f 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index d588b06a85c..f083cac7d41 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 87c81305902..535ad74d0df 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 66633339b18..83509484d22 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index f5c8dcab778..bcae61d1d20 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-io diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 3f82b9ebedb..5aa82011c1e 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 6cb2dbd152d..58e63981ada 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 23b4ee3ccf7..2c297a24d27 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-jndi diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 11dee5659ad..f92a0e9e716 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-jsp diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index ec560bb978c..e9b3dce73ef 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-monitor diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index 99eca0d7756..596796b3dc7 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 jetty-nested Jetty :: Nested diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 09346853c9e..91ed00be4ac 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-nosql diff --git a/jetty-npn/pom.xml b/jetty-npn/pom.xml index b251398c1e3..6079fdd9182 100644 --- a/jetty-npn/pom.xml +++ b/jetty-npn/pom.xml @@ -1,11 +1,9 @@ - + org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 4baa60ac316..3517d3fe560 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml index c1ff444ca70..50834ac7e7f 100644 --- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 12df3058e17..7ee990bf679 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 277eb9db3f1..2a2585a95a0 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml index 6c22c0850fc..6bcb3abf4b3 100644 --- a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml +++ b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 9b20c736fa0..e1bf133af77 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 ../pom.xml 4.0.0 diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index a6f22e17739..1f2501741e7 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 ../pom.xml org.eclipse.jetty.osgi diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index a9fef116985..03b058752ae 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 3557aa19137..1f07c4b921a 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 68f6c07a650..efa698fef26 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index f7e7c616538..7bfdd703ce1 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 jetty-policy Jetty :: Policy Tool diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 58b9c36f24a..0c841fcee66 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 08c0ba2efb6..6ee0f4f9d66 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index f9c73e17fe5..74577e3e9d8 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index abf9b924446..d9a6a54a914 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 434ddf68e09..6e74842a470 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-servlets diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index 02a657f9ef0..a35cc62a119 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -1,10 +1,9 @@ - + org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index e24895787fb..d8eb4e69055 100644 --- a/jetty-spdy/spdy-core/pom.xml +++ b/jetty-spdy/spdy-core/pom.xml @@ -1,11 +1,9 @@ - + org.eclipse.jetty.spdy spdy-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 diff --git a/jetty-spdy/spdy-jetty-http-webapp/pom.xml b/jetty-spdy/spdy-jetty-http-webapp/pom.xml index 5640d31716b..9c325630c46 100644 --- a/jetty-spdy/spdy-jetty-http-webapp/pom.xml +++ b/jetty-spdy/spdy-jetty-http-webapp/pom.xml @@ -1,10 +1,9 @@ - + org.eclipse.jetty.spdy spdy-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 spdy-jetty-http-webapp diff --git a/jetty-spdy/spdy-jetty-http/pom.xml b/jetty-spdy/spdy-jetty-http/pom.xml index 3a31efaa096..deab52246ce 100644 --- a/jetty-spdy/spdy-jetty-http/pom.xml +++ b/jetty-spdy/spdy-jetty-http/pom.xml @@ -1,10 +1,9 @@ - + org.eclipse.jetty.spdy spdy-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 spdy-jetty-http diff --git a/jetty-spdy/spdy-jetty/pom.xml b/jetty-spdy/spdy-jetty/pom.xml index 24ebf0b4359..1b63f41450f 100644 --- a/jetty-spdy/spdy-jetty/pom.xml +++ b/jetty-spdy/spdy-jetty/pom.xml @@ -1,10 +1,9 @@ - + org.eclipse.jetty.spdy spdy-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 spdy-jetty diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 46b25d3821e..0980d46bf9f 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index f7cd942be52..a8848b7bcb2 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 093a4202cbc..bcc434b82f7 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 180d1e69548..08f68f1a887 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index ff4f04d1d84..af71e675368 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 6e4d55f5deb..3c5d4467747 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 19 jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 Jetty :: Project ${jetty.url} pom diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 263146b982b..62a8e513ce1 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 test-continuation diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml index 2915d06fcf3..653de498294 100644 --- a/test-jetty-nested/pom.xml +++ b/test-jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-jetty-nested Jetty :: Nested Test diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 1d1c2c41892..4ab2d2f8f58 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index cfd04177fb6..bc4caeac4ec 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 test-jetty-webapp diff --git a/tests/pom.xml b/tests/pom.xml index 566749bcd41..4aeb67551b0 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 7.6.2-SNAPSHOT + 7.6.2.v20120308 org.eclipse.jetty.tests tests-parent diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index fab815f92c5..8b956453f52 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 4.0.0 test-integration diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 504748b30d5..51c2c462fd4 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 90cd048267b..6274b1ffecc 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index ac985f66af4..10ddbb9697b 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-hash-sessions Jetty Tests :: Sessions :: Hash diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 0676a6aae9b..86357ba67df 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 3e7cda34db2..768dda86d37 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index d6f6cfabfd1..f6f79a510df 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 2b6000b55e3..b69052b0124 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-webapps-parent Jetty Tests :: WebApps :: Parent diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 9518b6e14ac..38e6bd81b54 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.6.2-SNAPSHOT + 7.6.2.v20120308 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 246e3ed7561ce9e39ca64e20c7a1ca89c749ce16 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 8 Mar 2012 21:09:46 -0600 Subject: [PATCH 08/13] [maven-release-plugin] prepare for next development iteration --- example-jetty-embedded/pom.xml | 2 +- jetty-aggregate/jetty-all-server/pom.xml | 2 +- jetty-aggregate/jetty-all/pom.xml | 2 +- jetty-aggregate/jetty-client/pom.xml | 2 +- jetty-aggregate/jetty-plus/pom.xml | 2 +- jetty-aggregate/jetty-server/pom.xml | 2 +- jetty-aggregate/jetty-servlet/pom.xml | 2 +- jetty-aggregate/jetty-webapp/pom.xml | 2 +- jetty-aggregate/jetty-websocket/pom.xml | 2 +- jetty-aggregate/pom.xml | 2 +- jetty-ajp/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jsp/pom.xml | 2 +- jetty-monitor/pom.xml | 2 +- jetty-nested/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-npn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-logback/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-equinoxtools/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-overlay-deployer/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-policy/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-spdy/pom.xml | 2 +- jetty-spdy/spdy-core/pom.xml | 2 +- jetty-spdy/spdy-jetty-http-webapp/pom.xml | 2 +- jetty-spdy/spdy-jetty-http/pom.xml | 2 +- jetty-spdy/spdy-jetty/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- test-continuation/pom.xml | 2 +- test-jetty-nested/pom.xml | 2 +- test-jetty-servlet/pom.xml | 2 +- test-jetty-webapp/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- tests/test-sessions/test-hash-sessions/pom.xml | 2 +- tests/test-sessions/test-jdbc-sessions/pom.xml | 2 +- tests/test-sessions/test-mongodb-sessions/pom.xml | 2 +- tests/test-sessions/test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 68 files changed, 68 insertions(+), 68 deletions(-) diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index 7fa75e8d60c..d502516fcab 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 example-jetty-embedded diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index fff663e075e..79cca0d1ac5 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-all-server diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index 644a8a2cecd..1732fe91454 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-all diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index 97d468056ac..d9564cc6500 100644 --- a/jetty-aggregate/jetty-client/pom.xml +++ b/jetty-aggregate/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-client diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index e6bb57d718b..7b9072035ec 100644 --- a/jetty-aggregate/jetty-plus/pom.xml +++ b/jetty-aggregate/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index fa25bb947d1..9d40c3c2874 100644 --- a/jetty-aggregate/jetty-server/pom.xml +++ b/jetty-aggregate/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index 2c9c565248b..c07d0f0cb27 100644 --- a/jetty-aggregate/jetty-servlet/pom.xml +++ b/jetty-aggregate/jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index d6cf4d96ec2..601029b7fc4 100644 --- a/jetty-aggregate/jetty-webapp/pom.xml +++ b/jetty-aggregate/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml index 9d06f81adb8..64a63f6ce6c 100644 --- a/jetty-aggregate/jetty-websocket/pom.xml +++ b/jetty-aggregate/jetty-websocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-websocket diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 810ac19555d..e14e64cfe8f 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index e9675e1965f..fd5738a61a1 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index c2720c218cc..0d70342a924 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index b0fd96905b4..cc1680f72db 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index ea9d7487844..8fbbb06a52d 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index a82e8a17b7f..8c860d28e25 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index f083cac7d41..a76dbaa55d6 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 535ad74d0df..84c54ea3d23 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 83509484d22..73619e5cdbe 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index bcae61d1d20..b96a6037e19 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 5aa82011c1e..891baa6e469 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 58e63981ada..b6d1c526123 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 2c297a24d27..975d0354c4b 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index f92a0e9e716..9b7ffa4be2e 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-jsp diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index e9b3dce73ef..9aaba66f66d 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-monitor diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index 596796b3dc7..08c1c75622a 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT jetty-nested Jetty :: Nested diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 91ed00be4ac..d9a7d9d713a 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-npn/pom.xml b/jetty-npn/pom.xml index 6079fdd9182..89fefffbd69 100644 --- a/jetty-npn/pom.xml +++ b/jetty-npn/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 3517d3fe560..229510055df 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml index 50834ac7e7f..4be355432a2 100644 --- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 7ee990bf679..54439743d41 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 2a2585a95a0..2af33ad6470 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml index 6bcb3abf4b3..8213e4ca137 100644 --- a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml +++ b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index e1bf133af77..767042c2a42 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 1f2501741e7..d95a1b9e025 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT ../pom.xml org.eclipse.jetty.osgi diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 03b058752ae..f0cfa42690b 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 1f07c4b921a..ca9f243f9cc 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index efa698fef26..195dc9e3f5e 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index 7bfdd703ce1..e1a8b37e946 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT jetty-policy Jetty :: Policy Tool diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 0c841fcee66..f555c1e10de 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 6ee0f4f9d66..51b25dc0d52 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 74577e3e9d8..cd446cab611 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index d9a6a54a914..444a41fb492 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 6e74842a470..47c149cb588 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index a35cc62a119..081ff878d69 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index d8eb4e69055..058434a1491 100644 --- a/jetty-spdy/spdy-core/pom.xml +++ b/jetty-spdy/spdy-core/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.spdy spdy-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-jetty-http-webapp/pom.xml b/jetty-spdy/spdy-jetty-http-webapp/pom.xml index 9c325630c46..41188017aec 100644 --- a/jetty-spdy/spdy-jetty-http-webapp/pom.xml +++ b/jetty-spdy/spdy-jetty-http-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.spdy spdy-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 spdy-jetty-http-webapp diff --git a/jetty-spdy/spdy-jetty-http/pom.xml b/jetty-spdy/spdy-jetty-http/pom.xml index deab52246ce..9c35d0babcc 100644 --- a/jetty-spdy/spdy-jetty-http/pom.xml +++ b/jetty-spdy/spdy-jetty-http/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.spdy spdy-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 spdy-jetty-http diff --git a/jetty-spdy/spdy-jetty/pom.xml b/jetty-spdy/spdy-jetty/pom.xml index 1b63f41450f..6332c18e01e 100644 --- a/jetty-spdy/spdy-jetty/pom.xml +++ b/jetty-spdy/spdy-jetty/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.spdy spdy-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 spdy-jetty diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 0980d46bf9f..c227d7a7ed1 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index a8848b7bcb2..c254b68dab1 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index bcc434b82f7..1d799705ea4 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 08f68f1a887..d42c1bdf925 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index af71e675368..86fecc83b55 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 3c5d4467747..8edf9e2e289 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 19 jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT Jetty :: Project ${jetty.url} pom diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 62a8e513ce1..95f92bdc42f 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 test-continuation diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml index 653de498294..8a26d325607 100644 --- a/test-jetty-nested/pom.xml +++ b/test-jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-jetty-nested Jetty :: Nested Test diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 4ab2d2f8f58..c4b5870f581 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index bc4caeac4ec..a8deb0a2f67 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 test-jetty-webapp diff --git a/tests/pom.xml b/tests/pom.xml index 4aeb67551b0..fc08af9148b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty jetty-project - 7.6.2.v20120308 + 7.6.3-SNAPSHOT org.eclipse.jetty.tests tests-parent diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 8b956453f52..cd090026116 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT 4.0.0 test-integration diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 51c2c462fd4..0bd1190883e 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 6274b1ffecc..91c77c3b91b 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index 10ddbb9697b..6cdd8f83eb9 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-hash-sessions Jetty Tests :: Sessions :: Hash diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 86357ba67df..9f8b64da707 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 768dda86d37..c4a2b231af8 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index f6f79a510df..7eacd1a1268 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-sessions-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index b69052b0124..a97c0f7dd63 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests tests-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-webapps-parent Jetty Tests :: WebApps :: Parent diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 38e6bd81b54..4308f19d82b 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -21,7 +21,7 @@ org.eclipse.jetty.tests test-webapps-parent - 7.6.2.v20120308 + 7.6.3-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 3561bcbf4056281a4c28b4030a34a56deab7460e Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 8 Mar 2012 21:53:24 -0600 Subject: [PATCH 09/13] set for dev --- VERSION.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VERSION.txt b/VERSION.txt index 379f4da7229..a1f09a0276b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-7.6.3-SNAPSHOT + jetty-7.6.2.v20120308 - 08 March 2012 + 370387 SafariWebsocketDraft0Test failure during build. + 371168 Update ClientCrossContextSessionTest From 309a58647e07705f537a90bf00406252b5ea5730 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 9 Mar 2012 16:30:13 +1100 Subject: [PATCH 10/13] Fix package of org.glassfish.jsp --- jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF index 27738d24434..313f9eba384 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF +++ b/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Import-Package: com.sun.el;resolution:=optional, org.apache.jasper.tagplugins.jstl;version="6.0.0";resolution:=optional, org.apache.jasper.util;version="6.0.0";resolution:=optional, org.apache.jasper.xmlparser;version="6.0.0";resolution:=optional, - org.glassfish.jasper.api;version="2.1.3";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, From d3b2a3ee0c17772337c95073932d91f184516efd Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 12 Mar 2012 12:24:52 +1100 Subject: [PATCH 11/13] 373269: only setHandled(true) if a servlet matches --- .../main/java/org/eclipse/jetty/servlet/ServletHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 1a5e485f216..b9e2c24e58f 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/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); } } From 67ce45928c78f7550d45c72dc4ffa8c0616c9851 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 12 Mar 2012 12:25:24 +1100 Subject: [PATCH 12/13] added $Q handling to RewriteReqexRule --- .../rewrite/handler/RewriteRegexRule.java | 13 ++++++- .../rewrite/handler/RewriteRegexRuleTest.java | 39 ++++++++++++------- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java index 6c57e29bdf6..49a27dcee30 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java +++ b/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); diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java index 1464f67ab9c..55eecfafe45 100644 --- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java +++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java @@ -23,13 +23,19 @@ public class RewriteRegexRuleTest extends AbstractRuleTestCase { private String[][] _tests= { - {"/foo/bar",".*","/replace","/replace",null}, - {"/foo/bar","/xxx.*","/replace",null,null}, - {"/foo/bar","/(.*)/(.*)","/$2/$1/xxx","/bar/foo/xxx",null}, - {"/foo/bar","/(foo)/(.*)(bar)","/$3/$1/xxx$2","/bar/foo/xxx",null}, - {"/foo/$bar",".*","/$replace","/$replace",null}, - {"/foo/$bar","/foo/(.*)","/$1/replace","/$bar/replace",null}, - {"/foo/bar/info","/foo/(NotHere)?([^/]*)/(.*)","/$3/other?p1=$2","/info/other","p1=bar"}, + {"/foo/bar",null,".*","/replace","/replace",null}, + {"/foo/bar","n=v",".*","/replace","/replace","n=v"}, + {"/foo/bar",null,"/xxx.*","/replace",null,null}, + {"/foo/bar",null,"/(.*)/(.*)","/$2/$1/xxx","/bar/foo/xxx",null}, + {"/foo/bar",null,"/(.*)/(.*)","/test?p2=$2&p1=$1","/test","p2=bar&p1=foo"}, + {"/foo/bar","n=v","/(.*)/(.*)","/test?p2=$2&p1=$1","/test","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 +51,20 @@ public class RewriteRegexRuleTest extends AbstractRuleTestCase { for (String[] test : _tests) { - _rule.setRegex(test[1]); - _rule.setReplacement(test[2]); - String result = _rule.matchAndApply(test[0], _request, _response); - assertEquals(test[1], test[3], result); - + String t=test[0]+"?"+test[1]+">"+test[2]+"|"+test[3]; + _rule.setRegex(test[2]); + _rule.setReplacement(test[3]); + _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(test[4], _request.getQueryString()); + assertEquals(t,test[4], _request.getRequestURI()); + assertEquals(t,test[5], _request.getQueryString()); } } } From 9155ee46d000ceaf050db9647057ad86f20b6cd5 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 12 Mar 2012 23:59:23 +1100 Subject: [PATCH 13/13] 373951: regexrewrite will apply URI for all non null rule returns, even if target has not changed --- .../jetty/rewrite/handler/RuleContainer.java | 37 +++++++++---------- .../rewrite/handler/RewriteRegexRuleTest.java | 25 +++++++++++++ 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java b/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java index 0321859b27b..3ac926f8815 100644 --- a/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java +++ b/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) - { - original_set=true; - request.setAttribute(_originalPathAttribute, target); - } + LOG.debug("rewrote {} to {}",target,applied); + if (!original_set) + { + original_set=true; + request.setAttribute(_originalPathAttribute, target); + } - if (_rewriteRequestURI) - { - if (rule instanceof Rule.ApplyURI && !target.equals(request.getRequestURI())) - ((Rule.ApplyURI)rule).applyURI((Request)request, target, applied); - else - ((Request)request).setRequestURI(applied); - } - - if (_rewritePathInfo) - ((Request)request).setPathInfo(applied); - - target=applied; + if (_rewriteRequestURI) + { + if (rule instanceof Rule.ApplyURI) + ((Rule.ApplyURI)rule).applyURI((Request)request, target, applied); + else + ((Request)request).setRequestURI(applied); } + + if (_rewritePathInfo) + ((Request)request).setPathInfo(applied); + + target=applied; if (rule.isHandling()) { diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java index 55eecfafe45..872bb6e5b85 100644 --- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java +++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java @@ -29,6 +29,8 @@ public class RewriteRegexRuleTest extends AbstractRuleTestCase {"/foo/bar",null,"/(.*)/(.*)","/$2/$1/xxx","/bar/foo/xxx",null}, {"/foo/bar",null,"/(.*)/(.*)","/test?p2=$2&p1=$1","/test","p2=bar&p1=foo"}, {"/foo/bar","n=v","/(.*)/(.*)","/test?p2=$2&p1=$1","/test","n=v&p2=bar&p1=foo"}, + {"/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}, @@ -67,4 +69,27 @@ public class RewriteRegexRuleTest extends AbstractRuleTestCase 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()); + } + } }