Author: rombert Date: Wed Jul 10 16:58:28 2013 New Revision: 1501849 URL: http://svn.apache.org/r1501849 Log: SLING-2960 - Contrib integration tests fail: Sling services not available. Already checked in earlier tests.
Clean up context path setup, similar to the launchpad/testing-war project. Modified: sling/trunk/contrib/launchpad/testing/pom.xml Modified: sling/trunk/contrib/launchpad/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=1501849&r1=1501848&r2=1501849&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/testing/pom.xml (original) +++ sling/trunk/contrib/launchpad/testing/pom.xml Wed Jul 10 16:58:28 2013 @@ -88,7 +88,6 @@ <plugin> <artifactId>maven-clean-plugin</artifactId> - <version>2.2</version> <configuration> <filesets> <fileset> @@ -139,44 +138,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <configuration> - <contextPath>/</contextPath> - <scanIntervalSeconds> - ${jetty.scan.interval.seconds} - </scanIntervalSeconds> - - <systemProperties> - <systemProperty> - <name>sling.home</name> - <value>${jetty.sling.home}</value> - </systemProperty> - - <!-- jython uses this to place various stuff --> - <systemProperty> - <name>python.home</name> - <value>${jetty.sling.home}/python</value> - </systemProperty> - </systemProperties> - - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${jetty.http.port}</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - - <!-- - Use target/... as the webapp source, as we unpack stuff there from the - Sling launcher modules - --> - <webAppSourceDirectory> - target/${artifactId}-${pom.version} - </webAppSourceDirectory> - </configuration> - </plugin> <plugin> <groupId>org.apache.sling</groupId> @@ -250,6 +211,12 @@ http://${test.host}:${http.port}/${webdav.workspace.path} </value> </property> + <property> + <name>launchpad.servlet.context</name> + <value> + /${http.base.path} + </value> + </property> </systemProperties> </configuration> </plugin> @@ -315,7 +282,7 @@ launchpad.http.server.url </name> <value> - http://${test.host}:${http.port}/${project.build.finalName} + http://${test.host}:${http.port}/${http.base.path} </value> </property> <property> @@ -323,7 +290,7 @@ launchpad.webdav.server.url </name> <value> - http://${test.host}:${http.port}/${project.build.finalName}/${webdav.workspace.path} + http://${test.host}:${http.port}/${http.base.path}/${webdav.workspace.path} </value> </property> @@ -362,6 +329,13 @@ </sling.home> </systemProperties> </container> + <deployables> + <deployable> + <properties> + <context>/${http.base.path}</context> + </properties> + </deployable> + </deployables> <configuration> <home>${project.build.directory}/cargo</home> <properties>