shuber 2005/06/22 16:10:42 CEST
Modified files:
core maven.xml
Log:
Re-introduce modification for deployment of context descriptors for various
versions of Tomcat
Revision Changes Path
1.29 +31 -2 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.28&r2=1.29&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/maven.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- maven.xml 22 Jun 2005 12:32:51 -0000 1.28
+++ maven.xml 22 Jun 2005 14:10:41 -0000 1.29
@@ -12,7 +12,25 @@
<copy todir="${deploy.war.dir}/${webapp.name}">
<fileset dir="./target/jahia"/>
</copy>
- <copy file="./src/conf/metadata/jahia.xml"
tofile="${deploy.contextdescriptor.dir}/jahia.xml"/>
+ <j:set var="catalina_version_major" value="${catalina.version.major}"/>
+ <j:choose>
+ <j:when test="${catalina_version_major == '5.5'}" >
+ <j:set var="context_file"
value="./src/conf/metadata/jahia-tomcat5.5.xml"/>
+ <j:set var="context_dir"
value="${catalina.home.dir}/conf/Catalina/localhost"/>
+ <j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
+ </j:when>
+ <j:when test="${catalina_version_major == '5'}" >
+ <j:set var="context_file"
value="./src/conf/metadata/jahia-tomcat5.xml"/>
+ <j:set var="context_dir"
value="${catalina.home.dir}/conf/Catalina/localhost"/>
+ <j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="context_file" value="./src/conf/metadata/jahia.xml"/>
+ <j:set var="context_dir" value="${deploy.war.dir}"/>
+ <j:set var="use_contextclassloader" value=""/>
+ </j:otherwise>
+ </j:choose>
+ <copy file="${context_file}" tofile="${context_dir}/jahia.xml"/>
</goal>
<!-- ================================================================ -->
@@ -22,21 +40,32 @@
<goal name="deploy:tomcat"
prereqs="jahia:deploy-tomcat,jahia:deploy-shared-libs">
<j:set var="catalina_version_major" value="${catalina.version.major}"/>
<j:choose>
+ <j:when test="${catalina_version_major == '5.5'}" >
+ <j:set var="context_file"
value="./src/conf/metadata/jahia-tomcat5.5.xml"/>
+ <j:set var="context_dir"
value="${catalina.home.dir}/conf/Catalina/localhost"/>
+ <j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
+ </j:when>
<j:when test="${catalina_version_major == '5'}" >
+ <j:set var="context_file"
value="./src/conf/metadata/jahia-tomcat5.xml"/>
<j:set var="context_dir"
value="${catalina.home.dir}/conf/Catalina/localhost"/>
<j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
</j:when>
<j:otherwise>
+ <j:set var="context_file" value="./src/conf/metadata/jahia.xml"/>
<j:set var="context_dir" value="${deploy.war.dir}"/>
<j:set var="use_contextclassloader" value=""/>
</j:otherwise>
</j:choose>
- <copy file="./src/conf/metadata/jahia.xml"
tofile="${context_dir}/jahia.xml"/>
+ <copy file="${context_file}" tofile="${context_dir}/jahia.xml"/>
</goal>
<goal name="undeploy:tomcat"
prereqs="jahia:undeploy-tomcat,jahia:undeploy-shared-libs">
<j:set var="catalina_version_major" value="${catalina.version.major}"/>
<j:choose>
+ <j:when test="${catalina_version_major == '5.5'}" >
+ <j:set var="context_dir"
value="${catalina.home.dir}/conf/Catalina/localhost"/>
+ <j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
+ </j:when>
<j:when test="${catalina_version_major == '5'}" >
<j:set var="context_dir"
value="${catalina.home.dir}/conf/Catalina/localhost"/>
<j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
