SLING-4598 : Migrate launchpad testing to provisioning model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1672368 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 2de6bac..9517e52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.launchpad.testing</artifactId>
- <packaging>jar</packaging>
+ <packaging>slingstart</packaging>
<version>7-SNAPSHOT</version>
<name>Apache Sling Launchpad Testing</name>
@@ -120,87 +120,10 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifest>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-launchpad-plugin</artifactId>
- <version>2.3.3-SNAPSHOT</version>
+ <artifactId>slingstart-maven-plugin</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
<extensions>true</extensions>
- <executions>
- <execution>
- <id>prepare-package</id>
- <goals>
- <goal>prepare-package</goal>
- </goals>
- </execution>
- <execution>
- <id>default-cli</id>
- <configuration>
- <httpPort>${run.http.port}</httpPort>
- </configuration>
- </execution>
- <execution>
- <id>attach-bundle-list</id>
- <goals>
- <goal>attach-bundle-list</goal>
- </goals>
- <configuration>
- <ignoreBundleListConfig>true</ignoreBundleListConfig>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <defaultBundleList>
- <version>8-SNAPSHOT</version>
- </defaultBundleList>
- <jarWebSupport>
- <bundles>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>2.3.2</version>
- <startLevel>5</startLevel>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.0.1</version>
- <startLevel>5</startLevel>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.3.2</version>
- <startLevel>5</startLevel>
- </bundle>
- </bundles>
- </jarWebSupport>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>4.6.1-2.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>4.6.1-2.5.8</version>
- <classifier>app</classifier>
- </dependency>
- </dependencies>
</plugin>
<plugin>
@@ -280,19 +203,12 @@
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-launchpad-plugin</artifactId>
+ <artifactId>slingstart-maven-plugin</artifactId>
<executions>
<execution>
<id>start-container</id>
- <phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
<goal>stop</goal>
</goals>
</execution>
@@ -459,8 +375,8 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad</artifactId>
<version>8-SNAPSHOT</version>
- <type>partialbundlelist</type>
- <classifier>bundlelist</classifier>
+ <type>slingstart</type>
+ <classifier>slingfeature</classifier>
</dependency>
<!-- The integration tests -->
@@ -476,15 +392,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <type>partialbundlelist</type>
- </dependency>
-
- <!-- The basic Sling WebApp -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.base</artifactId>
- <version>4.6.1-2.5.8</version>
- <classifier>app</classifier>
+ <type>slingfeature</type>
</dependency>
<!-- Dependencies for the Test Build and Run -->
diff --git a/src/main/config/integrationTestsConfig.cfg b/src/main/config/integrationTestsConfig.cfg
deleted file mode 100644
index 7473fef..0000000
--- a/src/main/config/integrationTestsConfig.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Config used to test LaunchpadConfigInstaller
-message=This test config should be loaded at startup
\ No newline at end of file
diff --git a/src/main/config/org.apache.sling.servlets.resolver.SlingServletResolver.cfg b/src/main/config/org.apache.sling.servlets.resolver.SlingServletResolver.cfg
deleted file mode 100644
index 8f789be..0000000
--- a/src/main/config/org.apache.sling.servlets.resolver.SlingServletResolver.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set the servlet resolver's cache size to zero for testing
-servletresolver.cacheSize=0
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt
new file mode 100644
index 0000000..d22bef6
--- /dev/null
+++ b/src/main/provisioning/model.txt
@@ -0,0 +1,10 @@
+[feature name=launchpad-testing]
+ # additional configuration for testing
+
+[configurations]
+ integrationTestsConfig
+ message="This test config should be loaded at startup"
+
+ org.apache.sling.servlets.resolver.SlingServletResolver
+ # Set the servlet resolver's cache size to zero for testing
+ servletresolver.cacheSize=I"0"
\ No newline at end of file
