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

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

Author: tcunning
Date: 2007-08-20 15:15:54 -0400 (Mon, 20 Aug 2007)
New Revision: 14391

Added:
   labs/jbossesb/trunk/product/tools/console/management/lib/
   labs/jbossesb/trunk/product/tools/console/management/lib/servlet-api.jar
Modified:
   labs/jbossesb/trunk/product/tools/console/build.xml
   labs/jbossesb/trunk/product/tools/console/management/build.xml
Log:
bug:JBESB-738
Make sure we can build from build/jbossesb and from product/tools/console


Modified: labs/jbossesb/trunk/product/tools/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/build.xml	2007-08-20 18:07:37 UTC (rev 14390)
+++ labs/jbossesb/trunk/product/tools/console/build.xml	2007-08-20 19:15:54 UTC (rev 14391)
@@ -187,9 +187,17 @@
 	
     <target name="dist" depends="jar,war,ear,test">
     	<property name="install.console.dir"  location="${install.tools.dir}/console" />
-
+	<property name="install.management.dir" location="${install.tools.dir}"/>
     	<mkdir dir="${install.console.dir}"/>
-    	
+   
+	<mkdir dir="${install.management.dir}"/>
+		<copy todir="${install.management.dir}">
+			<fileset dir="${basedir}">
+				<include name="management/**"/>
+				<include name="management-web/**"/>
+				<include name="management-esb/**"/>
+			</fileset>
+		</copy>	
 		<!-- Copy the build related files to the "tools" folder. -->
 		<copy todir="${install.console.dir}">
 			<fileset dir="${exploded.archives.dir}"/>

Modified: labs/jbossesb/trunk/product/tools/console/management/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/build.xml	2007-08-20 18:07:37 UTC (rev 14390)
+++ labs/jbossesb/trunk/product/tools/console/management/build.xml	2007-08-20 19:15:54 UTC (rev 14391)
@@ -4,14 +4,10 @@
 	<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="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"/>
-	
-	<fileset id="lib" dir="${lib.dir}">
-		<include name="*.jar" />
-	</fileset>
-	
+
 	<path id="build.classpath">
 		<fileset dir="${esb.root.dir}/tools/console/management-web/lib">
 			<include name="*.jar"/>
@@ -19,6 +15,9 @@
 		<fileset dir="${esb.root.dir}/lib/ext">
 			<include name="*.jar"/>
 		</fileset>
+		<fileset dir="${mgmt.dir}/lib">
+			<include name="*.jar"/>
+		</fileset>
 		<fileset refid="lib"/>
 	</path>
 
@@ -26,7 +25,30 @@
 		<delete dir="${mgmt.build.dir}"/>
 	</target>
 
-	<target name="init">
+        <target name="define-lib">
+                <condition property="lib.dir.path"
+			value="${mgmt.dir}/../../../lib">
+                        <available type="dir" file="${mgmt.dir}/../../../lib"/>
+                </condition>
+
+                <condition property="lib.dir.path" value="${mgmt.dir}/./lib">
+                        <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">
 		<mkdir dir="${mgmt.build.dir}"/>
 		<mkdir dir="${mgmt.build.dir}/classes"/>
 	</target>
@@ -43,8 +65,8 @@
 				target="1.5"
 			    	deprecation="${javac.deprecation}" 
 			        nowarn="on">
+			<src path="${rosetta.src}"/>
 			<src path="${src.java.dir}"/>
-                	<src path="${esb.root.dir}/rosetta/src"/>
 		</javac>
 		<copy file="${mgmt.dir}/src/main/resources/${db}/monitoring-mappings.hbm.xml"
 			todir="build/classes/org/jboss/soa/esb/monitoring">

Added: labs/jbossesb/trunk/product/tools/console/management/lib/servlet-api.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/tools/console/management/lib/servlet-api.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream