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 2015/05/25 19:23:58 UTC
svn commit: r1681619 - in /sling/trunk/contrib/launchpad/karaf: ./
org.apache.sling.launchpad.karaf-launchpad-integration-tests/
org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/
org.apache.sling.launchpad.karaf-launchpad-j...
Author: olli
Date: Mon May 25 17:23:57 2015
New Revision: 1681619
URL: http://svn.apache.org/r1681619
Log:
SLING-3821 run launchpad integration tests against Sling on Karaf
* create separate modules from org.apache.sling.launchpad.karaf-launchpad-integration-tests for Sling with Jackrabbit Derby and Oak Tar
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/
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/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/
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/
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/
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/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/
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/
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
Removed:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-integration-tests/
Modified:
sling/trunk/contrib/launchpad/karaf/pom.xml
Added: 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=1681619&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/pom.xml (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/pom.xml Mon May 25 17:23:57 2015
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>22</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Launchpad Karaf - Launchpad Jackrabbit Derby Integration Tests</name>
+ <description>Launchpad Jackrabbit Derby Integration Tests for Apache Sling Launchpad Karaf</description>
+
+ <dependencies>
+ <!-- javax -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Apache Karaf -->
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>tar.gz</type>
+ <version>3.0.3</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- bnd -->
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>2.4.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>1.7.7</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.karaf-integration-tests</artifactId>
+ <version>0.1.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>4.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-karaf</artifactId>
+ <version>4.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>4.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>exam-maven-plugin</artifactId>
+ <version>4.5.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.18.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <jdk>[1.7,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>exam-maven-plugin</artifactId>
+ <configuration>
+ <configClass>org.apache.sling.launchpad.karaf.tests.configuration.SlingLaunchpadJackrabbitDerbyConfiguration</configClass>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start-container</goal>
+ <goal>stop-container</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <jar.executor.server.port>8888</jar.executor.server.port>
+ <server.ready.path.1>/:script src="/system/sling.js"</server.ready.path.1>
+ </systemPropertyVariables>
+ <dependenciesToScan>
+ <dependency>org.apache.sling:org.apache.sling.launchpad.integration-tests</dependency>
+ </dependenciesToScan>
+ <includes>
+ <include>**/*Test.class</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.*</exclude>
+ <exclude>org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.*</exclude>
+ <exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/WarSelectorServletTest.*</exclude>
+ </excludes>
+ <excludedGroups>org.apache.sling.commons.testing.junit.categories.OakOnly</excludedGroups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Added: 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=1681619&view=auto
==============================================================================
--- 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 (added)
+++ 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 Mon May 25 17:23:57 2015
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.karaf.tests.configuration;
+
+import org.apache.sling.launchpad.karaf.testing.SlingLaunchpadConfiguration;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
+
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
+public class SlingLaunchpadJackrabbitDerbyConfiguration extends SlingLaunchpadConfiguration {
+
+ @Configuration
+ 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")
+ );
+ }
+
+}
Added: 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=1681619&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml Mon May 25 17:23:57 2015
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>22</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Launchpad Karaf - Launchpad Oak Tar Integration Tests</name>
+ <description>Launchpad Oak Tar Integration Tests for Apache Sling Launchpad Karaf</description>
+
+ <dependencies>
+ <!-- javax -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Apache Karaf -->
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>tar.gz</type>
+ <version>3.0.3</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- bnd -->
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>2.4.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>1.7.7</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.karaf-integration-tests</artifactId>
+ <version>0.1.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>4.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-karaf</artifactId>
+ <version>4.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>4.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>exam-maven-plugin</artifactId>
+ <version>4.5.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.18.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <jdk>[1.7,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>exam-maven-plugin</artifactId>
+ <configuration>
+ <configClass>org.apache.sling.launchpad.karaf.tests.configuration.SlingLaunchpadOakTarConfiguration</configClass>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start-container</goal>
+ <goal>stop-container</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <jar.executor.server.port>8888</jar.executor.server.port>
+ <server.ready.path.1>/:script src="/system/sling.js"</server.ready.path.1>
+ </systemPropertyVariables>
+ <dependenciesToScan>
+ <dependency>org.apache.sling:org.apache.sling.launchpad.integration-tests</dependency>
+ </dependenciesToScan>
+ <includes>
+ <include>**/*Test.class</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.*</exclude>
+ <exclude>org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.*</exclude>
+ <exclude>org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/WarSelectorServletTest.*</exclude>
+ </excludes>
+ <excludedGroups>org.apache.sling.commons.testing.junit.categories.JackrabbitOnly</excludedGroups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Added: 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=1681619&view=auto
==============================================================================
--- 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 (added)
+++ 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 Mon May 25 17:23:57 2015
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.karaf.tests.configuration;
+
+import org.apache.sling.launchpad.karaf.testing.SlingLaunchpadConfiguration;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
+
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
+public class SlingLaunchpadOakTarConfiguration extends SlingLaunchpadConfiguration {
+
+ @Configuration
+ public Option[] configuration() {
+ return OptionUtils.combine(launchpadConfiguration(),
+ editConfigurationFilePut("etc/custom.properties", "sling.run.modes", "oak,oak_tar"),
+ addBootFeature("sling-launchpad-oak-tar")
+ );
+ }
+
+}
Modified: sling/trunk/contrib/launchpad/karaf/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/pom.xml?rev=1681619&r1=1681618&r2=1681619&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/pom.xml Mon May 25 17:23:57 2015
@@ -44,7 +44,8 @@
<module>org.apache.sling.launchpad.karaf</module>
<module>org.apache.sling.launchpad.karaf-features</module>
<module>org.apache.sling.launchpad.karaf-integration-tests</module>
- <module>org.apache.sling.launchpad.karaf-launchpad-integration-tests</module>
+ <module>org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests</module>
+ <module>org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests</module>
</modules>
</project>