You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/10 15:47:35 UTC
svn commit: r1672666 - in /sling/trunk/launchpad/testing-war: pom.xml
src/main/config/ src/main/provisioning/ src/main/provisioning/model.txt
src/main/resources/ src/main/webapp/
Author: cziegeler
Date: Fri Apr 10 13:47:35 2015
New Revision: 1672666
URL: http://svn.apache.org/r1672666
Log:
SLING-4602 : Migrate launchpad/testing-war to provisioning model
Added:
sling/trunk/launchpad/testing-war/src/main/provisioning/
sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt (with props)
Removed:
sling/trunk/launchpad/testing-war/src/main/config/
sling/trunk/launchpad/testing-war/src/main/resources/
sling/trunk/launchpad/testing-war/src/main/webapp/
Modified:
sling/trunk/launchpad/testing-war/pom.xml
Modified: sling/trunk/launchpad/testing-war/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1672666&r1=1672665&r2=1672666&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Fri Apr 10 13:47:35 2015
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.launchpad.testing-war</artifactId>
- <packaging>war</packaging>
+ <packaging>slingstart</packaging>
<version>7-SNAPSHOT</version>
<name>Apache Sling Launchpad Testing WAR version</name>
@@ -148,21 +148,9 @@
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-launchpad-plugin</artifactId>
+ <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>
- </executions>
- <configuration>
- <defaultBundleList>
- <version>${project.version}</version>
- </defaultBundleList>
- </configuration>
</plugin>
<plugin>
@@ -175,33 +163,7 @@
</configuration>
</plugin>
- <!--
- Include sling-app launcher classes and resources, but no Sling
- bundles (we want to specify our own versions)
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <packagingExcludes>WEB-INF/classes/META-INF/*</packagingExcludes>
- <webResources>
- <!-- the configuration resources -->
- <resource>
- <directory>
- ${project.build.directory}/launchpad-bundles
- </directory>
- <targetPath>WEB-INF</targetPath>
- </resource>
- <!-- Legal stuff -->
- <resource>
- <directory>${project.build.outputDirectory}/META-INF</directory>
- <targetPath>META-INF</targetPath>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -425,6 +387,14 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad</artifactId>
+ <version>8-SNAPSHOT</version>
+ <type>slingfeature</type>
+ <classifier>slingfeature</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
@@ -433,23 +403,13 @@
</dependency>
<!-- The test services bundles -->
- <dependency>
- <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>2.5.1-SNAPSHOT</version>
- <classifier>webapp</classifier>
- <type>war</type>
- <scope>runtime</scope>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>slingfeature</type>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
Added: sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt?rev=1672666&view=auto
==============================================================================
--- sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt (added)
+++ sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt Fri Apr 10 13:47:35 2015
@@ -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
Propchange: sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
------------------------------------------------------------------------------
svn:keywords = Id