[Yanel-commits] rev 42243 - public/yanel/trunk/src/build/targets

[michi at wyona.com]

Author: michi
Date: 2009-04-04 11:18:05 +0200 (Sat, 04 Apr 2009)
New Revision: 42243

Modified:
   public/yanel/trunk/src/build/targets/resources.xml
Log:
dynamic generation of resources build re individual realms

Modified: public/yanel/trunk/src/build/targets/resources.xml
===================================================================
--- public/yanel/trunk/src/build/targets/resources.xml	2009-04-04 09:10:25 UTC (rev 42242)
+++ public/yanel/trunk/src/build/targets/resources.xml	2009-04-04 09:18:05 UTC (rev 42243)
@@ -2,56 +2,56 @@
 
 <project name="resources" default="deploy-resources" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
+<!--
   <target name="generate-resources-build" description="Generate resources build" depends="init">
+-->
 <!--
   <target name="generate-resources-build" description="Generate resources build" depends="init, set-classpath">
 -->
-<!-- The core needs to exist, because certain classes will be re-used within custom tasks
-  <target name="generate-resources-build" description="Generate resources build" depends="init, compile-core">
--->
+<!-- The core needs to exist, because certain classes will be re-used within custom tasks -->
+  <target name="generate-resources-build" description="Generate resources build" depends="init, compile-core, set-classpath">
     <echo>INFO: Generate build file to build resources</echo>
 
-    <!-- Build custom ant tasks -->
 <!--
-    <javac srcdir="${yanel.source.home}/src/build/java"
-           destdir="${classes.dir}"
-    />
+    <property name="property.classpath.compile" refid="classpath.compile"/>
+    <echo>COMPILE CORE CLASSPATH: ${property.classpath.compile}</echo>
 -->
 
-<!--
-    <taskdef name="merge-resource-types-configs" classpath="${yanel.source.home}/build/classes" classname="org.wyona.yanel.ant.MergeResourceTypesConfigsTask"/>
--->
+    <!-- Build custom ant tasks -->
+    <javac srcdir="${yanel.source.home}/src/build/java"
+           destdir="${classes.dir}">
+      <classpath refid="classpath.compile"/>
+    </javac>
 
-<!--
     <path id="classpath.taskdef.merge-resource-types-configs">
+      <pathelement path="${yanel.source.home}/src/build/"/> <!-- Location of log4j.properties (NOTE: The conf directory also contains a log4j.properties and hence this lines needs to be set first!) -->
       <pathelement path="${yanel.source.home}/conf/"/>
       <pathelement path="${yanel.source.home}/conf/local-foaf/"/>
-      <pathelement path="${yanel.source.home}/src/build/"/> <!++ Necessary to resolve log4j.properties ++>
-      <pathelement path="${classes.dir}"/>
-      <fileset dir="${yanel.source.home}/build/lib">
+      <pathelement path="${classes.dir}"/> <!-- Location of the custom ant tasks -->
+      <fileset dir="${yanel.source.home}/build/lib"> <!-- Location of yanel core lib -->
         <include name="*.jar"/>
       </fileset>
       <pathelement path="${maven2.cp}"/>
       <pathelement path="${maven2.compile.cp}"/>
     </path>
 
+<!-- DEBUG
     <property name="property.classpath.taskdef.merge-resource-types-configs" refid="classpath.taskdef.merge-resource-types-configs"/>
     <echo>CLASSPATH: ${property.classpath.taskdef.merge-resource-types-configs}</echo>
 -->
 
-<!--
     <taskdef name="merge-resource-types-configs" classpathref="classpath.taskdef.merge-resource-types-configs" classname="org.wyona.yanel.ant.MergeResourceTypesConfigsTask"/>
--->
+
 <!--
     <taskdef name="merge-resource-types-configs" classname="org.wyona.yanel.ant.MergeResourceTypesConfigsTask">
       <classpath refid="classpath.taskdef.merge-resource-types-configs"/>
     </taskdef>
 -->
-<!--
+
+<!-- TODO: An exception is thrown by the spring framework ...
     <merge-resource-types-configs defaultrealmsconfigdir="${yanel.source.home}/conf/" localrealmsconfigdir="${yanel.source.home}/${local.config.dir}/"/>
 -->
 
-
     <condition property="local.resource-types.config.exists">
       <available file="${yanel.source.home}/${local.config.dir}/local.resource-types.xml" type="file"/>
     </condition>