[jboss-svn-commits] JBL Code SVN: r8031 - in labs/jbossesb/trunk/product/samples/trailblazer2: . esb/lib/ext

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

Author: kevin.conner at jboss.com
Date: 2006-12-01 12:33:31 -0500 (Fri, 01 Dec 2006)
New Revision: 8031

Added:
   labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/antlr-2.7.6.jar
   labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/c3p0-0.9.1-pre9.jar
   labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/commons-logging.jar
   labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/xercesImpl-2.7.1.jar
Modified:
   labs/jbossesb/trunk/product/samples/trailblazer2/build.xml
Log:
Fixed trailblazer to run in dist

Modified: labs/jbossesb/trunk/product/samples/trailblazer2/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer2/build.xml	2006-12-01 17:30:02 UTC (rev 8030)
+++ labs/jbossesb/trunk/product/samples/trailblazer2/build.xml	2006-12-01 17:33:31 UTC (rev 8031)
@@ -27,7 +27,7 @@
 
 	<property file="build.properties" />
 
-	<property name="org.jboss.soa.samples.trailblazer.esb_home"	 	value="../../"/>
+	<property name="org.jboss.soa.samples.trailblazer.esb_home"	 	location="../../"/>
 	
 	<!-- properties for the esb part of the trailblazer -->
 	<property name="org.jboss.esb.samples.trailblazer.esb.dest"        	value="${basedir}/esb/build"/>
@@ -50,10 +50,11 @@
 	<property environment="env" />
 
 	<!-- Build from ESB source? -->
-	<property name="org.jboss.soa.esb.lib.dir" value="${org.jboss.soa.esb.samples.trailblazer.esb_home}/build/dist"/>
 	<condition property="org.jboss.soa.esb.lib.dir" value="${org.jboss.soa.samples.trailblazer.esb_home}/lib">
 		<equals arg1="${org.jboss.soa.esb.buildfrom.distribution}" arg2="yes"/>
 	</condition>			
+	<property name="org.jboss.soa.esb.lib.dir" value="${org.jboss.soa.samples.trailblazer.esb_home}/build/jbossesb/lib"/>
+	<property name="org.jboss.soa.esb.lib.ext.dir" value="${org.jboss.soa.esb.lib.dir}/jbossesb.sar"/>
 	
 
 	<!-- classpath -->
@@ -62,18 +63,18 @@
 		    	 includes="jaxr-api-1.0.jar,scout-0.7rc2-embedded.jar,juddi-embedded.jar"/>
 		<fileset dir="${org.jboss.esb.samples.trailblazer.esb.lib.dir}/ext" includes="*.jar"/>
 		<fileset dir="${org.jboss.soa.samples.trailblazer.jboss_home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
-		<fileset dir="${org.jboss.soa.samples.trailblazer.esb_home}/build/dist/lib" includes="*.jar"/>
+		<fileset dir="${org.jboss.soa.esb.lib.dir}" includes="*.jar"/>
 		<fileset dir="${org.jboss.esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/>
 	</path>
 
 	<!-- classpath for running the listener-->
 	<path id="org.jboss.esb.samples.trailblazer.esb.classpath.run">
-		<fileset dir="${org.jboss.soa.samples.trailblazer.esb_home}/lib/ext"
+		<fileset dir="${org.jboss.soa.esb.lib.ext.dir}"
 				    	includes="jaxr-api-1.0.jar,scout-0.7rc2-embedded.jar,juddi-embedded.jar"/>
 		<fileset dir="${org.jboss.esb.samples.trailblazer.esb.dest}/dist" includes="trailblazer-esb.jar"/>
-		<fileset dir="${org.jboss.soa.samples.trailblazer.esb_home}/lib/ext" includes="*.jar" excludes="jaxr-api-1.0.jar,scout-0.7rc2-embedded.jar,juddi-embedded.jar"/>
+		<fileset dir="${org.jboss.soa.esb.lib.ext.dir}" includes="*.jar" excludes="jaxr-api-1.0.jar,scout-0.7rc2-embedded.jar,juddi-embedded.jar"/>
 		<fileset dir="${org.jboss.soa.samples.trailblazer.jboss_home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
-		<fileset dir="${org.jboss.soa.samples.trailblazer.esb_home}/build/dist/lib" includes="*.jar"/>
+		<fileset dir="${org.jboss.soa.esb.lib.dir}" includes="*.jar"/>
 		<fileset dir="${org.jboss.esb.samples.trailblazer.esb.lib.dir}/ext" includes="*.jar"/>
 		<!-- for finding the jbossesb-properties.xml file -->
 		<pathelement location="${basedir}"/>
@@ -84,7 +85,7 @@
 		    	 includes="jaxr-api-1.0.jar,scout-0.7rc2-embedded.jar,juddi-embedded.jar"/>
 		<fileset dir="${org.jboss.esb.samples.trailblazer.esb.lib.dir}/ext" includes="*.jar"/>
 		<fileset dir="${org.jboss.soa.samples.trailblazer.jboss_home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
-		<fileset dir="${org.jboss.soa.samples.trailblazer.esb_home}/build/dist/lib" includes="*.jar"/>
+		<fileset dir="${org.jboss.soa.esb.lib.dir}" includes="*.jar"/>
 		<fileset dir="${org.jboss.esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/>
 		<fileset dir="${org.jboss.esb.samples.trailblazer.esb.dest}/dist" includes="trailblazer-esb.jar"/>
 	</path>
@@ -153,7 +154,7 @@
 		        webxml="${basedir}/client/resources/web.xml">
 			<classes dir="${org.jboss.esb.samples.trailblazer.client.classes.dir}" includes="**/web/**/*.class"/>
 			<classes dir="${org.jboss.esb.samples.trailblazer.client.classes.dir}" includes="**/loanbroker/**/*.class"/>
-			<lib dir="${org.jboss.soa.samples.trailblazer.esb_home}/build/dist/lib">
+			<lib dir="${org.jboss.soa.esb.lib.dir}">
 				<include name="*.jar"/>
 			</lib>
 
@@ -165,7 +166,7 @@
 				<include name="axis.jar"/>
 				<include name="commons-discovery.jar"/>
 			</lib>
-			<lib dir="${org.jboss.soa.samples.trailblazer.esb_home}/lib/ext">
+			<lib dir="${org.jboss.soa.esb.lib.ext.dir}">
 				<include name="xbean-1.0.4.jar"/>
 				<include name="commons-discovery.jar"/>
 				<include name="jbossts-common.jar"/>
@@ -222,6 +223,12 @@
 	<!-- arg3 (if any) = location of the esb config file which describes the listener configurations for a NON-Message aware listener config (gateway)-->
 	<target name="runESB" depends="jar">
 		<echo>Running ESB Trailblazer listeners</echo>
+<!-- KEV -->
+<property name="org.jboss.esb.samples.trailblazer.esb.classpath.run" refid="org.jboss.esb.samples.trailblazer.esb.classpath.run"/>
+<echo>
+KEV: classpath is 
+${org.jboss.esb.samples.trailblazer.esb.classpath.run}
+</echo>
 		<java fork="yes" classname="org.jboss.soa.esb.samples.trailblazer.util.Launcher" failonerror="true" 
 			args="600 ${basedir}/esb/conf/jbossesb-listener.xml ${basedir}/esb/conf/jbossesb-gateway.xml">
 			<classpath refid="org.jboss.esb.samples.trailblazer.esb.classpath.run"/>

Added: labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/antlr-2.7.6.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/antlr-2.7.6.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/c3p0-0.9.1-pre9.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/c3p0-0.9.1-pre9.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/commons-logging.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/xercesImpl-2.7.1.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/samples/trailblazer2/esb/lib/ext/xercesImpl-2.7.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream