You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/04/08 11:06:35 UTC
[5/5] git commit: MAROTTA-395: stabilized integration test for the
marmotta-webapp archetype
MAROTTA-395: stabilized integration test for the marmotta-webapp archetype
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/40ebe232
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/40ebe232
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/40ebe232
Branch: refs/heads/develop
Commit: 40ebe23201848761349bf4e2d76bda3cc088a399
Parents: 4804829
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Apr 8 10:36:05 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Apr 8 11:05:47 2014 +0200
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 16 ++++++++++------
.../src/test/resources/verification.xml | 4 ++--
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/40ebe232/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
index c45a647..c0899d3 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
@@ -108,8 +108,9 @@
<systemProperties>
<marmotta.home>\${marmotta.home}</marmotta.home>
</systemProperties>
- <!-- <contextReloadable>true</contextReloadable> -->
- <!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
+ <skipErrorOnShutdown>true</skipErrorOnShutdown>
+ <!-- <contextReloadable>true</contextReloadable> -->
+ <!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
</configuration>
</plugin>
</plugins>
@@ -136,7 +137,10 @@
<execution>
<id>tomcat-run</id>
<phase>pre-integration-test</phase>
- <goals><goal>run-war-only</goal></goals>
+ <goals>
+ <goal>shutdown</goal>
+ <goal>run-war-only</goal>
+ </goals>
<configuration>
<fork>true</fork>
</configuration>
@@ -173,8 +177,8 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>http://localhost:\${marmotta.port}\${marmotta.context}config/list</url>
- <outputFileName>config.json</outputFileName>
+ <url>http://localhost:\${marmotta.port}\${marmotta.context}config/data/kiwi.version</url>
+ <outputFileName>kiwi-version.json</outputFileName>
<outputDirectory>\${project.build.directory}/it/</outputDirectory>
<skipCache>true</skipCache>
</configuration>
@@ -187,7 +191,7 @@
<executions>
<execution>
<id>check-files</id>
- <phase>integration-test</phase>
+ <phase>verify</phase>
<goals><goal>verify</goal></goals>
<configuration>
<basedir>\${project.build.directory}/it/</basedir>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/40ebe232/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/verification.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/verification.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/verification.xml
index 504912c..3c1eb6a 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/verification.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/verification.xml
@@ -24,8 +24,8 @@
<contains>var _SERVER_URL</contains>
</file>
<file>
- <location>config.json</location>
- <contains>\Q"kiwi.version":{"value":"${marmottaVersion}"\E</contains>
+ <location>kiwi-version.json</location>
+ <contains>^\Q{"kiwi.version":"${marmottaVersion}"}\E$</contains>
</file>
</files>
</verifications>