shuber 2004/08/11 16:18:17 CEST
Modified files:
core maven.xml project.xml
Log:
Classes will now be packaged into a JAR before the war:war is executed.
Revision Changes Path
1.19 +17 -0 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.18&r2=1.19&f=h
1.26 +1 -1 jahia/core/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.xml.diff?r1=1.25&r2=1.26&f=h
Index: maven.xml
===================================================================
RCS file: /cvs/jahia/core/maven.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- maven.xml 29 Jul 2004 11:50:49 -0000 1.18
+++ maven.xml 11 Aug 2004 14:18:16 -0000 1.19
@@ -167,4 +167,21 @@
</goal>
+ <preGoal name="war:war">
+ <jar
destfile="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${pom.artifactId}-${pom.currentVersion}.jar"
+ basedir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
+ includes="**/*.class"
+ />
+ <!-- we do all this mess because the delete includeEmptyDirs doesn't seem to
work in Ant :( -->
+ <copy includeEmptyDirs="false"
toDir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources">
+ <fileset dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes">
+ <exclude name="**/*.class"/>
+ </fileset>
+ </copy>
+ <delete dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes" />
+ <move todir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes">
+ <fileset
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources"/>
+ </move>
+ </preGoal>
+
</project>
Index: project.xml
===================================================================
RCS file: /cvs/jahia/core/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 28 Jul 2004 17:33:55 -0000 1.25
+++ project.xml 11 Aug 2004 14:18:16 -0000 1.26
@@ -2,7 +2,7 @@
<project>
<pomVersion>3</pomVersion>
- <id>jahia</id>
+ <artifactId>jahia</artifactId>
<name>Jahia CMS and Portal Server</name>
<groupId>jahia</groupId>
<currentVersion>4.5-dev</currentVersion>
