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/15 04:04:10 UTC
svn commit: r1673615 - /sling/trunk/launchpad/testing-war/pom.xml
Author: cziegeler
Date: Wed Apr 15 02:04:09 2015
New Revision: 1673615
URL: http://svn.apache.org/r1673615
Log:
SLING-4602 : Migrate launchpad/testing-war to provisioning model
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=1673615&r1=1673614&r2=1673615&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Wed Apr 15 02:04:09 2015
@@ -56,22 +56,9 @@
<!-- hostname for integration tests -->
<test.host>localhost</test.host>
- <!--
- Defines which tests are for the "integration-testing" phase
- -->
- <integration.test.code.path>
- **/launchpad/webapp/integrationtest
- </integration.test.code.path>
-
<!-- optionally exclude some integration tests -->
<failsafe.exclude></failsafe.exclude>
- <!--
- Set this to true to stop mvn once the integration test Jetty instance is
- started. Useful to manually test the integration testing webapp.
- -->
- <integration.test.wait>false</integration.test.wait>
-
<slf4j.version>1.7.6</slf4j.version>
<logback.version>1.1.2</logback.version>
</properties>
@@ -127,6 +114,7 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>9.2.10.v20150310</version>
<configuration>
+ <skip>${maven.test.skip}</skip>
<stopKey>alpha</stopKey>
<stopPort>9099</stopPort>
<httpConnector>
@@ -135,86 +123,64 @@
<contextPath>${http.base.path}</contextPath>
<war>${project.build.directory}/${project.build.finalName}.war</war>
</configuration>
+ <executions>
+ <execution>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-war</goal>
+ </goals>
+ <configuration>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-jetty</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <dependenciesToScan>
+ <dependency>org.apache.sling:org.apache.sling.launchpad.integration-tests</dependency>
+ </dependenciesToScan>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/*IT.java</include>
+ </includes>
+ <excludes>
+ <exclude>${failsafe.exclude}</exclude>
+ </excludes>
+ <excludedGroups>${sling.it.excludedGroups}</excludedGroups>
+ <systemPropertyVariables>
+ <launchpad.http.server.url>http://${test.host}:${http.port}/</launchpad.http.server.url>
+ <launchpad.webdav.server.url>http://${test.host}:${http.port}/${webdav.workspace.path}</launchpad.webdav.server.url>
+ <launchpad.servlet.context>${http.base.path}</launchpad.servlet.context>
+ <!-- Additional readyness checks, SLING-3235 and SLING-4261 -->
+ <launchpad.ready.1>GET:/system/console/status-Configurations/configuration-status-20131115-101714.txt:200:config.comment.*setup the JSP engine for running tests</launchpad.ready.1>
+ <launchpad.ready.2>GET:/.EXPORTED_PACKAGES.txt?package=org.apache.sling.api:200:PACKAGE FOUND.*org.apache.sling.api</launchpad.ready.2>
+ <launchpad.ready.3>GET:/system/sling/junit/org.apache.sling.launchpad.testservices.serversidetests.WriteableResourcesTest.json:200:WriteableResourcesTest</launchpad.ready.3>
+ </systemPropertyVariables>
+ </configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <!--
- Run the integration tests.
- -->
- <id>integrationTesting</id>
- <activation>
- <property>
- <name>!maven.test.skip</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <dependenciesToScan>
- <dependency>org.apache.sling:org.apache.sling.launchpad.integration-tests</dependency>
- </dependenciesToScan>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*IT.java</include>
- </includes>
- <excludes>
- <exclude>${failsafe.exclude}</exclude>
- </excludes>
- <excludedGroups>${sling.it.excludedGroups}</excludedGroups>
- <systemPropertyVariables>
- <launchpad.http.server.url>http://${test.host}:${http.port}/</launchpad.http.server.url>
- <launchpad.webdav.server.url>http://${test.host}:${http.port}/${webdav.workspace.path}</launchpad.webdav.server.url>
- <launchpad.servlet.context>${http.base.path}</launchpad.servlet.context>
- <!--
- <HttpTestBase.readyTimeoutSeconds>${HttpTestBase.readyTimeoutSeconds}</HttpTestBase.readyTimeoutSeconds>
- -->
- <!-- Additional readyness checks, SLING-3235 and SLING-4261 -->
- <launchpad.ready.1>GET:/system/console/status-Configurations/configuration-status-20131115-101714.txt:200:config.comment.*setup the JSP engine for running tests</launchpad.ready.1>
- <launchpad.ready.2>GET:/.EXPORTED_PACKAGES.txt?package=org.apache.sling.api:200:PACKAGE FOUND.*org.apache.sling.api</launchpad.ready.2>
- <launchpad.ready.3>GET:/system/sling/junit/org.apache.sling.launchpad.testservices.serversidetests.WriteableResourcesTest.json:200:WriteableResourcesTest</launchpad.ready.3>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>start-jetty</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-war</goal>
- </goals>
- <configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- </configuration>
- </execution>
- <execution>
- <id>stop-jetty</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>warIntegrationTestsInNonRootContext</id>
<properties>
<http.base.path>${project.build.finalName}</http.base.path>