shuber 2005/07/08 15:29:59 CEST
Modified files:
core maven.xml
Log:
Added new reset:tomcat goal that is used to trigger a re-install of Jahia.
Revision Changes Path
1.32 +38 -0 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.31&r2=1.32&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/maven.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- maven.xml 4 Jul 2005 11:47:11 -0000 1.31
+++ maven.xml 8 Jul 2005 13:29:58 -0000 1.32
@@ -18,6 +18,44 @@
<preGoal name="war:war-resources">
<attainGoal name="xdoclet:hibernatedoclet" />
</preGoal>
+
+ <!-- This goal is used to reset an already deployed Jahia. -->
+ <goal name="reset:tomcat" prereqs="hotdeploy:tomcat">
+ <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 overwrite="true" file="${context_file}"
tofile="${context_dir}/jahia.xml"/>
+ <delete failonerror="false"
file="${deploy.war.dir}/${webapp.name}/WEB-INF/etc/config/jahia.properties" />
+ <delete failonerror="false" includeemptydirs="true">
+ <fileset dir="${deploy.war.dir}/${webapp.name}/WEB-INF/var/dbdata"
includes="**/*"/>
+ </delete>
+ <delete failonerror="false" includeEmptyDirs="true">
+ <fileset dir="${deploy.war.dir}/demo"/>
+ </delete>
+ <delete failonerror="false" file="${deploy.war.dir}/demo.war" />
+ <delete includeEmptyDirs="true">
+ <fileset dir="${deploy.war.dir}/InfoNews_myjahiasite"/>
+ </delete>
+ <delete failonerror="false" includeEmptyDirs="true">
+ <fileset dir="${catalina.home.dir}/work" includes="**/*" />
+ </delete>
+ <echo>Don't forget to reset your database too...</echo>
+ </goal>
<!-- ================================================================ -->
<!-- Hot-Deploy to Catalina -->