tdraier 2005/09/21 11:59:03 CEST
Modified files:
core maven.xml
Log:
restored
Revision Changes Path
1.48 +0 -8 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.47&r2=1.48&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/maven.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- maven.xml 21 Sep 2005 09:46:55 -0000 1.47
+++ maven.xml 21 Sep 2005 09:59:03 -0000 1.48
@@ -9,18 +9,10 @@
<attainGoal name="deploy:tomcat" />
</goal>
-<<<<<<< maven.xml
<preGoal name="war:war-resources">
<echo>Generating Hibernate mapping files from doclets...</echo>
<echo>done.</echo>
</preGoal>
-=======
-<!-- <preGoal name="war:war-resources">-->
-<!-- <echo>Generating Hibernate mapping files from doclets...</echo>-->
-<!-- <attainGoal name="xdoclet:hibernatedoclet" />-->
-<!-- <echo>done.</echo>-->
-<!-- </preGoal>-->
->>>>>>> 1.46
<!-- This goal is used to reset an already deployed Jahia. -->
<goal name="reset:tomcat" prereqs="hotdeploy:tomcat">
