[jboss-svn-commits] JBL Code SVN: r12151 - labs/jbossesb/trunk/product/samples/trailblazer.

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

Author: tcunning
Date: 2007-05-25 15:22:16 -0400 (Fri, 25 May 2007)
New Revision: 12151

Removed:
   labs/jbossesb/trunk/product/samples/trailblazer/build.properties
Modified:
   labs/jbossesb/trunk/product/samples/trailblazer/build.xml
   labs/jbossesb/trunk/product/samples/trailblazer/readme.txt
Log:
bug:JBESB-540
Fix build.


Deleted: labs/jbossesb/trunk/product/samples/trailblazer/build.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/build.properties	2007-05-25 19:06:32 UTC (rev 12150)
+++ labs/jbossesb/trunk/product/samples/trailblazer/build.properties	2007-05-25 19:22:16 UTC (rev 12151)
@@ -1,2 +0,0 @@
-org.jboss.soa.samples.trailblazer.jboss_home=/jbossesb-server-4.2
-org.jboss.soa.samples.trailblazer.jboss_server=default

Modified: labs/jbossesb/trunk/product/samples/trailblazer/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/build.xml	2007-05-25 19:06:32 UTC (rev 12150)
+++ labs/jbossesb/trunk/product/samples/trailblazer/build.xml	2007-05-25 19:22:16 UTC (rev 12151)
@@ -6,12 +6,10 @@
 	<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.0.5.GA"/>
+	<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="."/>
 
-	<property name="esb.home.dir" location="../../"/>
-
 	<!-- properties for the esb part of the trailblazer -->
 	<property name="esb.dest"     	value="${basedir}/esb/build"/>
 	<property name="classes.dir" 	value="${basedir}/esb/build/classes"/>
@@ -100,7 +98,11 @@
 		<delete dir="${esb.dest}"/>
 		<delete dir="${esb.samples.trailblazer.client.dest}"/>
 	</target>
-	
+
+	<!-- =================================================================== -->
+	<!-- wstools is not currently used, but is useful for producing WS	 -->
+	<!-- deployment files.							 -->
+	<!-- =================================================================== -->
 	<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
 		<classpath>
 			<pathelement location="client/lib/ext/jboss-jaxws.jar"/>
@@ -119,22 +121,16 @@
 		/>
 	</target>
 
-	<taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume">
-		<classpath>
-			<pathelement location="runtime/java-getopt-1.0.13.jar"/>
-			<pathelement location="client/lib/ext/jaxb-api.jar"/>
-			<pathelement location="client/lib/ext/jaxb-impl.jar"/>
-			<pathelement location="client/lib/ext/jbossws-wsconsume-impl.jar"/>
-			<pathelement location="client/lib/ext/jaxb-xjc.jar"/>
-			<pathelement location="client/lib/ext/jbossws-client.jar"/>
-			<pathelement location="client/lib/ext/jbossws-core.jar"/>
-		</classpath>
-	</taskdef>
-
 	<!-- =================================================================== -->
 	<!-- Prepares the directory structure                                    -->
 	<!-- =================================================================== -->
-	<target name="trailblazer.prepare" depends="clean">
+	<target name="esb.built" unless="soa.esb.lib.dir">
+		<echo>Please build the ESB with "ant dist" in the ESB parent</echo>
+		<echo>directory in order to run the Trailblazer application.</echo>
+		<fail>Please build ESB first.</fail>
+	</target>
+
+	<target name="trailblazer.prepare" depends="esb.built,clean" if="soa.esb.lib.dir">
 		<mkdir dir="${esb.dest}"/>
 		<mkdir dir="${esb.dest}/dist"/>
 		<mkdir dir="${esb.dest}/classes"/>

Modified: labs/jbossesb/trunk/product/samples/trailblazer/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/readme.txt	2007-05-25 19:06:32 UTC (rev 12150)
+++ labs/jbossesb/trunk/product/samples/trailblazer/readme.txt	2007-05-25 19:22:16 UTC (rev 12151)
@@ -13,12 +13,9 @@
 File: jbossesb-properties.xml (jbossesb.sar/jbossesb-properties.xml)
 - Update the section titled "transports" and specify all of the SMTP mail server settings for your environment.
 
-File: build.properties
-- update with the 2 settings below to where you have your JBoss deployed to, along with the server instance you are using:
-org.jboss.soa.samples.trailblazer.jboss_home=/opt/jboss-4.0.5
-org.jboss.soa.samples.trailblazer.jboss_server=default
+File : deployment.properties (install/deployment.properties)
+- Update the app server location settings.
 
-
 -------------------------------------------
 To run the Trailblazer, follow these steps: