[jboss-svn-commits] JBL Code SVN: r12132 - labs/jbossesb/trunk/product/samples/quickstarts/conf.

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

Author: beve
Date: 2007-05-25 02:34:54 -0400 (Fri, 25 May 2007)
New Revision: 12132

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Fixed the issue with the bundled jbossesb server. I had not tested the base-build.xml with that configuration, only with the src distribution and the directory layout of the previous GA. I'll double check the different distribution packages with Burr to make sure that it is correct now. 


Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-05-25 00:47:44 UTC (rev 12131)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-05-25 06:34:54 UTC (rev 12132)
@@ -16,16 +16,9 @@
     <property name="build.dir" value="${basedir}/build" />
     <property name="classes" value="${build.dir}/classes" />
 
-	<!-- lib directory for jbossesb jar files.  -->
-	<condition property="esb.product.lib.dir" 
-		value="${product.dir}/build/jbossesb/lib" else="${product.dir}/lib">
-		<available file="${product.dir}/build/jbossesb/lib/jbossesb-rosetta.jar"/>
-	</condition>
-	<!-- fail if this is not a GA release distribution and the project has not yet been built -->	
-	<available file="${esb.product.lib.dir}/jbossesb-rosetta.jar" property="lib.exists" />
-	<fail unless="lib.exists" message="JBossESB must be built. Please run 'ant' in ${product.dir}"/>
-	
-	<!-- check if org.jboss.esb.jboss.server.home has been specified in quickstarts.properites -->
+	<!-- 
+		check if org.jboss.esb.jboss.server.home has been specified in quickstarts.properites 
+	-->
 	<condition
 		property="org.jboss.esb.server.home"  
 		value="${quickstart.org.jboss.esb.server.home}" 
@@ -33,11 +26,14 @@
 		<isset property="quickstart.org.jboss.esb.server.home"/>
 	</condition>
 	
-	<!-- check if org.jboss.esb.jboss.server.config has been specified in quickstarts.properites -->
+	<!-- 
+		check if org.jboss.esb.jboss.server.config has been specified in quickstarts.properites 
+		default = "default"
+	-->
 	<condition 
 		property="org.jboss.esb.server.config" 
 		value="${quickstart.org.jboss.esb.server.config}"
-		else="${install.org.jboss.esb.server.config}"> 
+		else="default"> 
 		<isset property="quickstart.org.jboss.esb.server.config"/>
 	</condition>
 	
@@ -45,6 +41,41 @@
 	<property name="org.jboss.esb.server.deploy.dir" 
 		value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
 	
+
+	<!-- lib directory for jbossesb jar files.  
+		 src distribution 		= ${product.dir}/build/jbossesb/lib
+		 bundled distribution	= ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib
+		 ga 					= ${product.dir}/lib ? Need to verify all possible distributions. Daniel 20070525
+	-->
+	<condition property="esb.product.lib.dir.src.or.ga" 
+		value="${product.dir}/build/jbossesb/lib" else="${product.dir}/lib/ext">
+		<available file="${product.dir}/build/jbossesb/lib/jbossesb-rosetta.jar"/>
+	</condition>
+
+	<condition property="esb.product.lib.dir" 
+		value="${esb.product.lib.dir.src.or.ga}" else="${product.dir}/server/default/deploy/jbossesb.sar/lib">
+		<available file="${esb.product.lib.dir.src.or.ga}/jbossesb-rosetta.jar"/>
+	</condition>
+
+	<!-- fail if this is not a GA release distribution and the project has not yet been built -->	
+	<available file="${esb.product.lib.dir}/jbossesb-rosetta.jar" property="lib.exists" />
+
+	<!-- ext lib directory 
+		 src distribution 		= product/lib/ext
+		 bundled distribution	= ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib
+		 ga 					= ${product.dir}/lib ? Need to verify all possible distributions. Daniel 20070525
+	-->
+    <condition property="esb.ext.lib.dir.src.or.bundled"
+        value="${product.dir}/lib/ext" else="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib">
+        <available file="${product.dir}/lib/ext" type="dir"/>
+    </condition>
+    <condition property="esb.ext.lib.dir"
+        value="${esb.ext.lib.dir.src.or.bundled}" else="${product.dir}/lib">
+		<isset property="esb.ext.lib.dir.src.or.bundled"/>
+    </condition>
+
+	<fail unless="lib.exists" message="JBossESB must be built. Please run 'ant' in ${product.dir}"/>
+	
 	<!-- check if the application server support JBoss Messaging or JBossMQ -->
 	<condition property="jms.destinations.file" 
 			value="esb-quickstart-jbm-service.xml" else="esb-quickstart-jbmq-service.xml">
@@ -74,16 +105,22 @@
 
         <path refid="quickstart-dependencies-classpath" />
         <path refid="quickstart-lib-classpath" />
-        <fileset dir="${product.dir}/lib/ext" includes="*.jar" /> <!-- Product Dependencies. -->
+        <fileset dir="${esb.ext.lib.dir}" includes="*.jar" /> <!-- Product Dependencies. -->
+        <fileset dir="${product.dir}/lib" includes="*.jar" /> <!-- Product Dependencies. -->
 		<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
+		<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
 	</path>
 
 	<path id="exec-classpath">
 		<pathelement location="." />
         <pathelement location="${basedir}/src" />
 		<pathelement location="${classes}" />
+		<fileset dir="${org.jboss.esb.server.home}/server/default/lib" includes="jboss-remoting.jar" /> <!-- Required for JMS Client Code. -->
+		<fileset dir="${org.jboss.esb.server.home}/server/default/lib" includes="jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
+		<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
+		<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+		<!--fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /--> <!-- Required for JMS Client Code. -->
 		<path refid="compile-classpath" />
-		<fileset dir="${org.jboss.esb.server.home}/server/default/lib" includes="jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
 	</path>
     </target>
 
@@ -239,6 +276,7 @@
 			product.dir : ${product.dir}
 			install.dir : ${install.dir}
 			esb.product.lib.dir : ${esb.product.lib.dir}
+			esb.ext.lib.dir : ${esb.ext.lib.dir}
 			org.jboss.esb.server.home : ${org.jboss.esb.server.home}
 			org.jboss.esb.server.config : ${org.jboss.esb.server.config}
 			org.jboss.esb.jboss.server.deploy.dir : ${org.jboss.esb.server.deploy.dir}