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

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

Author: kevin.conner at jboss.com
Date: 2008-11-07 05:54:09 -0500 (Fri, 07 Nov 2008)
New Revision: 23773

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/build.xml
Log:
Tidy up management build.xml: JBESB-2172

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/build.xml	2008-11-07 06:38:19 UTC (rev 23772)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/build.xml	2008-11-07 10:54:09 UTC (rev 23773)
@@ -4,7 +4,6 @@
 	<property name="console.dir" value="${esb.root.dir}/tools/console"/>
 	<property file="${esb.root.dir}/tools/console/management-esb/db.properties"/>	
 	<property name="mgmt.dir" location="."/>
-	<property name="lib.dir" location="${mgmt.dir}/../../../lib"/>
 	<property name="mgmt.build.dir" location="${mgmt.dir}/build"/>
 	<property name="src.java.dir" location="${mgmt.dir}/src/main/java"/>
 
@@ -12,28 +11,47 @@
 		<delete dir="${mgmt.build.dir}"/>
 	</target>
 
+	<!-- Are we embedded in a source hierarchy? -->
+	<condition property="hierarchy.source">
+		<available file="${esb.root.dir}/build-distr.xml"/>
+	</condition>
+	<!-- Are we embedded in a jbossesb distribution hierarchy? -->
+	<condition property="hierarchy.jbossesb">
+		<or>
+			<available file="${esb.root.dir}/JBossORG-EULA.txt"/>
+			<available file="${esb.root.dir}/JEMS-EULA.txt"/>
+		</or>
+	</condition>
+
+	<target name="dependencies" depends="dependencies.source, dependencies.jbossesb"/>
+	<target name="dependencies.jbossesb" if="hierarchy.jbossesb">
+		<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}"/>
+
+		<path id="lib.jars">
+			<fileset dir="${mgmt.dir}/../../../lib/ext" includes="*.jar"/>
+			<fileset dir="${mgmt.dir}/../../../build/jbossesb/lib" includes="*.jar"/>
+		</path>
+	</target>
+
         <target name="define-lib">
 		<condition property="esb.lib.dir" 
 			value="${esb.root.dir}/lib/ext">
 			<available type="dir" file="${esb.root.dir}/lib/ext"/>
 		</condition>
 		<condition property="esb.lib.dir"
-			value="${esb.root.dir}/server/default/deploy/jbossesb.sar/lib">
-			<available type="dir" file="${esb.root.dir}/server/default/deploy/jbossesb.sar/lib"/>
+			value="${esb.root.dir}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib">
+			<available type="dir" file="${esb.root.dir}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib"/>
 		</condition>	
-                <condition property="esb.lib.dir"
-                         value="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib">
-                         <available type="dir" file="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib"/>
-                </condition> 
-		<condition property="esb.lib.dir"
-                         value="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib">
-                         <available type="dir" file="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib"/>
+		<condition property="server.lib.dir" value="../../../server/${org.jboss.esb.server.config}/lib">
+                        <available type="dir" file="../../../server/${org.jboss.esb.server.config}/lib" />
                 </condition>
-		<condition property="server.lib.dir"
-			value="../../../server/default/lib">
-                        <available type="dir" file="../../../server/default/lib"
-/>
-                </condition>
                 <property name="server.lib.dir" value="${esb.lib.dir}"/>	
 		<path id="build.classpath">
 			<fileset dir="${esb.root.dir}/tools/console/management-web/lib">
@@ -48,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"
@@ -60,20 +78,10 @@
                         <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>
-		<condition property="rosetta.src" value="${src.java.dir}">
-			<available type="dir" file="${src.java.dir}"/>
-		</condition>
                 <property name="lib.dir" location="lib.dir.path"/>
         </target>
 
-	<target name="init" depends="define-lib">
+	<target name="init" depends="dependencies, define-lib">
 		<mkdir dir="${mgmt.build.dir}"/>
 		<mkdir dir="${mgmt.build.dir}/classes"/>
 	</target>
@@ -81,16 +89,15 @@
 	<target name="compile" depends="init" 
 			description="Build the management war">
 		<echo>${esb.root.dir}</echo>
+
 		<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}"/>
 		</javac>
 		<copy file="${mgmt.dir}/src/main/resources/${db}/monitoring-mappings.hbm.xml"