[jboss-svn-commits] JBL Code SVN: r15176 - in labs/jbossesb/trunk/product/tools/console: management-esb and 1 other directory.

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

Author: tcunning
Date: 2007-09-17 12:46:34 -0400 (Mon, 17 Sep 2007)
New Revision: 15176

Modified:
   labs/jbossesb/trunk/product/tools/console/build.xml
   labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
Log:
bug:JBESB-973
Make sure that jboss-esb.xml gets copied into management-esb.


Modified: labs/jbossesb/trunk/product/tools/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/build.xml	2007-09-17 16:29:51 UTC (rev 15175)
+++ labs/jbossesb/trunk/product/tools/console/build.xml	2007-09-17 16:46:34 UTC (rev 15176)
@@ -212,11 +212,15 @@
 	<target name="deploy-mgmt-console"
 		description="Deploy the management console">
 		<property name="db" value="hsqldb"/>
-		<echo>CONSOLE.DIR=[${console.dir}]</echo>
+		<property file="${console.dir}/management/${db}.properties"/>
+		<property name="console.dir" value="${basedir}"/>
 		<ant antfile="${console.dir}/management-esb/build.xml" target="esb">
-			<property name="console.dir" location="${console.dir}"/>	
+			<property name="console.dir" location="${console.dir}"/>
+			<property name="messaging.present" value="true"/>	
 		</ant>
-	
+
+		<copy file="${console.dir}/management-esb/src/main/resources/${db}/management-ds.xml"
+			todir="${org.jboss.esb.internal.dest}/${esb.server.name}/server/default/deploy" overwrite="true"/>
 		<copy file="${console.dir}/management-esb/src/main/resources/jbossesbmanagement-service.xml"
                         todir="${org.jboss.esb.internal.dest}/${esb.server.name}/server/default/deploy"
                         overwrite="true">

Modified: labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/build.xml	2007-09-17 16:29:51 UTC (rev 15175)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/build.xml	2007-09-17 16:46:34 UTC (rev 15176)
@@ -63,9 +63,9 @@
 	<target name="copy-metainf">
 		<mkdir dir="${build.dir}/META-INF" />
 		<copy todir="${build.dir}/META-INF" overwrite="true">
-			<fileset dir="${basedir}" includes="jboss-esb.xml" />
-			<fileset dir="${basedir}" includes="deployment.xml" />
-			<fileset dir="${basedir}" includes="jboss-service.xml"/>
+			<fileset dir="${mgmt.esb.dir}" includes="jboss-esb.xml" />
+			<fileset dir="${mgmt.esb.dir}" includes="deployment.xml" />
+			<fileset dir="${mgmt.esb.dir}" includes="jboss-service.xml"/>
 		</copy>
 	</target>