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

Merge remote-tracking branch 'origin/jetty-9.2.x' 

Conflicts:
	VERSION.txt
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java
	jetty-spdy/pom.xml
	jetty-spdy/spdy-alpn-tests/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-npn-tests/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-integration/pom.xml
	tests/test-jmx/jmx-webapp-it/pom.xml
	tests/test-jmx/jmx-webapp/pom.xml
	tests/test-jmx/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
This commit is contained in:
Greg Wilkins 2015-02-19 14:05:00 +11:00
parent 363d04174d 1b62a30abb
commit c22d79f673
7 changed files with 96 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
VERSION.txt
View File

@ -1,5 +1,31 @@
jetty-9.3.0-SNAPSHOT jetty-9.3.0-SNAPSHOT
jetty-9.2.8.v20150217 - 17 February 2015
+ 451092 Connector will fail if HeaderListener return false.
+ 455436 ProxyServlet sends two User-Agent values.
+ 457893 Close temp jar resource
+ 458101 added test for maxFormContentSize
+ 458174 Example Jar Server
+ 458175 multipart annotation on lazily loaded servlet does not work
+ 458209 Length check for HttpMethod MOVE lookahead
+ 458354 ALPNServerConnection.select negotiation.
+ 458495 CompletableCallback may not notify failures.
+ 458527 Implement an async proxy servlet that can perform content
transformations.
+ 458568 JDBCLoginService javadoc incorrectly references HashLoginService
+ 458849 org.eclipse.jetty.util.Uptime.DefaultImpl() not available on GAE
+ 459006 master branch does not build on norwegian locale
+ 459125 GzipHandler default mimeType behavior incorrect
+ 459352 AsyncMiddleManServlet should set "Host:" header correctly in proxy to
remote request headers.
+ 459490 Defining a duplicate error page in webdefault.xml and web.xml results
in an error
+ 459542 AsyncMiddleManServlet race condition on first download content.
+ 459560 jetty.sh handles start.d and no start.ini
+ 459769 AsyncMiddleManServlet race condition on last download content.
+ 459845 Support upgrade
+ 459963 Failure writing content of a committed request leaks connections.
jetty-9.2.7.v20150116 - 16 January 2015 jetty-9.2.7.v20150116 - 16 January 2015
+ 420944 Hot Deployment of WAR when Context XML exists doesn't trigger + 420944 Hot Deployment of WAR when Context XML exists doesn't trigger
redeploy redeploy

14
jetty-fcgi/fcgi-server/pom.xml
View File

@ -1,11 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> </parent>
||||||| merged common ancestors
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.eclipse.jetty.fcgi</groupId> <groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-parent</artifactId> <artifactId>fcgi-parent</artifactId>
<version>9.3.0-SNAPSHOT</version> <version>9.2.8-SNAPSHOT</version>
</parent> </parent>
=======
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-parent</artifactId>
<version>9.2.9-SNAPSHOT</version>
</parent>
>>>>>>> origin/jetty-9.2.x
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>fcgi-server</artifactId> <artifactId>fcgi-server</artifactId>

25
jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java
View File

@ -31,7 +31,6 @@ import org.junit.Test;
public class PathMapTest public class PathMapTest
{ {
@Test @Test
@Ignore
public void testPathMap() throws Exception public void testPathMap() throws Exception
{ {
PathMap<String> p = new PathMap<>(); PathMap<String> p = new PathMap<>();
@ -167,6 +166,30 @@ public class PathMapTest
assertNotMatch(spec, "/xyz?123"); // as if the ? was encoded and part of the path assertNotMatch(spec, "/xyz?123"); // as if the ? was encoded and part of the path
} }
@Test
public void testPrecidenceVsOrdering() throws Exception
{
PathMap<String> p = new PathMap<>();
p.put("/dump/gzip/*","prefix");
p.put("*.txt","suffix");
assertEquals(null,p.getMatch("/foo/bar"));
assertEquals("prefix",p.getMatch("/dump/gzip/something").getValue());
assertEquals("suffix",p.getMatch("/foo/something.txt").getValue());
assertEquals("prefix",p.getMatch("/dump/gzip/something.txt").getValue());
p = new PathMap<>();
p.put("*.txt","suffix");
p.put("/dump/gzip/*","prefix");
assertEquals(null,p.getMatch("/foo/bar"));
assertEquals("prefix",p.getMatch("/dump/gzip/something").getValue());
assertEquals("suffix",p.getMatch("/foo/something.txt").getValue());
assertEquals("prefix",p.getMatch("/dump/gzip/something.txt").getValue());
}
private void assertMatch(String spec, String path) private void assertMatch(String spec, String path)
{ {
boolean match = PathMap.match(spec, path); boolean match = PathMap.match(spec, path);

4
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
View File

@ -71,9 +71,9 @@ import org.eclipse.jetty.util.log.Logger;
@ManagedObject("Servlet Holder") @ManagedObject("Servlet Holder")
public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope, Comparable<ServletHolder> public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope, Comparable<ServletHolder>
{ {
private static final Logger LOG = Log.getLogger(ServletHolder.class);
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
private static final Logger LOG = Log.getLogger(ServletHolder.class);
private int _initOrder = -1; private int _initOrder = -1;
private boolean _initOnStartup=false; private boolean _initOnStartup=false;
private Map<String, String> _roleMap; private Map<String, String> _roleMap;
@ -298,7 +298,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Checking for precompiled servlet {} for jsp {}", precompiled, _forcedPath); LOG.debug("Checking for precompiled servlet {} for jsp {}", precompiled, _forcedPath);
ServletHolder jsp=getServletHandler().getServlet(precompiled); ServletHolder jsp=getServletHandler().getServlet(precompiled);
if (jsp!=null) if (jsp!=null && jsp.getClassName() != null)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName());

58
tests/test-jmx/jmx-webapp-it/pom.xml
View File

@ -16,8 +16,7 @@
// You may elect to redistribute this code under either of these licenses. // You may elect to redistribute this code under either of these licenses.
// ======================================================================== // ========================================================================
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.eclipse.jetty.tests</groupId> <groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-jmx-parent</artifactId> <artifactId>test-jmx-parent</artifactId>
@ -123,32 +122,27 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<property name="jetty.jmx.home" location="${test-home-dir}/jetty-distribution-${project.version}"/> <property name="jetty.jmx.home" location="${test-home-dir}/jetty-distribution-${project.version}" />
<property name="jetty.jmx.base" location="${test-base-dir}"/> <property name="jetty.jmx.base" location="${test-base-dir}" />
<echo>Integration Test : Setup Jetty</echo> <echo>Integration Test : Setup Jetty</echo>
<exec executable="${run.command}" <exec executable="${run.command}" dir="${scripts-dir}" spawn="false">
dir="${scripts-dir}" <arg value="${run.command.xtra}" />
spawn="false"> <arg value="${setup.script}" />
<arg value="${run.command.xtra}"/> <arg file="${java.home}" />
<arg value="${setup.script}"/> <arg file="${jetty.jmx.home}" />
<arg file="${java.home}"/> <arg file="${jetty.jmx.base}" />
<arg file="${jetty.jmx.home}"/>
<arg file="${jetty.jmx.base}"/>
</exec> </exec>
<echo>Integration Test : Starting Jetty ...</echo> <echo>Integration Test : Starting Jetty ...</echo>
<exec executable="${run.command}" <exec executable="${run.command}" dir="${scripts-dir}" spawn="true">
dir="${scripts-dir}" <arg value="${run.command.xtra}" />
spawn="true"> <arg value="${start.script}" />
<arg value="${run.command.xtra}"/> <arg file="${java.home}" />
<arg value="${start.script}"/> <arg file="${jetty.jmx.home}" />
<arg file="${java.home}"/> <arg file="${jetty.jmx.base}" />
<arg file="${jetty.jmx.home}"/>
<arg file="${jetty.jmx.base}"/>
</exec> </exec>
<waitfor maxwait="5" maxwaitunit="second" <waitfor maxwait="5" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
checkevery="500" checkeveryunit="millisecond"> <http url="http://localhost:58080/jmx-webapp/" />
<http url="http://localhost:58080/jmx-webapp/"/>
</waitfor> </waitfor>
<echo>Integration Test : Jetty is now available</echo> <echo>Integration Test : Jetty is now available</echo>
</target> </target>
@ -162,17 +156,15 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<property name="jetty.jmx.home" location="${test-home-dir}/jetty-distribution-${project.version}"/> <property name="jetty.jmx.home" location="${test-home-dir}/jetty-distribution-${project.version}" />
<property name="jetty.jmx.base" location="${test-base-dir}"/> <property name="jetty.jmx.base" location="${test-base-dir}" />
<echo>Integration Test : Stop Jetty</echo> <echo>Integration Test : Stop Jetty</echo>
<exec executable="${run.command}" <exec executable="${run.command}" dir="${scripts-dir}" spawn="false">
dir="${scripts-dir}" <arg value="${run.command.xtra}" />
spawn="false"> <arg value="${stop.script}" />
<arg value="${run.command.xtra}"/> <arg file="${java.home}" />
<arg value="${stop.script}"/> <arg file="${jetty.jmx.home}" />
<arg file="${java.home}"/> <arg file="${jetty.jmx.base}" />
<arg file="${jetty.jmx.home}"/>
<arg file="${jetty.jmx.base}"/>
</exec> </exec>
</target> </target>
</configuration> </configuration>

4
tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html
View File

@ -17,10 +17,10 @@
<p>To enable JAAS in a base jetty instance do: <p>To enable JAAS in a base jetty instance do:
<pre> <pre>
$ cd $JETTY_BASE $ cd $JETTY_BASE
$ java -jar $JETTY_HOME/start.jar --module-startd-ini=jaas $ java -jar $JETTY_HOME/start.jar --add-to-startd=jaas
</pre> </pre>
</p> </p>
<p>This will create a $JETTY_BASE/start.d/jaas.ini file to enable and parameterise JAAS. If the --module-start-ini option instead, then the same initialisation will be appended to the <p>This will create a $JETTY_BASE/start.d/jaas.ini file to enable and parameterise JAAS. If the --add-to-start option instead, then the same initialisation will be appended to the
$JETTY_BASE/start.ini file instead. The jetty demo-base already has JAAS enabled in the start.ini file. </p> $JETTY_BASE/start.ini file instead. The jetty demo-base already has JAAS enabled in the start.ini file. </p>
<p>The full source of this demonstration is available <a <p>The full source of this demonstration is available <a

4
tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html
View File

@ -22,10 +22,10 @@ This example shows how to configure and lookup resources such as DataSources, a
<p>To enable JNDI in a base jetty instance do: <p>To enable JNDI in a base jetty instance do:
<pre> <pre>
$ cd $JETTY_BASE $ cd $JETTY_BASE
$ java -jar $JETTY_HOME/start.jar --module-startd-ini=jndi $ java -jar $JETTY_HOME/start.jar --add-to-startd=jndi
</pre> </pre>
</p> </p>
<p>This will create a $JETTY_BASE/start.d/jndi.ini file to enable and parameterise JNDI. If the --module-start-ini option instead, then the same initialisation will be appended to the <p>This will create a $JETTY_BASE/start.d/jndi.ini file to enable and parameterise JNDI. If the --add-to-start option instead, then the same initialisation will be appended to the
$JETTY_BASE/start.ini file instead. The jetty demo-base already has JNDI enabled in the start.ini file and some mock resources included. </p> $JETTY_BASE/start.ini file instead. The jetty demo-base already has JNDI enabled in the start.ini file and some mock resources included. </p>
<p>The full source of this demonstration is available <a href="http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/tests/test-webapps/test-jndi-webapp">here</a>.</p> <p>The full source of this demonstration is available <a href="http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/tests/test-webapps/test-jndi-webapp">here</a>.</p>