diff --git a/VERSION.txt b/VERSION.txt index 9c5c7af2cb5..5ddc36b5a0a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,34 +1,4 @@ -jetty-8.1.5-SNAPSHOT - -jetty-8.1.4.v20120522 - 22 May 2012 - + 367608 ignore the aysncrequestreadtest as it is known to fail and is waiting - for a fix - + 371853 Support bundleentry: protocol for webapp embedded as directory in - osgi bundle - + 373620 Add ch.qos.logback.access.jetty to the Import-Package for - jetty-osgi-boot-logback bundle - + 376152 apply context resources recursively - + 376801 Make JAAS login modules useable without jetty infrastructure - + 377323 Request#getParts() throws ServletException when it should be throwing - IllegalStateException - + 377391 Manifest updates to jetty-osgi-boot-logback - + 377492 NPE if jsp taglibs bundle not deployed - + 377550 set charset when content type is set - + 377587 ConnectHandler write will block on partial write - + 377610 New session not timed out if an old session is invalidated in scope - of same request - + 377709 Support for RequestParameterCallback missing - + 378242 Re-extract war on restart if incomplete extraction - + 378273 Remove default Bundle-Localization header - + 378487 Null out contextPath on Request.recycle - + 379015 Use factored jetty xml config files for defaults - + 379089 DefaultServlet ignores its resourceBase and uses context's - ResourceCollection when listing diretories - + 379194 ProxyServlet enhancement to enable easy creation of alternative - HttpClient implementations - + 380034 last modified times taken from JarEntry for JarFile resources - + 380212 Clear buffer if parsing fails due to full buffer - + 380222 JettyPolicyRuntimeTest failure +jetty-8.1.4-SNAPSHOT jetty-8.1.3.v20120416 - 16 April 2012 + 349110 MultiPartFilter records the content-type in request params diff --git a/example-async-rest/async-rest-jar/pom.xml b/example-async-rest/async-rest-jar/pom.xml index a44ec061523..b5affdf0349 100644 --- a/example-async-rest/async-rest-jar/pom.xml +++ b/example-async-rest/async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty example-async-rest - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 org.eclipse.jetty.example-async-rest diff --git a/example-async-rest/async-rest-webapp/pom.xml b/example-async-rest/async-rest-webapp/pom.xml index b8207754d44..ec5633d683c 100644 --- a/example-async-rest/async-rest-webapp/pom.xml +++ b/example-async-rest/async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty example-async-rest - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 org.eclipse.jetty.example-async-rest diff --git a/example-async-rest/pom.xml b/example-async-rest/pom.xml index 305b89f74dd..4c27d341de8 100644 --- a/example-async-rest/pom.xml +++ b/example-async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index b3665ad18fd..eaaffc29a05 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 example-jetty-embedded diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index e9768970585..0d53bcd3393 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-all-server diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index 8b39f20266a..3528c429557 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-all diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index 8ae90250d4a..1fe2b7d65ba 100644 --- a/jetty-aggregate/jetty-client/pom.xml +++ b/jetty-aggregate/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-client diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index 2efdf69dc4e..cad6863c224 100644 --- a/jetty-aggregate/jetty-plus/pom.xml +++ b/jetty-aggregate/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index 5fc3cd62d80..42c69317a17 100644 --- a/jetty-aggregate/jetty-server/pom.xml +++ b/jetty-aggregate/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index 45d65b74dd8..68dfe2328ea 100644 --- a/jetty-aggregate/jetty-servlet/pom.xml +++ b/jetty-aggregate/jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index 4e1b6a8bd22..465689a7592 100644 --- a/jetty-aggregate/jetty-webapp/pom.xml +++ b/jetty-aggregate/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml index bb55376a730..10935ce1d11 100644 --- a/jetty-aggregate/jetty-websocket/pom.xml +++ b/jetty-aggregate/jetty-websocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.aggregate jetty-aggregate-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-websocket diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 816962a2389..4ee620f6149 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT org.eclipse.jetty.aggregate jetty-aggregate-project diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index 1731dbfc181..aba12f3ccd0 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-ajp diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index e80b55c4fd4..608dc7ec616 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 3cba6d39cd5..356c24d0111 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index 5becbc82e64..c59259e0109 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 294bc01018b..c1a5009f6fc 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 102a9651a9b..c594a4969c2 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT jetty-distribution Jetty :: Distribution Assemblies diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 75543b10605..ba628650fbc 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 05b24eaef80..183a9bbdf5a 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-http diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index e79f0925f3e..1ad5d2eced5 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java index ca182eadde6..a6f77729c66 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java @@ -283,12 +283,18 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo if (idleTimestamp!=0 && _maxIdleTime>0) { - long idleForMs=now-idleTimestamp; + final long idleForMs=now-idleTimestamp; if (idleForMs>_maxIdleTime) { - onIdleExpired(idleForMs); - _idleTimestamp=now; + _manager.dispatch(new Runnable() + { + public void run() + { + onIdleExpired(idleForMs); + _idleTimestamp=System.currentTimeMillis(); + } + }); } } } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java index 3b781cd3278..47e5f7daf54 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java @@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.BufferedInputStream; @@ -24,6 +25,7 @@ import org.eclipse.jetty.io.AsyncEndPoint; import org.eclipse.jetty.io.ConnectedEndPoint; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.hamcrest.Matchers; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -360,17 +362,17 @@ public class SelectChannelEndPointTest int b=client.getInputStream().read(); assertEquals(-1,b); long idle=System.currentTimeMillis()-start; - assertTrue(idle>400); - assertTrue(idle<2000); + assertThat(idle,Matchers.greaterThan(400L)); + assertThat(idle,Matchers.lessThan(3000L)); - // But endpoint is still open. - assertTrue(_lastEndp.isOpen()); + if (_lastEndp.isOpen()) + { + // half close so wait another idle period + assertTrue(_lastEndp.isOutputShutdown()); + Thread.sleep(2000); + } - - // Wait for another idle callback - Thread.sleep(2000); // endpoint is closed. - assertFalse(_lastEndp.isOpen()); } diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 0a657b926da..309a1e1ef60 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 25ee422dd36..01aa29c4242 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 9e03b1351ba..58a5eeeb7ae 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 23e8c88404b..1a19e832abf 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-jsp diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index 218afd708da..636262911b2 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-monitor diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index 72e5651bf61..f1dded8635b 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT jetty-nested Jetty :: Nested diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index abc0c80b692..c71f7bf8247 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index ddc55dd8633..3c441216088 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 56019f30178..eda381adffd 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 795425f079f..9cf3a18cf12 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 473ebdddd68..4979ea5ef32 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index f88e8fbdbbf..9ce805c2198 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT ../pom.xml org.eclipse.jetty.osgi diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index e49b0a91900..17508f1d69a 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index 1b8bedc98e4..d555c47379b 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-overlay-deployer diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 8309fb69d34..7a252b243d8 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index a2114e40241..64202b89a3d 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT jetty-policy Jetty :: Policy Tool diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index b30676e854a..8454ca235ff 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 78426352e11..4357e0e5e9e 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java index c21768fde17..dcd91498f36 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java @@ -77,6 +77,7 @@ public class FormAuthenticator extends LoginAuthenticator private String _formLoginPage; private String _formLoginPath; private boolean _dispatch; + private boolean _alwaysSaveUri; public FormAuthenticator() { @@ -93,6 +94,26 @@ public class FormAuthenticator extends LoginAuthenticator _dispatch=dispatch; } + /* ------------------------------------------------------------ */ + /** + * If true, uris that cause a redirect to a login page will always + * be remembered. If false, only the first uri that leads to a login + * page redirect is remembered. + * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=379909 + * @param alwaysSave + */ + public void setAlwaysSaveUri (boolean alwaysSave) + { + _alwaysSaveUri = alwaysSave; + } + + + /* ------------------------------------------------------------ */ + public boolean getAlwaysSaveUri () + { + return _alwaysSaveUri; + } + /* ------------------------------------------------------------ */ /** * @see org.eclipse.jetty.security.authentication.LoginAuthenticator#setConfiguration(org.eclipse.jetty.security.Authenticator.AuthConfiguration) @@ -279,9 +300,9 @@ public class FormAuthenticator extends LoginAuthenticator // remember the current URI synchronized (session) { - // But only if it is not set already - if (session.getAttribute(__J_URI)==null) - { + // But only if it is not set already, or we save every uri that leads to a login form redirect + if (session.getAttribute(__J_URI)==null || _alwaysSaveUri) + { StringBuffer buf = request.getRequestURL(); if (request.getQueryString() != null) buf.append("?").append(request.getQueryString()); diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 0900dc2457d..02c14847ba2 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index fb53c35f434..81397fa60d1 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index ae17d18f21c..33567204bc6 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index 7517551c119..e7c2ca6402f 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index d545e51355d..96779ef5a7e 100644 --- a/jetty-spdy/spdy-core/pom.xml +++ b/jetty-spdy/spdy-core/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.spdy spdy-parent - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 diff --git a/jetty-spdy/spdy-jetty-http-webapp/pom.xml b/jetty-spdy/spdy-jetty-http-webapp/pom.xml index 7aa8e915258..0a1845ba65e 100644 --- a/jetty-spdy/spdy-jetty-http-webapp/pom.xml +++ b/jetty-spdy/spdy-jetty-http-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.spdy spdy-parent - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 spdy-jetty-http-webapp diff --git a/jetty-spdy/spdy-jetty-http/pom.xml b/jetty-spdy/spdy-jetty-http/pom.xml index e89e2098436..033849b9073 100644 --- a/jetty-spdy/spdy-jetty-http/pom.xml +++ b/jetty-spdy/spdy-jetty-http/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.spdy spdy-parent - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 spdy-jetty-http diff --git a/jetty-spdy/spdy-jetty/pom.xml b/jetty-spdy/spdy-jetty/pom.xml index 3945e9a3f70..20df42f7292 100644 --- a/jetty-spdy/spdy-jetty/pom.xml +++ b/jetty-spdy/spdy-jetty/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.spdy spdy-parent - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 spdy-jetty diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index da87252c258..07164ba16fa 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 40732544788..544534fdb4d 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 0f8c022dfa6..0b17e481c3f 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index e3df8d95061..1c01b56786c 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 1a372281d24..e2ae3288187 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 17a91d5dc12..c429e621793 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 19 jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT Jetty :: Project ${jetty.url} pom diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 2f72cafdaa2..c0e651e212a 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 test-continuation diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml index 6943e6d480d..323c0acf97a 100644 --- a/test-jetty-nested/pom.xml +++ b/test-jetty-nested/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT test-jetty-nested Jetty :: Nested Test diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 6dcf7e81201..ce80e818bd6 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 test-jetty-servlet diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index b1376959938..9515f63bafe 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 8.1.5-SNAPSHOT + 8.1.4-SNAPSHOT 4.0.0 test-jetty-webapp diff --git a/test-jetty-webapp/src/main/config/contexts/test.xml b/test-jetty-webapp/src/main/config/contexts/test.xml index 3c36173b138..32e5b40584f 100644 --- a/test-jetty-webapp/src/main/config/contexts/test.xml +++ b/test-jetty-webapp/src/main/config/contexts/test.xml @@ -61,6 +61,11 @@ detected. --> + + + true + + true diff --git a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml index 010d10d428a..a0c2bb329af 100644 --- a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml +++ b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml @@ -275,6 +275,16 @@ /error404.html + + + Auth2 + /auth2/* + + + * + + + Any User diff --git a/test-jetty-webapp/src/main/webapp/auth.html b/test-jetty-webapp/src/main/webapp/auth.html index 1f64b2bc676..1b1de1157c3 100644 --- a/test-jetty-webapp/src/main/webapp/auth.html +++ b/test-jetty-webapp/src/main/webapp/auth.html @@ -12,6 +12,7 @@ This page contains several links to test the authentication constraints: