[Yanel-commits] rev 43908 - public/yanel/trunk/src/build/resource-types

guillaume at wyona.com guillaume at wyona.com
Wed Jul 29 10:34:55 CEST 2009


Author: guillaume
Date: 2009-07-29 10:34:55 +0200 (Wed, 29 Jul 2009)
New Revision: 43908

Modified:
   public/yanel/trunk/src/build/resource-types/resource-type.build.xml
Log:
"Multi-resource-types" (the RT folders that contain several "resource-*.xml" files, e.g. "user-mgmt")
 did not copy their non-class resources correctly.

Issue: 6897


Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml
===================================================================
--- public/yanel/trunk/src/build/resource-types/resource-type.build.xml	2009-07-28 11:35:46 UTC (rev 43907)
+++ public/yanel/trunk/src/build/resource-types/resource-type.build.xml	2009-07-29 08:34:55 UTC (rev 43908)
@@ -32,8 +32,12 @@
     <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>
     <property name="resource.lib.dir" value="${resource.build.dir}/lib"/>
     <property name="resource.java.dir" value="${resource.home.dir}/src/java"/>
-    <property name="resource.resource.xml" value="${resource.home.dir}/resource.xml"/>
-    <xmlproperty prefix="resource.resource.xml" file="${resource.resource.xml}"/>    
+    <!--NOTE for "multi-resource-types" properties will be picked from the 1st "resource-*.xml" file found, so please make sure they all use the same values! -->
+    <xmlproperty prefix="resource.resource.xml">
+      <first>
+        <fileset dir="${resource.home.dir}" includes="resource*.xml"/>
+      </first>
+    </xmlproperty>
 
   </target>
 



More information about the Yanel-commits mailing list