Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Jan Bartel 2012-03-07 12:15:33 +11:00
parent 3e13a26ccd 5416b93c7e
commit 9f3834038c
70 changed files with 118 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example-jetty-embedded/pom.xml
View File

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

2
jetty-aggregate/jetty-all-server/pom.xml
View File

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

2
jetty-aggregate/jetty-all/pom.xml
View File

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

2
jetty-aggregate/jetty-client/pom.xml
View File

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

2
jetty-aggregate/jetty-plus/pom.xml
View File

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

2
jetty-aggregate/jetty-server/pom.xml
View File

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

2
jetty-aggregate/jetty-servlet/pom.xml
View File

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

2
jetty-aggregate/jetty-webapp/pom.xml
View File

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

2
jetty-aggregate/jetty-websocket/pom.xml
View File

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

2
jetty-aggregate/pom.xml
View File

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

2
jetty-ajp/pom.xml
View File

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

2
jetty-annotations/pom.xml
View File

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

2
jetty-client/pom.xml
View File

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

2
jetty-continuation/pom.xml
View File

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

2
jetty-deploy/pom.xml
View File

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

2
jetty-distribution/pom.xml
View File

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

2
jetty-http-spi/pom.xml
View File

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

2
jetty-http/pom.xml
View File

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

2
jetty-io/pom.xml
View File

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

2
jetty-jaspi/pom.xml
View File

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

2
jetty-jmx/pom.xml
View File

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

2
jetty-jndi/pom.xml
View File

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

2
jetty-jsp/pom.xml
View File

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

2
jetty-monitor/pom.xml
View File

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

2
jetty-nested/pom.xml
View File

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

2
jetty-nosql/pom.xml
View File

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

2
jetty-npn/pom.xml
View File

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

2
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View File

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

2
jetty-osgi/jetty-osgi-boot-logback/pom.xml
View File

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

2
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
View File

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

2
jetty-osgi/jetty-osgi-boot/pom.xml
View File

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

2
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
View File

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

2
jetty-osgi/jetty-osgi-httpservice/pom.xml
View File

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

2
jetty-osgi/pom.xml
View File

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

2
jetty-osgi/test-jetty-osgi/pom.xml
View File

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

2
jetty-overlay-deployer/pom.xml
View File

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

2
jetty-plus/pom.xml
View File

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

2
jetty-policy/pom.xml
View File

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

2
jetty-rewrite/pom.xml
View File

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

2
jetty-security/pom.xml
View File

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

2
jetty-server/pom.xml
View File

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

2
jetty-servlet/pom.xml
View File

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

2
jetty-servlets/pom.xml
View File

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

4
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
View File

@ -597,12 +597,14 @@ public class ProxyServlet implements Servlet
{ {
exchange.addRequestHeader("X-Forwarded-For",request.getRemoteAddr()); exchange.addRequestHeader("X-Forwarded-For",request.getRemoteAddr());
exchange.addRequestHeader("X-Forwarded-Proto",request.getScheme()); exchange.addRequestHeader("X-Forwarded-Proto",request.getScheme());
exchange.addRequestHeader("X-Forwarded-Host",request.getServerName()); exchange.addRequestHeader("X-Forwarded-Host",request.getHeader("Host"));
exchange.addRequestHeader("X-Forwarded-Server",request.getLocalName()); exchange.addRequestHeader("X-Forwarded-Server",request.getLocalName());
} }
if (hasContent) if (hasContent)
{
exchange.setRequestContentSource(in); exchange.setRequestContentSource(in);
}
customizeExchange(exchange, request); customizeExchange(exchange, request);

65
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
View File

@ -4,6 +4,7 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -12,7 +13,6 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import junit.framework.Assert; import junit.framework.Assert;
import org.eclipse.jetty.client.ContentExchange; import org.eclipse.jetty.client.ContentExchange;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
@ -30,21 +30,24 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*;
import static org.hamcrest.Matchers.*;
public class ProxyServletTest public class ProxyServletTest
{ {
private Server server; private Server _server;
private Connector connector; private Connector _connector;
private HttpClient client; private HttpClient _client;
public void init(HttpServlet servlet) throws Exception public void init(HttpServlet servlet) throws Exception
{ {
server = new Server(); _server = new Server();
connector = new SelectChannelConnector(); _connector = new SelectChannelConnector();
server.addConnector(connector); _server.addConnector(_connector);
HandlerCollection handlers = new HandlerCollection(); HandlerCollection handlers = new HandlerCollection();
server.setHandler(handlers); _server.setHandler(handlers);
ServletContextHandler proxyCtx = new ServletContextHandler(handlers, "/proxy", ServletContextHandler.NO_SESSIONS); ServletContextHandler proxyCtx = new ServletContextHandler(handlers, "/proxy", ServletContextHandler.NO_SESSIONS);
ServletHolder proxyServletHolder = new ServletHolder(new ProxyServlet() ServletHolder proxyServletHolder = new ServletHolder(new ProxyServlet()
@ -66,25 +69,49 @@ public class ProxyServletTest
handlers.addHandler(proxyCtx); handlers.addHandler(proxyCtx);
handlers.addHandler(appCtx); handlers.addHandler(appCtx);
server.start(); _server.start();
client = new HttpClient(); _client = new HttpClient();
client.start(); _client.start();
} }
@After @After
public void destroy() throws Exception public void destroy() throws Exception
{ {
if (client != null) if (_client != null)
client.stop(); _client.stop();
if (server != null) if (_server != null)
{ {
server.stop(); _server.stop();
server.join(); _server.join();
} }
} }
@Test
public void testXForwardedHostHeader() throws Exception
{
init(new HttpServlet()
{
private static final long serialVersionUID = 1L;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
PrintWriter writer = resp.getWriter();
writer.write(req.getHeader("X-Forwarded-Host"));
writer.flush();
}
});
String url = "http://localhost:" + _connector.getLocalPort() + "/proxy/test";
ContentExchange exchange = new ContentExchange();
exchange.setURL(url);
_client.send(exchange);
exchange.waitForDone();
assertThat("Response expected to contain content of X-Forwarded-Host Header from the request",exchange.getResponseContent(),equalTo("localhost:"
+ _connector.getLocalPort()));
}
@Test @Test
public void testBigDownloadWithSlowReader() throws Exception public void testBigDownloadWithSlowReader() throws Exception
@ -101,6 +128,8 @@ public class ProxyServletTest
init(new HttpServlet() init(new HttpServlet()
{ {
private static final long serialVersionUID = 1L;
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{ {
@ -114,7 +143,7 @@ public class ProxyServletTest
} }
}); });
String url = "http://localhost:" + connector.getLocalPort() + "/proxy" + "/test"; String url = "http://localhost:" + _connector.getLocalPort() + "/proxy/test";
ContentExchange exchange = new ContentExchange(true) ContentExchange exchange = new ContentExchange(true)
{ {
@Override @Override
@ -134,7 +163,7 @@ public class ProxyServletTest
}; };
exchange.setURL(url); exchange.setURL(url);
long start = System.nanoTime(); long start = System.nanoTime();
client.send(exchange); _client.send(exchange);
Assert.assertEquals(HttpExchange.STATUS_COMPLETED, exchange.waitForDone()); Assert.assertEquals(HttpExchange.STATUS_COMPLETED, exchange.waitForDone());
long elapsed = System.nanoTime() - start; long elapsed = System.nanoTime() - start;
Assert.assertEquals(HttpStatus.OK_200, exchange.getResponseStatus()); Assert.assertEquals(HttpStatus.OK_200, exchange.getResponseStatus());

2
jetty-spdy/pom.xml
View File

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

2
jetty-spdy/spdy-core/pom.xml
View File

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

2
jetty-spdy/spdy-jetty-http-webapp/pom.xml
View File

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

2
jetty-spdy/spdy-jetty-http/pom.xml
View File

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

2
jetty-spdy/spdy-jetty/pom.xml
View File

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

2
jetty-start/pom.xml
View File

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

2
jetty-util/pom.xml
View File

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

2
jetty-webapp/pom.xml
View File

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

2
jetty-websocket/pom.xml
View File

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

2
jetty-xml/pom.xml
View File

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

2
pom.xml
View File

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

2
test-continuation/pom.xml
View File

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

2
test-jetty-nested/pom.xml
View File

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

2
test-jetty-servlet/pom.xml
View File

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

2
test-jetty-webapp/pom.xml
View File

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

2
tests/pom.xml
View File

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

2
tests/test-integration/pom.xml
View File

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

2
tests/test-loginservice/pom.xml
View File

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

2
tests/test-sessions/pom.xml
View File

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

2
tests/test-sessions/test-hash-sessions/pom.xml
View File

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

2
tests/test-sessions/test-jdbc-sessions/pom.xml
View File

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

2
tests/test-sessions/test-mongodb-sessions/pom.xml
View File

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

2
tests/test-sessions/test-sessions-common/pom.xml
View File

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

2
tests/test-webapps/pom.xml
View File

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

2
tests/test-webapps/test-webapp-rfc2616/pom.xml
View File

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