svn commit: r1778505 - /sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

[olli]

Author: olli
Date: Fri Jan 13 08:04:56 2017
New Revision: 1778505

URL: http://svn.apache.org/viewvc?rev=1778505&view=rev
Log:
SLING-3821 Run launchpad integration tests against Sling on Karaf

remove workaround for PAXWEB-935

Modified:
    
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1778505&r1=1778504&r2=1778505&view=diff
==============================================================================
--- 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
 (original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
 Fri Jan 13 08:04:56 2017
@@ -58,7 +58,7 @@ public class SlingLaunchpadOakTarConfigu
             editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", 
"org.osgi.service.http.port", Integer.toString(httpPort)),
             editConfigurationFilePut("etc/integrationTestsConfig.config", 
"message", "This test config should be loaded at startup"),
             
editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.config",
 "servletresolver.cacheSize", "0"),
-            // TODO PAXWEB-935 
editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.config",
 "dav.root", "/dav"),
+            
editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.config",
 "dav.root", "/dav"),
             
editConfigurationFilePut("etc/org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet.config",
 "alias", "/server"),
             
editConfigurationFilePut("etc/org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge.config",
 "enabled", "true"),
             
editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config",
 "references", 
"[\"raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt\", 
\"raw:classpath://repoinit/repoinit.txt\"]"),
@@ -87,9 +87,7 @@ public class SlingLaunchpadOakTarConfigu
             
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").versionAsInProject(),
             
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(),
             
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(),
-            
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(),
-            // TODO PAXWEB-935
-            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webdav").version("2.2.2")
+            
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject()
         );
     }