Author: olli
Date: Sun Jul 5 10:29:29 2015
New Revision: 1689232
URL: http://svn.apache.org/r1689232
Log:
SLING-3821 use Sling’s Karaf Features from POM
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/pom.xml?rev=1689232&r1=1689231&r2=1689232&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/pom.xml
Sun Jul 5 10:29:29 2015
@@ -63,6 +63,15 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Apache Sling -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.karaf-features</artifactId>
+ <version>0.1.1-SNAPSHOT</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <scope>test</scope>
+ </dependency>
<!-- bnd -->
<dependency>
<groupId>biz.aQute.bnd</groupId>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java?rev=1689232&r1=1689231&r2=1689232&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java
Sun Jul 5 10:29:29 2015
@@ -31,8 +31,7 @@ public class SlingLaunchpadJackrabbitDer
public Option[] configuration() {
return OptionUtils.combine(launchpadConfiguration(),
editConfigurationFilePut("etc/custom.properties",
"sling.run.modes", "jackrabbit"),
- addBootFeature("sling-jcr-jackrabbit-security"),
- addBootFeature("sling-launchpad-jackrabbit-derby"),
+ addSlingFeatures("sling-jcr-jackrabbit-security",
"sling-launchpad-jackrabbit-derby"),
// configurations for tests
editConfigurationFilePut("etc/integrationTestsConfig.cfg",
"message", "This test config should be loaded at startup"),
editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.cfg",
"servletresolver.cacheSize", "0")
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1689232&r1=1689231&r2=1689232&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
Sun Jul 5 10:29:29 2015
@@ -63,6 +63,15 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Apache Sling -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.karaf-features</artifactId>
+ <version>0.1.1-SNAPSHOT</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <scope>test</scope>
+ </dependency>
<!-- bnd -->
<dependency>
<groupId>biz.aQute.bnd</groupId>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1689232&r1=1689231&r2=1689232&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
Sun Jul 5 10:29:29 2015
@@ -31,7 +31,7 @@ public class SlingLaunchpadOakTarConfigu
public Option[] configuration() {
return OptionUtils.combine(launchpadConfiguration(),
editConfigurationFilePut("etc/custom.properties",
"sling.run.modes", "oak,oak_tar"),
- addBootFeature("sling-launchpad-oak-tar"),
+ addSlingFeatures("sling-launchpad-oak-tar"),
// configurations for tests
editConfigurationFilePut("etc/integrationTestsConfig.cfg",
"message", "This test config should be loaded at startup"),
editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.cfg",
"servletresolver.cacheSize", "0")
