Author: sshyrkov
Date: Tue Nov 20 18:03:40 2007
New Revision: 19233
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19233&repname=
=3Djahia
Log:
Optimizes GWT module compilation: trigger compilation directly, because usi=
ng Maven plugin causes eveything to be executed thrice
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/maven.xml
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/maven.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/maven.xml&rev=3D19233&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/maven.xml (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/maven.xml Tue Nov 20 18:03:40 20=
07
@@ -75,8 +75,7 @@
<!-- Hot-Deploy to Catalina =
-->
<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
=
- <!--goal name=3D"hotdeploy:tomcat" prereqs=3D"war:webapp"-->
- <goal name=3D"hotdeploy:tomcat" prereqs=3D"jahia:gwt-compile">
+ <goal name=3D"hotdeploy:tomcat" prereqs=3D"war:webapp">
<j:set var=3D"generate_hibernate_mapping_files" value=3D"true"/>
<echo message=3D"Hot deploying ${pom.id}, ${pom.name}"/>
<copy todir=3D"${deploy.war.dir}/${webapp.name}">
@@ -113,7 +112,6 @@
=
<goal name=3D"deploy:tomcat">
<j:set var=3D"generate_hibernate_mapping_files" value=3D"true"/>
- <attainGoal name=3D"jahia:gwt-compile"/>
<attainGoal name=3D"jahia:deploy-tomcat"/>
<attainGoal name=3D"jahia:deploy-shared-libs"/>
<j:set var=3D"catalina_version_major" value=3D"${catalina.version.=
major}"/>
@@ -324,25 +322,39 @@
</java>
</goal>
=
+ <postGoal name=3D"war:webapp">
+ <attainGoal name=3D"jahia:gwt-compile"/>
+ </postGoal>
+ =
<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
<!-- Compile GWT modules -->
<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
=
- <goal name=3D"jahia:gwt-compile" prereqs=3D"war:webapp">
+ <goal name=3D"jahia:gwt-compile">
<echo>Compile all GWT modules,...</echo>
+ <!-- TO DO: generate dynamically-->
<util:tokenize var=3D"google.webtoolkit.compiletarget" delim=3D",">
- <!-- TO DO: generate dynamically-->
${google.webtoolkit.jahiaModules}
</util:tokenize>
+ =
<j:forEach var=3D"target" items=3D"${google.webtoolkit.compiletarg=
et}">
<echo>GWT module name - ${target}</echo>
+ <ant:java classname=3D"com.google.gwt.dev.GWTCompiler"
+ fork=3D"true" dir=3D"${basedir}">
+ <ant:jvmarg line=3D"${google.webtoolkit.extrajvmargs}" />
+ <ant:arg value=3D"-out" />
+ <ant:arg value=3D"${google.webtoolkit.output}" />
+ <ant:arg value=3D"${target}" />
+ <ant:classpath>
+ <ant:path refid=3D"maven.compile.src.set" />
+ <ant:pathelement location=3D"${basedir}/src/conf/java"=
/>
+ <ant:path refid=3D"maven.dependency.classpath" />
+ <ant:pathelement location=3D"${maven.build.dest}" />
+ </ant:classpath>
+ </ant:java>
</j:forEach>
- <attainGoal name=3D"gwt:compile"/>
</goal>
=
-
-
-
<!-- Generate Jahia GWT api-->
<goal name=3D"jahia:gwt-api" prereqs=3D"jahia:gwt-compile">
<echo>Generating jahia-GWT-api.jar,...</echo>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
