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

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

Author: mark.little at jboss.com
Date: 2009-02-13 08:13:05 -0500 (Fri, 13 Feb 2009)
New Revision: 25250

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml
Log:
https://jira.jboss.org/jira/browse/JBESB-2264

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml	2009-02-13 06:26:49 UTC (rev 25249)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml	2009-02-13 13:13:05 UTC (rev 25250)
@@ -14,7 +14,6 @@
 
 	<!-- Default deploy property settings for the jbossesb-server -->
 	<property name="org.jboss.esb.server.home" value="${product.dir}"/>
-	<property name="org.jboss.esb.server.config" value="default"/>
 
 	<target name="clean">
 		<delete dir="${mgmt.esb.dir}/build"/>
@@ -22,9 +21,36 @@
 		<ant dir="${console.dir}/management" target="clean"/>
 	</target>
 
-	<target name="messaging-config">
-        	<property name="org.jboss.esb.server.deploy.dir"
-            		value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+	<target name="initialise-config" unless="org.jboss.esb.server.config">
+		<condition property="jbossesb-server-production">
+			<available file="${org.jboss.esb.server.home}/server/production/deploy/jbossesb.sar"/>
+		</condition>
+		<condition property="jbossesb-server-default">
+			<available file="${org.jboss.esb.server.home}/server/default/deploy/jbossesb.sar"/>
+		</condition>
+
+		<condition property="jbossesb-server-recognised">
+			<or>
+				<isset property="jbossesb-server-production"/>
+				<isset property="jbossesb-server-default"/>
+			</or>
+		</condition>
+
+		<fail unless="jbossesb-server-recognised" message="Could not detect default ESB server instance"/>
+
+		<condition property="org.jboss.esb.server.config"
+			value="production">
+			<isset property="jbossesb-server-production"/>
+		</condition>
+		<condition property="org.jboss.esb.server.config"
+			value="default">
+			<isset property="jbossesb-server-default"/>
+		</condition>
+	</target>
+
+	<target name="initialise-messaging" depends="initialise-config">
+		<property name="org.jboss.esb.server.deploy.dir"
+			value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
 			
 		<condition property="messaging.present">
 			<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
@@ -69,7 +95,7 @@
 		</copy>
 	</target>
 
-	<target name="esb" depends="messaging-config,messaging-dependencies,jbossmq-dependencies,build-war,copy-metainf"
+	<target name="esb" depends="initialise-messaging,messaging-dependencies,jbossmq-dependencies,build-war,copy-metainf"
 		description="Build the management ESB">
 		<mkdir dir="${mgmt.esb.dir}/build"/>	
 		<mkdir dir="${mgmt.esb.dir}/build/META-INF"/>
@@ -107,7 +133,7 @@
 		</jar>
 	</target>
 
-	<target name="copy-datasource" if="management.ds.available">
+	<target name="copy-datasource" if="management.ds.available" depends="initialise-config">
 		<filter token="db.username" value="${db.username}"/>
 		<filter token="db.password" value="${db.password}"/>
 		<copy file="${mgmt.esb.dir}/src/main/resources/${db}/management-ds.xml" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" filtering="true" overwrite="true"/>
@@ -116,4 +142,4 @@
 	<target name="deploy" depends="esb,copy-datasource" description="Deploy the WAR">
 		<copy file="${mgmt.esb.dir}/build/management.esb" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" overwrite="true"/>
 	</target> 
-</project>
+</project>
\ No newline at end of file