Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2009-04-23 22:04:51 +0000
committerGreg Wilkins2009-04-23 22:04:51 +0000
commit429fef0dc46853b8726f83e7587da27e9a83e3fa (patch)
tree68044fec2369ab7aecb2ecc1a7143dd83d7dd17b
parente2109e9ab8843e5d65a758648cb2b3b0d1ea098f (diff)
downloadorg.eclipse.jetty.project-429fef0dc46853b8726f83e7587da27e9a83e3fa.tar.gz
org.eclipse.jetty.project-429fef0dc46853b8726f83e7587da27e9a83e3fa.tar.xz
org.eclipse.jetty.project-429fef0dc46853b8726f83e7587da27e9a83e3fa.zip
added snapshot to version after last release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@190 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--jetty-ajp/pom.xml2
-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.xml2
-rw-r--r--jetty-distribution/pom.xml2
-rw-r--r--jetty-embedded-examples/pom.xml2
-rw-r--r--jetty-http/pom.xml2
-rw-r--r--jetty-io/pom.xml2
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java3
-rw-r--r--jetty-jmx/pom.xml2
-rw-r--r--jetty-jndi/pom.xml2
-rw-r--r--jetty-plus/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-servlet-tester/pom.xml2
-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-start/src/main/java/org/eclipse/jetty/start/Main.java10
-rw-r--r--jetty-test-webapp/pom.xml2
-rw-r--r--jetty-util/pom.xml2
-rw-r--r--jetty-webapp/pom.xml2
-rw-r--r--jetty-xml/pom.xml2
-rw-r--r--pom.xml2
26 files changed, 31 insertions, 30 deletions
diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml
index a781535827..e538ab5c98 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ajp</artifactId>
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 4166305d26..89cfc297e0 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-annotations</artifactId>
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index 449c9915e0..922a73d36a 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-client</artifactId>
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index cce8dc31c8..2dd49973ed 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-continuation</artifactId>
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index 34f45d1583..f443d0ffc7 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-deploy</artifactId>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index a5a13f10c2..d17b89a2af 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<artifactId>jetty-distribution</artifactId>
<name>Jetty :: Distribution Assemblies</name>
diff --git a/jetty-embedded-examples/pom.xml b/jetty-embedded-examples/pom.xml
index 0e87240269..8cafaefaf6 100644
--- a/jetty-embedded-examples/pom.xml
+++ b/jetty-embedded-examples/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-embedded-examples</artifactId>
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index c76d122093..32e99172af 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index a5e7994d89..2babfd490e 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
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 f53f78db1e..324384384e 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
@@ -129,9 +129,6 @@ public class StreamEndPoint implements EndPoint
{
int len=0;
- // TODO consider copying buffer and trailer into header if there is space.
-
-
if (header!=null)
{
int tw=header.length();
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index 61d907994e..c39fcf1615 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jmx</artifactId>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index ce82dfdf93..d3738a2b88 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jndi</artifactId>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 21a85ba1ee..d5d6360d61 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-plus</artifactId>
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index aee9b8e167..60206621c5 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-rewrite</artifactId>
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index 563d226b7a..4a707114df 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-security</artifactId>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 044b5ae9af..15703c3d93 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-server</artifactId>
diff --git a/jetty-servlet-tester/pom.xml b/jetty-servlet-tester/pom.xml
index e5c2bfa03f..92ad187722 100644
--- a/jetty-servlet-tester/pom.xml
+++ b/jetty-servlet-tester/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlet-tester</artifactId>
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index fb4334c2bd..f1d57a9005 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlet</artifactId>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 1df58edc22..5041baecf5 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlets</artifactId>
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index 95714b5f31..1a9c41a0a8 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-start</artifactId>
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index bee612f9ca..a6db54a417 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -567,9 +567,13 @@ public class Main
if (cpcfg==null)
cpcfg=new FileInputStream(_config);
configure(cpcfg,args.length);
- File file=new File(System.getProperty("jetty.home"));
- String canonical=file.getCanonicalPath();
- System.setProperty("jetty.home",canonical);
+ String jetty_home=System.getProperty("jetty.home");
+ if (jetty_home!=null)
+ {
+ File file=new File(jetty_home);
+ String canonical=file.getCanonicalPath();
+ System.setProperty("jetty.home",canonical);
+ }
}
catch (Exception e)
{
diff --git a/jetty-test-webapp/pom.xml b/jetty-test-webapp/pom.xml
index f183c0431a..dfdc32b0b1 100644
--- a/jetty-test-webapp/pom.xml
+++ b/jetty-test-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 262d64827a..fc1db72ff2 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-util</artifactId>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index fa71c098a6..bd15dc7a84 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-webapp</artifactId>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 6e4dea1bbb..6d052f6e37 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.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-xml</artifactId>
diff --git a/pom.xml b/pom.xml
index 9d3eea0a3c..52f402a997 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.M2</version>
+ <version>7.0.0.M2-SNAPSHOT</version>
<name>Jetty :: Project</name>
<url>${jetty.url}</url>
<packaging>pom</packaging>

Back to the top