Author: fchrist
Date: Wed Jun 22 09:48:41 2011
New Revision: 1138364
URL: http://svn.apache.org/viewvc?rev=1138364&view=rev
Log:
STANBOL-236 Use the new property jar.executor.workingdirectory to configure in
which directory Stanbol is launched for integrations-tests.
With this commit the launch directory changes from ${basedir} to
${project.build.directory}/launchdir. Additionally, a 'mvn clean' now only
cleans the 'target' directory as the launch dir is now a subdirectory of
'target'.
Tests can resolve the configured launch dir by using
System.getProperty("jar.executor.workingdirectory").
Modified:
incubator/stanbol/trunk/integration-tests/pom.xml
Modified: incubator/stanbol/trunk/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/pom.xml?rev=1138364&r1=1138363&r2=1138364&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/pom.xml (original)
+++ incubator/stanbol/trunk/integration-tests/pom.xml Wed Jun 22 09:48:41 2011
@@ -44,17 +44,25 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.full</artifactId>
<version>0.9-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.testing.http</artifactId>
<version>0.9-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.testing.stanbol</artifactId>
<version>0.9-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -69,17 +77,6 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.2</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <!-- sling folder is the workdir of the executable jar that we
test -->
- <include>sling</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -129,11 +126,13 @@
<jar.executor.vm.options>${jar.executor.vm.options}</jar.executor.vm.options>
<jar.executor.jar.folder>${project.basedir}/target/dependency</jar.executor.jar.folder>
<jar.executor.jar.name.regexp>org.apache.stanbol.*full.*jar$</jar.executor.jar.name.regexp>
+
<jar.executor.workingdirectory>${project.build.directory}/launchdir</jar.executor.workingdirectory>
<keepJarRunning>${keepJarRunning}</keepJarRunning>
<server.ready.timeout.seconds>180</server.ready.timeout.seconds>
<server.ready.path.1>/:stanbol.css</server.ready.path.1>
<server.ready.path.2>/engines:There are
currently</server.ready.path.2>
<server.ready.path.3>/contenthub:Recently uploaded Content
Items</server.ready.path.3>
+ <server.ready.path.4>/factstore:The FactStore implements a
store</server.ready.path.4>
</systemPropertyVariables>
</configuration>
</plugin>
