summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-11-16 17:36:18 +0000
committerOlivier Lamy <olamy@apache.org>2011-11-16 17:36:18 +0000
commit3e47bcb15c69d5f2a295f92ca68af5eee6504b3e (patch)
treed1331fd3e4a65a797e5622eb9a2a1363816b35de
parent835f163f012cec1800c8c9045b528017c37ad2a7 (diff)
downloadarchiva-3e47bcb15c69d5f2a295f92ca68af5eee6504b3e.tar.gz
archiva-3e47bcb15c69d5f2a295f92ca68af5eee6504b3e.zip
add property to override tomcat context used when using tomcat maven plugin
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1202801 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/pom.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 9b0afa64e..8acd10b12 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -32,6 +32,7 @@
<properties>
<archiva.baseRestUrl />
<rest.admin.pwd />
+ <tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
</properties>
<dependencies>
@@ -641,7 +642,7 @@
<configuration>
<port>9091</port>
<path>/archiva</path>
- <contextFile>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</contextFile>
+ <contextFile>${tomcatContextXml}</contextFile>
<systemProperties>
<plexus.home>${basedir}/appserver-base</plexus.home>
<appserver.base>${basedir}/appserver-base</appserver.base>
@@ -1117,7 +1118,7 @@
<configuration>
<port>9091</port>
<path>/archiva</path>
- <contextFile>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</contextFile>
+ <contextFile>${tomcatContextXml}</contextFile>
<systemProperties>
<plexus.home>${basedir}/appserver-base</plexus.home>
<appserver.base>${basedir}/appserver-base</appserver.base>
@@ -1147,7 +1148,7 @@
<configuration>
<port>9091</port>
<path>/archiva</path>
- <contextFile>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</contextFile>
+ <contextFile>${tomcatContextXml}</contextFile>
<systemProperties>
<plexus.home>${basedir}/appserver-base</plexus.home>
<appserver.base>${basedir}/appserver-base</appserver.base>