You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by ol...@apache.org on 2017/01/14 09:01:35 UTC

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

Author: olli
Date: Sat Jan 14 09:01:34 2017
New Revision: 1778742

URL: http://svn.apache.org/viewvc?rev=1778742&view=rev
Log:
SLING-6105 Register old resource event bridge automatically

remove configuration

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=1778742&r1=1778741&r2=1778742&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 Sat Jan 14 09:01:34 2017
@@ -64,7 +64,6 @@ public class SlingLaunchpadOakTarConfigu
             editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.config", "servletresolver.cacheSize", "0"),
             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", references),
             editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bypass", true),
             addSlingFeatures(