[jboss-svn-commits] JBL Code SVN: r16999 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer: client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker and 1 other directory.

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

Author: tcunning
Date: 2007-12-03 18:17:59 -0500 (Mon, 03 Dec 2007)
New Revision: 16999

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer/build.xml
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
Log:
bug:JBESB-1206
Fix classpath so that it works within the ESB source tree and also
within the standalone server.


Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer/build.xml	2007-12-03 22:45:54 UTC (rev 16998)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer/build.xml	2007-12-03 23:17:59 UTC (rev 16999)
@@ -6,8 +6,6 @@
 	<property name="install.dir" value="${esb.home.dir}/install"/>
 	<property file="${install.dir}/deployment.properties"/>
 
-	<property name="org.jboss.esb.server.home" value="/jboss-4.2.0.GA"/>
-	<property name="org.jboss.esb.server.config" value="default"/>
 	<property name="trailblazer.dir" value="."/>
 
 	<!-- properties for the esb part of the trailblazer -->
@@ -39,38 +37,68 @@
 	<property environment="env" />
 
 	<property name="esb.lib.file" value="jbossesb-rosetta.jar"/>
-	<property name="soa.esb.lib.dist.dir" value="${esb.home.dir}/lib"/>
+	<property name="soa.esb.lib.dist.dir" value="${esb.home.dir}/../../lib"/>
 	<property name="soa.esb.lib.src.dir" value="../../build/jbossesb/lib"/>
+	<property name="esb.default.dir" value="../../server/default"/>
+	<property name="esb.sar.lib.dir" value="${esb.default.dir}/deploy/jbossesb.sar/lib"/>
 
+        <!-- Path to server -->
+        <available file="jbossws.sar"
+            filepath="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"
+            property="soa.esb.config.dir"
+            value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+
+        <available file="jbossws.sar"
+           filepath="${esb.default.dir}/deploy"
+           property="soa.esb.config.dir"
+           value="${esb.default.dir}"/>
+
+	<!-- Path to ESB libs -->
 	<available file="${esb.lib.file}"
-            filepath="${soa.esb.lib.dist.dir}"
-            property="soa.esb.lib.dir"
-            value="${soa.esb.lib.dist.dir}"/>
+	    filepath="${soa.esb.config.dir}/deploy/jbossesb.sar/lib"
+	    property="soa.esb.lib.dir"
+	    value="${soa.esb.config.dir}/deploy/jbossesb.sar/lib"/>
 
-	<available file="${esb.lib.file}"
+	<!-- Path to log4j.jar -->
+	<available file="client"
+	    filepath="${org.jboss.esb.server.home}"
+	    property="log4j.lib.dir"
+ 	    value="${org.jboss.esb.server.home}/client"/>
+
+	<available file="log4j.jar"
+	    filepath="${soa.esb.lib.dist.dir}/ext"
+	    property="log4j.lib.dir"
+	    value="${soa.esb.lib.dist.dir}/ext"/>
+
+        <!-- Path to testutil.jar -->
+        <available file="test-util.jar"
             filepath="${soa.esb.lib.src.dir}"
-            property="soa.esb.lib.dir"
+            property="test.util.dir"
             value="${soa.esb.lib.src.dir}"/>
 
-	<property name="soa.esb.lib.ext.dir" value="${soa.esb.lib.dir}/ext"/>
+        <available file="test-util.jar"
+            filepath="${trailblazer.dir}/esb/lib/ext"
+            property="test.util.dir"
+            value="${trailblazer.dir}/esb/lib/ext"/>
 
 	<!-- classpath -->
 	<path id="esb.samples.trailblazer.esb.classpath">
-		<fileset dir="${soa.esb.lib.dir}/ext" includes="*.jar"/>
+		<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
 		<fileset dir="${esb.lib.dir}/ext" includes="*.jar"/>
-		<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
-		<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
+		<fileset dir="${soa.esb.config.dir}/lib" includes="mail.jar antlr.jar"/>
 		<fileset dir="${esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/>
+		<fileset dir="${test.util.dir}" includes="test-util.jar"/>
+		<fileset dir="${log4j.lib.dir}" includes="log4j.jar"/>
 	</path>
 
 	<!-- classpath for running the listener-->
 	<path id="esb.samples.trailblazer.esb.classpath.run">
-		<fileset dir="${soa.esb.lib.ext.dir}"
+		<fileset dir="${soa.esb.lib.dir}"
 			includes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
 		<fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/>
 		<fileset dir="${esb.home.dir}/lib/ext" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
-		<fileset dir="${soa.esb.lib.ext.dir}" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
-		<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
+		<fileset dir="${soa.esb.lib.dir}" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
+		<fileset dir="${log4j.lib.dir}" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
 		<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
 		<fileset dir="${esb.lib.dir}/ext" includes="*.jar"/>
 		<!-- for finding the jbossesb-properties.xml file -->
@@ -78,10 +106,10 @@
 	</path>
 
 	<path id="esb.samples.trailblazer.esb.classpath.client">
-		<fileset dir="${soa.esb.lib.ext.dir}"/>
+		<fileset dir="${soa.esb.lib.dir}"/>
 		<fileset dir="${esb.lib.dir}/ext" includes="*.jar"/>
-		<fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-jaxrpc.jar jbossall-client.jar jbossws-client.jar mail.jar"/>
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossws.sar" includes="jboss-jaxrpc.jar"/>
+		<fileset dir="${log4j.lib.dir}" includes="jboss-jaxrpc.jar jbossall-client.jar jbossws-client.jar mail.jar log4j.jar"/>
+		<fileset dir="${soa.esb.config.dir}/deploy/jbossws.sar" includes="jboss-jaxrpc.jar"/>
 		<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
 		<fileset dir="${esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/>
 		<fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/>

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java	2007-12-03 22:45:54 UTC (rev 16998)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java	2007-12-03 23:17:59 UTC (rev 16999)
@@ -125,7 +125,7 @@
         }
     }
 
-    private int sendToCreditAgency(Customer customer) {d
+    private int sendToCreditAgency(Customer customer) {
         Message message = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
         Message replyMessage;
         int score = 0;