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 2020/11/01 11:56:39 UTC

[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests] branch master updated (8790f07 -> f3b6e32)

This is an automated email from the ASF dual-hosted git repository.

olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git.


    from 8790f07  SLING-9865 Update to Sling (Bundle) Parent 40
     new 407caf6  SLING-8990 Switch configurations to OSGi R7 configuration format
     new f3b6e32  SLING-9837 Use OSGi R7 HTTP Service

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests] 02/02: SLING-9837 Use OSGi R7 HTTP Service

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git

commit f3b6e3244ad92d8838db5af9564f4c9c0ef6415e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Nov 1 12:55:02 2020 +0100

    SLING-9837 Use OSGi R7 HTTP Service
    
    add feature felix-http
---
 .../karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
index a16e8f9..440a338 100644
--- a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
+++ b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
@@ -63,6 +63,7 @@ public class SlingQuickstartOakTarConfiguration extends KarafTestSupport {
                 "sling-scripting-jsp",
                 "sling-scripting-htl"
             ),
+            addFelixHttpFeature(),
             // test support
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.core").versionAsInProject(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.remote").versionAsInProject(),

[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests] 01/02: SLING-8990 Switch configurations to OSGi R7 configuration format

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git

commit 407caf60c8a7a4247a1880c041f9239cddee0f7a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 31 14:37:57 2020 +0100

    SLING-8990 Switch configurations to OSGi R7 configuration format
    
    use tilde as separator for factory configurations
---
 .../karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
index 23d6007..a16e8f9 100644
--- a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
+++ b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
@@ -48,7 +48,7 @@ public class SlingQuickstartOakTarConfiguration extends KarafTestSupport {
             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.jcr.repoinit.RepositoryInitializer-test.config", "scripts", scripts),
+            editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.RepositoryInitializer~test.config", "scripts", scripts),
             editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bypass", true),
             addSlingFeatures(
                 "sling-quickstart-oak-tar",