Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-03-07 00:41:58 -0500
committerGreg Wilkins2011-03-07 00:41:58 -0500
commitb65d8cea61f90f9adb42d371ccc361af65edf93b (patch)
treee8c64d741e0a5967b8bf2a202a64532ce9a82392
parent266195cc0bedea21d256d57d9b9745243e64230a (diff)
downloadorg.eclipse.jetty.project-b65d8cea61f90f9adb42d371ccc361af65edf93b.tar.gz
org.eclipse.jetty.project-b65d8cea61f90f9adb42d371ccc361af65edf93b.tar.xz
org.eclipse.jetty.project-b65d8cea61f90f9adb42d371ccc361af65edf93b.zip
[maven-release-plugin] copy for tag jetty-7.3.1.v20110307jetty-7.3.1.v20110307
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.3.1.v20110307@2863 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt7
-rw-r--r--example-jetty-embedded/pom.xml2
-rw-r--r--jetty-aggregate/jetty-all-server/pom.xml2
-rw-r--r--jetty-aggregate/jetty-all/pom.xml2
-rw-r--r--jetty-aggregate/jetty-client/pom.xml2
-rw-r--r--jetty-aggregate/jetty-plus/pom.xml2
-rw-r--r--jetty-aggregate/jetty-server/pom.xml2
-rw-r--r--jetty-aggregate/jetty-servlet/pom.xml2
-rw-r--r--jetty-aggregate/jetty-webapp/pom.xml2
-rw-r--r--jetty-aggregate/pom.xml2
-rw-r--r--jetty-ajp/pom.xml2
-rw-r--r--jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13SocketConnector.java8
-rw-r--r--jetty-annotations/pom.xml2
-rw-r--r--jetty-client/pom.xml2
-rw-r--r--jetty-continuation/pom.xml2
-rw-r--r--jetty-deploy/pom.xml3
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java23
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java22
-rw-r--r--jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties12
-rw-r--r--jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties2
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerLifeCyclePathTest.java54
-rw-r--r--jetty-distribution/pom.xml2
-rw-r--r--jetty-http/pom.xml2
-rw-r--r--jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java6
-rw-r--r--jetty-io/pom.xml2
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java40
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java3
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java3
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java3
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java6
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java6
-rw-r--r--jetty-jaspi/pom.xml2
-rw-r--r--jetty-jmx/pom.xml2
-rw-r--r--jetty-jndi/pom.xml2
-rw-r--r--jetty-jsp-2.1/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-boot-jsp/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-boot-logback/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-boot-warurl/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-boot/pom.xml2
-rw-r--r--jetty-osgi/jetty-osgi-httpservice/pom.xml2
-rw-r--r--jetty-osgi/pom.xml2
-rw-r--r--jetty-osgi/test-jetty-osgi/pom.xml2
-rw-r--r--jetty-plus/pom.xml2
-rw-r--r--jetty-policy/pom.xml2
-rw-r--r--jetty-rewrite/pom.xml2
-rw-r--r--jetty-security/pom.xml2
-rw-r--r--jetty-server/pom.xml2
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java2
-rw-r--r--jetty-servlet/pom.xml2
-rw-r--r--jetty-servlets/pom.xml2
-rw-r--r--jetty-start/pom.xml2
-rw-r--r--jetty-util/pom.xml2
-rw-r--r--jetty-webapp/pom.xml2
-rw-r--r--jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java20
-rw-r--r--jetty-websocket/pom.xml2
-rw-r--r--jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD06Test.java2
-rw-r--r--jetty-xml/pom.xml2
-rw-r--r--pom.xml8
-rw-r--r--test-continuation-jetty6/pom.xml2
-rw-r--r--test-continuation/pom.xml2
-rw-r--r--test-jetty-servlet/pom.xml2
-rw-r--r--test-jetty-webapp/pom.xml2
-rw-r--r--tests/pom.xml2
-rw-r--r--tests/test-integration/pom.xml2
-rw-r--r--tests/test-loginservice/pom.xml2
-rw-r--r--tests/test-sessions/pom.xml2
-rw-r--r--tests/test-sessions/test-hash-sessions/pom.xml2
-rw-r--r--tests/test-sessions/test-jdbc-sessions/pom.xml2
-rw-r--r--tests/test-sessions/test-sessions-common/pom.xml2
-rw-r--r--tests/test-webapps/pom.xml2
-rw-r--r--tests/test-webapps/test-webapp-rfc2616/pom.xml2
71 files changed, 135 insertions, 199 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 9bbc7d0c43..76c1f9db50 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,5 @@
-jetty-7.3.1.v20110304 4 March 2011
+
+jetty-7.3.1.v20110307 7 March 2011
+ 316382 Support a more strict SSL option with certificates
+ 333481 Handle UCS-4 codepoints in decode and encode
+ 335329 Moved blocking timeout handling to outside try catch
@@ -21,7 +22,9 @@ jetty-7.3.1.v20110304 4 March 2011
+ 338068 Leaking ConstraintMappings on redeploy
+ 338092 ProxyServlet leaks memory
+ 338607 Removed managed attributes when context is stopped
- + 338819 Externally control Deployment Manager application lifecycle
+ + 338880 Fixed failing buffer range checks
+ + 338920 Handle non existent real path directories
+ + 338961 AJP packet size
+ JETTY-1304 Allow quoted boundaries in Multipart filter
+ JETTY-1317 More elegent handling of bad URIs in requests
+ JETTY-1331 Allow alternate XML configuration processors (eg spring)
diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml
index 7b9da32fc1..b8b9a17b54 100644
--- a/example-jetty-embedded/pom.xml
+++ b/example-jetty-embedded/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>example-jetty-embedded</artifactId>
diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index 0636c16498..62b357b4e3 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 4e657c0d01..4d452f3e40 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml
index 940fb88de1..7b109f842b 100644
--- a/jetty-aggregate/jetty-client/pom.xml
+++ b/jetty-aggregate/jetty-client/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index 702f3003cb..3ac1c4ccaa 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml
index 3d6d53a294..eeb9206a7b 100644
--- a/jetty-aggregate/jetty-server/pom.xml
+++ b/jetty-aggregate/jetty-server/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml
index bc1992a78d..79c2f940fd 100644
--- a/jetty-aggregate/jetty-servlet/pom.xml
+++ b/jetty-aggregate/jetty-servlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml
index e30177b244..c4a5d36dee 100644
--- a/jetty-aggregate/jetty-webapp/pom.xml
+++ b/jetty-aggregate/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.aggregate</groupId>
diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml
index 18d4960030..b0d4f30291 100644
--- a/jetty-aggregate/pom.xml
+++ b/jetty-aggregate/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-aggregate-project</artifactId>
diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml
index 2c63112eaa..c8370fbcc0 100644
--- a/jetty-ajp/pom.xml
+++ b/jetty-ajp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ajp</artifactId>
diff --git a/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13SocketConnector.java b/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13SocketConnector.java
index 91f6404873..5e39e3dd7c 100644
--- a/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13SocketConnector.java
+++ b/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13SocketConnector.java
@@ -33,10 +33,10 @@ public class Ajp13SocketConnector extends SocketConnector
static boolean __allowShutdown = false;
public Ajp13SocketConnector()
{
- super.setRequestHeaderSize(Ajp13Packet.MAX_DATA_SIZE);
- super.setResponseHeaderSize(Ajp13Packet.MAX_DATA_SIZE);
- super.setRequestBufferSize(Ajp13Packet.MAX_DATA_SIZE);
- super.setResponseBufferSize(Ajp13Packet.MAX_DATA_SIZE);
+ super.setRequestHeaderSize(Ajp13Packet.MAX_PACKET_SIZE);
+ super.setResponseHeaderSize(Ajp13Packet.MAX_PACKET_SIZE);
+ super.setRequestBufferSize(Ajp13Packet.MAX_PACKET_SIZE);
+ super.setResponseBufferSize(Ajp13Packet.MAX_PACKET_SIZE);
// IN AJP protocol the socket stay open, so
// by default the time out is set to 0 seconds
super.setMaxIdleTime(0);
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index d362f6d56e..df6c2352c1 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-annotations</artifactId>
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index 3419413c0d..30b163b319 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 203a9ca259..861d8d54eb 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-continuation</artifactId>
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index e0822b9724..c2020b2cae 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-deploy</artifactId>
@@ -95,7 +95,6 @@
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId>
- <version>1.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
index 5e83a08364..1e2c0acfb4 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
@@ -35,6 +35,7 @@ import org.eclipse.jetty.deploy.graph.Path;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.util.AttributesMap;
+import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.component.AggregateLifeCycle;
import org.eclipse.jetty.util.log.Log;
@@ -434,10 +435,10 @@ public class DeploymentManager extends AggregateLifeCycle
public void requestAppGoal(App app, String nodeName)
{
AppEntry appentry = findAppByOriginId(app.getOriginId());
- if (appentry == null)
- {
- throw new IllegalStateException("App not being tracked by Deployment Manager: " + app);
- }
+ if (appentry == null)
+ {
+ throw new IllegalStateException("App not being tracked by Deployment Manager: " + app);
+ }
requestAppGoal(appentry,nodeName);
}
@@ -454,10 +455,6 @@ public class DeploymentManager extends AggregateLifeCycle
private void requestAppGoal(AppEntry appentry, String nodeName)
{
Node destinationNode = _lifecycle.getNodeByName(nodeName);
- if (destinationNode == null)
- {
- throw new IllegalStateException("Node not present in Deployment Manager: " + nodeName);
- }
// Compute lifecycle steps
Path path = _lifecycle.getPath(appentry.lifecyleNode,destinationNode);
if (path.isEmpty())
@@ -566,14 +563,4 @@ public class DeploymentManager extends AggregateLifeCycle
{
this._useStandardBindings = useStandardBindings;
}
-
- public Collection<Node> getNodes()
- {
- return _lifecycle.getNodes();
- }
-
- public Collection<App> getApps(String nodeName)
- {
- return getApps(_lifecycle.getNodeByName(nodeName));
- }
}
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java
index 3bd5362494..3a219215f6 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java
@@ -7,7 +7,6 @@ import java.util.List;
import org.eclipse.jetty.deploy.App;
import org.eclipse.jetty.deploy.AppProvider;
import org.eclipse.jetty.deploy.DeploymentManager;
-import org.eclipse.jetty.deploy.graph.Node;
import org.eclipse.jetty.jmx.ObjectMBean;
import org.eclipse.jetty.server.handler.ContextHandler;
@@ -21,14 +20,6 @@ public class DeploymentManagerMBean extends ObjectMBean
_manager=(DeploymentManager)managedObject;
}
- public Collection<String> getNodes()
- {
- List<String> nodes = new ArrayList<String>();
- for (Node node: _manager.getNodes())
- nodes.add(node.getName());
- return nodes;
- }
-
public Collection<String> getApps()
{
List<String> apps=new ArrayList<String>();
@@ -37,14 +28,6 @@ public class DeploymentManagerMBean extends ObjectMBean
return apps;
}
- public Collection<String> getApps(String nodeName)
- {
- List<String> apps=new ArrayList<String>();
- for (App app: _manager.getApps(nodeName))
- apps.add(app.getOriginId());
- return apps;
- }
-
public Collection<ContextHandler> getContexts() throws Exception
{
List<ContextHandler> apps=new ArrayList<ContextHandler>();
@@ -57,9 +40,4 @@ public class DeploymentManagerMBean extends ObjectMBean
{
return _manager.getAppProviders();
}
-
- public void requestAppGoal(String appId, String nodeName)
- {
- _manager.requestAppGoal(appId, nodeName);
- }
}
diff --git a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties
index 4149820d53..726c236b1a 100644
--- a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties
+++ b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties
@@ -1,10 +1,4 @@
DeploymentManager: Deployment Manager
-nodes:MBean: App LifeCycle Nodes
-apps:MBean: Deployed Apps
-contexts:MMBean: Deployed Contexts
-appProviders:MMBean: Application Providers
-getApps(java.lang.String):MBean:ACTION: List apps that are located at specified App LifeCycle node
-getApps(java.lang.String)[0]:nodeName: Name of the App LifeCycle node
-requestAppGoal(java.lang.String,java.lang.String) ACTION: Request the app to be moved to the specified App LifeCycle node
-requestAppGoal(java.lang.String,java.lang.String)[0]:appId:App identifier
-requestAppGoal(java.lang.String,java.lang.String)[1]:nodeName:Name of the App LifeCycle node \ No newline at end of file
+apps:MBean:Deployed Apps
+contexts:MMBean:Deployed Contexts
+appProviders:MMBean:Application Providers \ No newline at end of file
diff --git a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties
index 2815ae6ee4..a1304e1e7a 100644
--- a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties
+++ b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties
@@ -1,6 +1,6 @@
WebAppDeployer: Deployer for startup deployment of webapps
contexts: MObject: The ContextHandlerCollection to which the deployer deploys
-allowDuplicates: Object:RO: Whether or not duplicate deployments are allowed
+allowDuplicates: Object:R0: Whether or not duplicate deployments are allowed
setAllowDuplicates(boolean):ACTION: Whether or not duplicate deployments are allowed
setAllowDuplicates(boolean)[0]:allowDuplicates: True allows duplicate webapps to be deployed while false does not
defaultsDescriptor: Object: The webdefault.xml descriptor to use for all webapps deployed by the deployer
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerLifeCyclePathTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerLifeCyclePathTest.java
index a239502513..b15bdc5f4b 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerLifeCyclePathTest.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerLifeCyclePathTest.java
@@ -15,16 +15,10 @@
// ========================================================================
package org.eclipse.jetty.deploy;
-import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-import org.eclipse.jetty.toolchain.jmx.JmxServiceConnection;
import org.junit.Test;
public class DeploymentManagerLifeCyclePathTest
@@ -85,52 +79,4 @@ public class DeploymentManagerLifeCyclePathTest
pathtracker.assertExpected("Test StateTransition / New only",expected);
}
-
- @Test
- public void testStateTransition_DeployedToUndeployed() throws Exception
- {
- DeploymentManager depman = new DeploymentManager();
- depman.setDefaultLifeCycleGoal(null); // no default
- AppLifeCyclePathCollector pathtracker = new AppLifeCyclePathCollector();
- MockAppProvider mockProvider = new MockAppProvider();
-
- // Setup JMX
- MBeanContainer mbContainer=new MBeanContainer(ManagementFactory.getPlatformMBeanServer());
- mbContainer.start();
- mbContainer.addBean(depman);
-
- depman.addLifeCycleBinding(pathtracker);
- depman.addAppProvider(mockProvider);
- depman.setContexts(new ContextHandlerCollection());
-
- // Start DepMan
- depman.start();
-
- // Trigger new App
- mockProvider.findWebapp("foo-webapp-1.war");
-
- App app = depman.getAppByOriginId("mock-foo-webapp-1.war");
-
- // Request Deploy of App
- depman.requestAppGoal(app,"deployed");
-
- JmxServiceConnection jmxConnection = new JmxServiceConnection();
- jmxConnection.connect();
-
- MBeanServerConnection mbsConnection = jmxConnection.getConnection();
- ObjectName dmObjName = new ObjectName("org.eclipse.jetty.deploy:type=deploymentmanager,id=0");
- String[] params = new String[] {"mock-foo-webapp-1.war", "undeployed"};
- String[] signature = new String[] {"java.lang.String", "java.lang.String"};
- mbsConnection.invoke(dmObjName, "requestAppGoal", params, signature);
-
- // Setup Expectations.
- List<String> expected = new ArrayList<String>();
- // SHOULD NOT SEE THIS NODE VISITED - expected.add("undeployed");
- expected.add("deploying");
- expected.add("deployed");
- expected.add("undeploying");
- expected.add("undeployed");
-
- pathtracker.assertExpected("Test JMX StateTransition / Deployed -> Undeployed",expected);
- }
}
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 3e24876e67..1e2ab325b1 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<artifactId>jetty-distribution</artifactId>
<name>Jetty :: Distribution Assemblies</name>
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index f981d00870..b4b67a675c 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
index 2f72a16ba5..a9633ac4de 100644
--- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
+++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
@@ -49,7 +49,7 @@ public class HttpGeneratorClientTest
generator.completeHeader(fields,false);
- generator.addContent(new ByteArrayBuffer(content),true);
+ generator.addContent(new ByteArrayBuffer(content).asMutableBuffer(),true);
generator.flushBuffer();
generator.complete();
generator.flushBuffer();
@@ -74,7 +74,7 @@ public class HttpGeneratorClientTest
String content = "The quick brown fox jumped over the lazy dog";
- generator.addContent(new ByteArrayBuffer(content),true);
+ generator.addContent(new ByteArrayBuffer(content).asMutableBuffer(),true);
generator.completeHeader(fields,true);
generator.flushBuffer();
@@ -103,7 +103,7 @@ public class HttpGeneratorClientTest
generator.completeHeader(fields,false);
- generator.addContent(new ByteArrayBuffer(content),false);
+ generator.addContent(new ByteArrayBuffer(content).asMutableBuffer(),false);
generator.flushBuffer();
generator.complete();
generator.flushBuffer();
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 86fdf834ad..8e54683c08 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
index 38842622dc..1dfc91a05c 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
@@ -25,6 +25,8 @@ import org.eclipse.jetty.util.log.Log;
*/
public abstract class AbstractBuffer implements Buffer
{
+ private final static boolean __boundsChecking = Boolean.getBoolean("org.eclipse.jetty.io.AbstractBuffer.boundsChecking");
+
protected final static String
__IMMUTABLE = "IMMUTABLE",
__READONLY = "READONLY",
@@ -494,37 +496,43 @@ public abstract class AbstractBuffer implements Buffer
public void setGetIndex(int getIndex)
{
- /* bounds checking
- if (isImmutable())
- throw new IllegalStateException(__IMMUTABLE);
- if (getIndex < 0)
- throw new IllegalArgumentException("getIndex<0: " + getIndex + "<0");
- if (getIndex > putIndex())
- throw new IllegalArgumentException("getIndex>putIndex: " + getIndex + ">" + putIndex());
- */
+ /* bounds checking */
+ if (__boundsChecking)
+ {
+ if (isImmutable())
+ throw new IllegalStateException(__IMMUTABLE);
+ if (getIndex < 0)
+ throw new IllegalArgumentException("getIndex<0: " + getIndex + "<0");
+ if (getIndex > putIndex())
+ throw new IllegalArgumentException("getIndex>putIndex: " + getIndex + ">" + putIndex());
+ }
+
_get = getIndex;
_hash=0;
}
public void setMarkIndex(int index)
{
- /*
+
if (index>=0 && isImmutable())
throw new IllegalStateException(__IMMUTABLE);
- */
+
_mark = index;
}
public void setPutIndex(int putIndex)
{
- /* bounds checking
- if (isImmutable())
- throw new IllegalStateException(__IMMUTABLE);
- if (putIndex > capacity())
+ if (__boundsChecking)
+ {
+ /* bounds checking */
+ if (isImmutable())
+ throw new IllegalStateException(__IMMUTABLE);
+ if (putIndex > capacity())
throw new IllegalArgumentException("putIndex>capacity: " + putIndex + ">" + capacity());
- if (getIndex() > putIndex)
+ if (getIndex() > putIndex)
throw new IllegalArgumentException("getIndex>putIndex: " + getIndex() + ">" + putIndex);
- */
+ }
+
_put = putIndex;
_hash=0;
}
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
index 6dea1974bd..c868b31165 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
@@ -370,7 +370,8 @@ public class ByteArrayBuffer extends AbstractBuffer
throws IOException
{
out.write(_bytes,getIndex(),length());
- clear();
+ if (!isImmutable())
+ clear();
}
/* ------------------------------------------------------------ */
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
index 1c89fb0059..faf95c079e 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
@@ -211,7 +211,8 @@ public class ByteArrayEndPoint implements ConnectedEndPoint
}
}
int len = _out.put(buffer);
- buffer.skip(len);
+ if (!buffer.isImmutable())
+ buffer.skip(len);
return len;
}
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
index 24e1b9e0ab..f5330a7b70 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
@@ -121,7 +121,8 @@ public class StreamEndPoint implements EndPoint
int length=buffer.length();
if (length>0)
buffer.writeTo(_out);
- buffer.clear();
+ if (!buffer.isImmutable())
+ buffer.clear();
return length;
}
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
index 89d41cca85..0c4f50b5d7 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
@@ -307,12 +307,6 @@ public class ChannelEndPoint implements EndPoint
}
finally
{
- // adjust buffer 0 and 1
- if (!header.isImmutable())
- header.setGetIndex(bbuf0.position());
- if (!buffer.isImmutable())
- buffer.setGetIndex(bbuf1.position());
-
bbuf0.position(0);
bbuf1.position(0);
bbuf0.limit(bbuf0.capacity());
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
index 9dec71a569..62596bb216 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
@@ -37,8 +37,10 @@ public class IndirectNIOBuffer extends ByteArrayBuffer implements NIOBuffer
if (buffer.isDirect())
throw new IllegalArgumentException();
_buf = buffer;
- setGetIndex(buffer.position());
- setPutIndex(buffer.limit());
+ _get=buffer.position();
+ _put=buffer.limit();
+ buffer.position(0);
+ buffer.limit(buffer.capacity());
_bytes=_buf.array();
}
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index f665f44757..d61a1ea883 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jaspi</artifactId>
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index 00cd624b18..ab88fd1255 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jmx</artifactId>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 67c7d8d52c..9f6832e22a 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jndi</artifactId>
diff --git a/jetty-jsp-2.1/pom.xml b/jetty-jsp-2.1/pom.xml
index 07d53e5507..ac6a431af6 100644
--- a/jetty-jsp-2.1/pom.xml
+++ b/jetty-jsp-2.1/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jsp-2.1</artifactId>
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 1bd79955e5..9dcaed87ff 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
index 1a446b9517..1e8ee1a5c9 100644
--- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index 9e013cb01d..306b46264c 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 3aaa45bdfa..7af6955f2b 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index 722d8029a9..d2d0fc4cb5 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index 125f2ce49b..f801cbfd59 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.jetty.osgi</groupId>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index b0a0498d68..3c82c5511c 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index baa095949e..9e0534bb15 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-plus</artifactId>
diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml
index 71b8ce9b1b..1f8a10b0b2 100644
--- a/jetty-policy/pom.xml
+++ b/jetty-policy/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-policy</artifactId>
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index 799645776c..227ceb71c3 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-rewrite</artifactId>
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index fabf18486a..7cc4ac77cc 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-security</artifactId>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 5c02d8f5a8..42e73d39f3 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-server</artifactId>
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
index c238d8bc87..9fa55bac58 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -1364,6 +1364,8 @@ public class ContextHandler extends ScopedHandler implements Attributes, Server.
{
if (resource.exists())
Log.warn("Aliased resource: "+resource+"~="+resource.getAlias());
+ else if (path.endsWith("/") && resource.getAlias().toString().endsWith(path))
+ return resource;
else if (Log.isDebugEnabled())
Log.debug("Aliased resource: "+resource+"~="+resource.getAlias());
return null;
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 5bfb4f23a4..645754b063 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlet</artifactId>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 11f3a33943..39d6f6fa2c 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlets</artifactId>
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index 0a381416a4..e9c5158539 100644
--- a/jetty-start/pom.xml
+++ b/jetty-start/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-start</artifactId>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 77d2562557..3a936f8e8b 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-util</artifactId>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 0685a4e1e7..4c90b7cd79 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-webapp</artifactId>
diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
index 4fe342a346..cff429e116 100644
--- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
+++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
@@ -14,6 +14,8 @@ package org.eclipse.jetty.webapp;
import java.util.Arrays;
+import javax.servlet.ServletContext;
+
import org.eclipse.jetty.server.Server;
import org.junit.Test;
@@ -76,4 +78,22 @@ public class WebAppContextTest
wac.setServer(server);
assertTrue(Arrays.equals(configs,wac.getConfigurations()));
}
+
+ @Test
+ public void testRealPathDoesNotExist() throws Exception
+ {
+ Server server = new Server(0);
+ WebAppContext context = new WebAppContext(".", "/");
+ server.setHandler(context);
+ server.start();
+
+ // When
+ ServletContext ctx = context.getServletContext();
+
+ // Then
+ // This passes:
+ assertNotNull(ctx.getRealPath("/doesnotexist"));
+ // This fails:
+ assertNotNull(ctx.getRealPath("/doesnotexist/"));
+ }
}
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 92e3fbed79..452a4e377e 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD06Test.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD06Test.java
index e485920f69..1f1d66bbfe 100644
--- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD06Test.java
+++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD06Test.java
@@ -101,7 +101,7 @@ public class WebSocketParserD06Test
_in.put((byte)0x84);
_in.put((byte)11);
_in.put("Hello World".getBytes(StringUtil.__UTF8));
- System.err.println("tosend="+TypeUtil.toHexString(_in.asArray()));
+ // System.err.println("tosend="+TypeUtil.toHexString(_in.asArray()));
int filled =_parser.parseNext();
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 8838ab437a..62ae635df2 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-xml</artifactId>
diff --git a/pom.xml b/pom.xml
index 1d1aa9e23d..73c6bc54d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
</parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
<name>Jetty :: Project</name>
<url>${jetty.url}</url>
<packaging>pom</packaging>
@@ -24,9 +24,9 @@
<build-support-version>1.0</build-support-version>
</properties>
<scm>
- <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</connection>
- <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</developerConnection>
- <url>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</url>
+ <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.3.1.v20110307</connection>
+ <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.3.1.v20110307</developerConnection>
+ <url>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7.3.1.v20110307</url>
</scm>
<build>
<defaultGoal>install</defaultGoal>
diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml
index fa6578d6d4..5ec34e014e 100644
--- a/test-continuation-jetty6/pom.xml
+++ b/test-continuation-jetty6/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-continuation-jetty6</artifactId>
diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml
index d42d778384..7bfc194c93 100644
--- a/test-continuation/pom.xml
+++ b/test-continuation/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-continuation</artifactId>
diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml
index 0241fd404e..39a6f5da5f 100644
--- a/test-jetty-servlet/pom.xml
+++ b/test-jetty-servlet/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-jetty-servlet</artifactId>
diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml
index 9a73179eb2..a34c8029d7 100644
--- a/test-jetty-webapp/pom.xml
+++ b/test-jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/tests/pom.xml b/tests/pom.xml
index b3941395e8..6cb8e16f8d 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index 65f2f98092..536d4c03e9 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration</artifactId>
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index 50b84213d7..01b840d893 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<artifactId>test-loginservice</artifactId>
<name>Jetty Tests :: Login Service</name>
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index 8563b9cb6b..6ad7153b3d 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<artifactId>test-sessions-parent</artifactId>
<name>Jetty Tests :: Sessions :: Parent</name>
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index d77c761bde..6fda7d1e64 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-sessions-parent</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<artifactId>test-hash-sessions</artifactId>
<name>Jetty Tests :: Sessions :: Hash</name>
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index 6702e6a635..0cc675d78e 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-sessions-parent</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<artifactId>test-jdbc-sessions</artifactId>
<name>Jetty Tests :: Sessions :: JDBC</name>
diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml
index d69eac6b78..5340031cf0 100644
--- a/tests/test-sessions/test-sessions-common/pom.xml
+++ b/tests/test-sessions/test-sessions-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-sessions-parent</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<artifactId>test-sessions-common</artifactId>
<name>Jetty Tests :: Sessions :: Common</name>
diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml
index 707b4367eb..e0a620ee41 100644
--- a/tests/test-webapps/pom.xml
+++ b/tests/test-webapps/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<artifactId>test-webapps-parent</artifactId>
<name>Jetty Tests :: WebApps :: Parent</name>
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index 947523f145..3cbf306429 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-webapps-parent</artifactId>
- <version>7.3.2-SNAPSHOT</version>
+ <version>7.3.1.v20110307</version>
</parent>
<artifactId>test-webapp-rfc2616</artifactId>
<name>Jetty Tests :: WebApp :: RFC2616</name>

Back to the top