From: Olivier Lamy <olamy@apache.org>
Date: Wed, 16 Nov 2011 17:36:18 +0000 (+0000)
Subject: add property to override tomcat context used when using tomcat maven plugin
X-Git-Tag: archiva-1.4-M2~101
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3e47bcb15c69d5f2a295f92ca68af5eee6504b3e;p=archiva.git

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
---

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>