Author: tdraier
Date: Fri Jul 13 13:01:25 2007
New Revision: 17999

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17999&repname=
=3Djahia
Log:
fixed dependency check

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/maven.xml

Modified: branches/JAHIA-5-0-SP-BRANCH/core/maven.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/maven.xml&rev=3D17999&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-5-0-SP-BRANCH/core/maven.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/maven.xml Fri Jul 13 13:01:25 2007
@@ -14,7 +14,6 @@
       <j:choose>
         <j:when test=3D"${generate_hibernate_mapping_files =3D=3D 'true'}"=
 >
           <echo>Generating Hibernate mapping files from doclets...</echo>
-          <attainGoal name=3D"xdoclet:hibernatedoclet" />
           <echo>done.</echo>
         </j:when>
         <j:otherwise>
@@ -211,17 +210,15 @@
 =

     <postGoal name=3D"war:war-resources">
 =

-        <!-- TODO : Finish the dependency set so that we don't do all this=
 everytime we build the project
-          <dependset>
-             <srcfileset
-                 dir   =3D "${maven.build.dir}/jahia/jsp/jahia/javascript/=
zimbra/"
-                 includes =3D "**/*.js"
-                 excludes =3D "zimbra_all.js,zimbra_all_packed.js,zimbra_a=
ll_packed.js.zgz" />
-             <targetfilelist
-                 dir      =3D "${maven.build.dir}/jahia/jsp/jahia/javascri=
pt/zimbra/"
-                 includes =3D "zimbra_all.js,zimbra_all_packed.js,zimbra_a=
ll_packed.js.zgz"/>
-          </dependset>
-        -->
+        <dependset>
+            <srcfileset
+                    dir=3D"${maven.build.dir}/jahia/jsp/jahia/javascript/z=
imbra/"
+                    includes=3D"**/*.js" />
+            <targetfilelist
+                    dir=3D"${maven.build.dir}/jahia/jsp/jahia/javascript/z=
imbra/"
+                    files=3D"zimbra_all_packed.js.zgz"/>
+        </dependset>
+        <j:set var=3D"maven.zimbra.packedfile.exists" value=3D'false'/>
 =

         <available file=3D"${maven.build.dir}/jahia/jsp/jahia/javascript/z=
imbra/zimbra_all_packed.js.zgz"
                    property=3D"maven.zimbra.packedfile.exists"/>

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to