ate 2004/09/29 01:19:07
Modified: portal maven.xml
Log:
Fixed removing security portlet context file when using Tomcat 5
Revision Changes Path
1.102 +10 -1 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- maven.xml 27 Sep 2004 23:05:52 -0000 1.101
+++ maven.xml 29 Sep 2004 08:19:07 -0000 1.102
@@ -628,7 +628,16 @@
<delete dir="${org.apache.jetspeed.deploy.war.dir}/PHP"/>
<delete dir="${org.apache.jetspeed.deploy.war.dir}/perl"/>
<delete dir="${org.apache.jetspeed.deploy.war.dir}/localeselector"/>
- <delete file="${org.apache.jetspeed.deploy.war.dir}/security.xml"/>
+ <j:set var="catalina_version_major"
value="${org.apache.jetspeed.catalina.version.major}"/>
+ <j:choose>
+ <j:when test="${catalina_version_major == '5'}" >
+ <j:set var="context_dir"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="context_dir" value="${org.apache.jetspeed.deploy.war.dir}"/>
+ </j:otherwise>
+ </j:choose>
+ <delete file="${context_dir}/security.xml"/>
</goal>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
