You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/09/02 12:58:25 UTC
svn commit: r1700764 - in /sling/trunk/launchpad:
builder/src/main/provisioning/
integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/
integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servle...
Author: bdelacretaz
Date: Wed Sep 2 10:58:25 2015
New Revision: 1700764
URL: http://svn.apache.org/r1700764
Log:
SLING-4987 - upgrade to org.apache.felix.http.jetty/3.1.0 and adapt tests accordingly
Modified:
sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestObjectTest.java
Modified: sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt?rev=1700764&r1=1700763&r2=1700764&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt Wed Sep 2 10:58:25 2015
@@ -24,4 +24,4 @@
[artifacts startLevel=5 runModes=:standalone]
org.apache.felix/org.apache.felix.http.api/3.0.0
org.apache.felix/org.apache.felix.http.servlet-api/1.1.2
- org.apache.felix/org.apache.felix.http.jetty/3.0.2
+ org.apache.felix/org.apache.felix.http.jetty/3.1.0
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java?rev=1700764&r1=1700763&r2=1700764&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java Wed Sep 2 10:58:25 2015
@@ -68,7 +68,6 @@ public class WebDavDoubleSlashTest {
// An empty JCR workspace name results in a URL like "/dav//test/..."
// which correctly returns 404 now, but used to work as the WebDAV
// servlets used the default workspace name in that case.
- // TODO reverted to 207 for SLING-4978, need to sort that out...
- assertEquals(207, getPropfindStatus("", testPath));
+ assertEquals(404, getPropfindStatus("", testPath));
}
}
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestObjectTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestObjectTest.java?rev=1700764&r1=1700763&r2=1700764&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestObjectTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestObjectTest.java Wed Sep 2 10:58:25 2015
@@ -46,9 +46,9 @@ public class RequestObjectTest extends R
final TestItem [] TESTS = {
new TestItem("","",""),
- new TestItem(";v=1.1",";v=1.1",";v=1.1"),
- new TestItem(";v=1.1?foo=bar",";v=1.1",";v=1.1"),
- new TestItem(";v=1.1?foo=bar&ga+bu=zo+meu",";v=1.1",";v=1.1")
+ new TestItem(";v=1.1","",";v=1.1"),
+ new TestItem(";v=1.1?foo=bar","",";v=1.1"),
+ new TestItem(";v=1.1?foo=bar&ga+bu=zo+meu","",";v=1.1")
};
@Override