shuber 2005/10/13 14:20:23 CEST
Modified files:
core maven.xml
Log:
Only call the hibernate doclet on goal deploy:tomcat. Warning this removes
hibernate mapping file generation from the following goals :
- reset:tomcat
- hotdeploy:tomcat
- undeploy:tomcat
which shouldn't be much of a problem. Oh and it's a lot faster this way :)
Revision Changes Path
1.52 +16 -6 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.51&r2=1.52&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/maven.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- maven.xml 10 Oct 2005 18:23:09 -0000 1.51
+++ maven.xml 13 Oct 2005 12:20:22 -0000 1.52
@@ -9,11 +9,18 @@
<attainGoal name="deploy:tomcat" />
</goal>
- <preGoal name="war:war-resources">
- <echo>Generating Hibernate mapping files from doclets...</echo>
- <attainGoal name="xdoclet:hibernatedoclet" />
- <echo>done.</echo>
- </preGoal>
+ <preGoal name="war:war-resources">
+ <j:choose>
+ <j:when test="${generate_hibernate_mapping_files == 'true'}" >
+ <echo>Generating Hibernate mapping files from doclets...</echo>
+ <attainGoal name="xdoclet:hibernatedoclet" />
+ <echo>done.</echo>
+ </j:when>
+ <j:otherwise>
+ <echo>Skipping Hibernate mapping file generation.</echo>
+ </j:otherwise>
+ </j:choose>
+ </preGoal>
<!-- This goal is used to reset an already deployed Jahia. -->
<goal name="reset:tomcat" prereqs="hotdeploy:tomcat">
@@ -96,7 +103,10 @@
<!-- Deploy to Catalina and Expand -->
<!-- ================================================================ -->
- <goal name="deploy:tomcat"
prereqs="jahia:deploy-tomcat,jahia:deploy-shared-libs">
+ <goal name="deploy:tomcat">
+ <j:set var="generate_hibernate_mapping_files" value="true"/>
+ <attainGoal name="jahia:deploy-tomcat" />
+ <attainGoal name="jahia:deploy-shared-libs" />
<j:set var="catalina_version_major" value="${catalina.version.major}"/>
<j:choose>
<j:when test="${catalina_version_major == '5.5'}" >
