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

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

Author: tcunning
Date: 2007-08-29 07:34:41 -0400 (Wed, 29 Aug 2007)
New Revision: 14726

Modified:
   labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
   labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml
   labs/jbossesb/trunk/product/tools/console/management/build.xml
Log:
bug:JBESB-927
Fix build of management/monitoring console in build/jbossesb-server-4.2


Modified: labs/jbossesb/trunk/product/tools/console/management/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/build.xml	2007-08-29 11:32:37 UTC (rev 14725)
+++ labs/jbossesb/trunk/product/tools/console/management/build.xml	2007-08-29 11:34:41 UTC (rev 14726)
@@ -8,24 +8,33 @@
 	<property name="mgmt.build.dir" location="${mgmt.dir}/build"/>
 	<property name="src.java.dir" location="${mgmt.dir}/src/main/java"/>
 
-	<path id="build.classpath">
-		<fileset dir="${esb.root.dir}/tools/console/management-web/lib">
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${esb.root.dir}/lib/ext">
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${mgmt.dir}/lib">
-			<include name="*.jar"/>
-		</fileset>
-		<fileset refid="lib"/>
-	</path>
-
 	<target name="clean">
 		<delete dir="${mgmt.build.dir}"/>
 	</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"/>
+		</condition>	
+		
+		<path id="build.classpath">
+			<fileset dir="${esb.root.dir}/tools/console/management-web/lib">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${esb.lib.dir}">
+			<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${mgmt.dir}/lib">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset refid="lib"/>
+		</path>
+
                 <condition property="lib.dir.path"
 			value="${mgmt.dir}/../../../lib">
                         <available type="dir" file="${mgmt.dir}/../../../lib"/>

Modified: labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/build.xml	2007-08-29 11:32:37 UTC (rev 14725)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/build.xml	2007-08-29 11:34:41 UTC (rev 14726)
@@ -12,6 +12,10 @@
 	<property file="${console.dir}/management/${db}.properties"/>
 	<property name="build.dir" location="${mgmt.esb.dir}/build"/>
 
+	<!-- 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"/>
 		<ant dir="${console.dir}/management-web" target="clean"/>

Modified: labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml	2007-08-29 11:32:37 UTC (rev 14725)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml	2007-08-29 11:34:41 UTC (rev 14726)
@@ -8,7 +8,7 @@
    <local-tx-datasource>
       <jndi-name>ManagementDS</jndi-name>
 
-      <connection-url>jdbc:oracle:thin:@192.168.146.129:1521:VFADV</connection-url>
+      <connection-url>jdbc:oracle:thin:@192.168.146.129:1521:ORADV</connection-url>
 
       <!-- The driver class -->
       <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>