Author: cmailleux
Date: Wed Aug 16 15:35:15 2006
New Revision: 14911
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14911&repname=jahia
Log:
Add build step to copy classes to shared/classes
Modified:
trunk/core/maven.xml
Modified: trunk/core/maven.xml
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/maven.xml&rev=14911&repname=jahia
==============================================================================
--- trunk/core/maven.xml (original)
+++ trunk/core/maven.xml Wed Aug 16 15:35:15 2006
@@ -43,9 +43,10 @@
</j:otherwise>
</j:choose>
<!-- Now let's reset all the files that contain markers that are replaced
during configuration wizard -->
- <copy overwrite="true" file="${context_file}"
tofile="${context_dir}/jahia.xml"/>
- <copy overwrite="true"
file="./src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/etc/spring/applicationcontext-manager.xml"/>
- <copy overwrite="true"
file="./src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/etc/spring/applicationcontext-hibernate.xml"/>
+ <copy overwrite="true" file="${context_file}"
tofile="${context_dir}/jahia.xml"/>
+ <copy overwrite="true"
file="./src/webapp/WEB-INF/etc/config/quartz.properties"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/etc/config/quartz.properties"/>
+ <copy overwrite="true"
file="./src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/etc/spring/applicationcontext-manager.xml"/>
+ <copy overwrite="true"
file="./src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml"
tofile="${deploy.war.dir}/${webapp.name}/WEB-INF/etc/spring/applicationcontext-hibernate.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="**/*"/>
@@ -71,10 +72,14 @@
<!-- ================================================================ -->
<goal name="hotdeploy:tomcat" prereqs="war:webapp">
+ <j:set var="generate_hibernate_mapping_files" value="true"/>
<echo message="Hot deploying ${pom.id}, ${pom.name}"/>
<copy todir="${deploy.war.dir}/${webapp.name}">
<fileset dir="./target/jahia"/>
</copy>
+ <copy todir="${catalina.home.dir}/shared/classes/org/apache/jetspeed">
+ <fileset dir="${maven.build.dest}/org/apache/jetspeed"
includes="**/*.class"/>
+ </copy>
<j:set var="catalina_version_major" value="${catalina.version.major}"/>
<j:choose>
<j:when test="${catalina_version_major == '5.5'}" >
@@ -104,6 +109,9 @@
<j:set var="generate_hibernate_mapping_files" value="true"/>
<attainGoal name="jahia:deploy-tomcat" />
<attainGoal name="jahia:deploy-shared-libs" />
+ <copy todir="${catalina.home.dir}/shared/classes/org/apache/jetspeed">
+ <fileset dir="${maven.build.dest}/classes/org/appache/jetspeed"
includes="**/*.class"/>
+ </copy>
<j:set var="catalina_version_major" value="${catalina.version.major}"/>
<j:choose>
<j:when test="${catalina_version_major == '5.5'}" >
