[jboss-svn-commits] JBL Code SVN: r23387 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-10-09 05:58:37 -0400 (Thu, 09 Oct 2008)
New Revision: 23387

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/build.xml
Log:
Remove implicit compilation of rosetta src: JBESB-2103

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/build.xml	2008-10-09 08:35:04 UTC (rev 23386)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/build.xml	2008-10-09 09:58:37 UTC (rev 23387)
@@ -25,14 +25,19 @@
 
     <target name="dependencies" depends="dependencies.source, dependencies.jbossesb"/>
     <target name="dependencies.jbossesb" if="hierarchy.jbossesb">
-        <property name="lib.dir" location="${mgmt.dir}/../../../lib"/>
+        <path id="lib.jars">
+            <fileset dir="${mgmt.dir}/../../../lib" includes="*.jar"/>
+        </path>
     </target>
     <target name="dependencies.source" if="hierarchy.source">
         <available file="${esb.root.dir}/build/jbossesb" property="dist.exists"/>
         <fail unless="dist.exists"
               message="JBossESB must be built. Please run 'ant dist' in ${esb.root.dir}"/>
 
-        <property name="lib.dir" location="${mgmt.dir}/../../../build/lib"/>
+        <path id="lib.jars">
+            <fileset dir="${mgmt.dir}/../../../build/lib" includes="*.jar"/>
+            <fileset dir="${mgmt.dir}/../../../build/jbossesb/lib" includes="*.jar"/>
+        </path>
     </target>
 
     <target name="define-lib">
@@ -61,7 +66,7 @@
             <fileset dir="${mgmt.dir}/lib">
                 <include name="*.jar"/>
             </fileset>
-            <fileset refid="lib"/>
+            <path refid="lib.jars"/>
         </path>
 
         <condition property="lib.dir.path"
@@ -73,10 +78,6 @@
             <available type="dir" file="${mgmt.dir}/./lib"/>
         </condition>
 
-        <fileset id="lib" dir="${lib.dir}">
-            <include name="*.jar"/>
-        </fileset>
-
         <condition property="rosetta.src" value="${esb.root.dir}/rosetta/src">
             <available type="dir" file="${esb.root.dir}/rosetta/src"/>
         </condition>
@@ -94,17 +95,25 @@
     <target name="compile" depends="init"
             description="Build the management war">
         <echo>${esb.root.dir}</echo>
+
+        <delete dir="${mgmt.build.dir}/src" quiet="true"/>
+        <mkdir dir="${mgmt.build.dir}/src"/>
+        <copy todir="${mgmt.build.dir}/src">
+          <fileset dir="${rosetta.src}">
+            <include name="org/jboss/soa/esb/monitoring/**"/>
+          </fileset>
+        </copy>
+
         <mkdir dir="${mgmt.build.dir}/classes"/>
         <javac classpathref="build.classpath"
                destdir="${mgmt.build.dir}/classes"
                debug="on"
-               includes="org/jboss/soa/esb/monitoring/**"
                source="1.5"
                target="1.5"
                deprecation="${javac.deprecation}"
                nowarn="on">
-            <src path="${rosetta.src}"/>
             <src path="${src.java.dir}"/>
+            <src path="${mgmt.build.dir}/src"/>
         </javac>
         <copy file="${mgmt.dir}/src/main/resources/${db}/monitoring-mappings.hbm.xml"
               todir="build/classes/org/jboss/soa/esb/monitoring">