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

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

Author: mark.little at jboss.com
Date: 2006-10-04 09:40:57 -0400 (Wed, 04 Oct 2006)
New Revision: 6576

Added:
   labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/README.txt
Modified:
   labs/jbossesb/trunk/product/product.properties
   labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/build.xml
   labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/loanbroker.properties.template
Log:
Build from installation as well as source tree.

Modified: labs/jbossesb/trunk/product/product.properties
===================================================================
--- labs/jbossesb/trunk/product/product.properties	2006-10-04 13:40:38 UTC (rev 6575)
+++ labs/jbossesb/trunk/product/product.properties	2006-10-04 13:40:57 UTC (rev 6576)
@@ -1,8 +1,11 @@
 # JBossESB ant properties file
 # $Id$
 #
-org.jboss.esb.deprecation=yes
-org.jboss.esb.optimize=off
+org.jboss.esb.build.deprecation=yes
+org.jboss.esb.build.optimize=off
+org.jboss.esb.build.frominstall=no
+org.jboss.esb.build.debug=yes
+org.jboss.esb.build.tests=no
+
 org.jboss.esb.alltests.build=yes
-org.jboss.esb.frominstall=no
-org.jboss.esb.jboss.home=.
+org.jboss.esb.jboss.home=.
\ No newline at end of file

Added: labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/README.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/README.txt	2006-10-04 13:40:38 UTC (rev 6575)
+++ labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/README.txt	2006-10-04 13:40:57 UTC (rev 6576)
@@ -0,0 +1 @@
+Edit the loanbroker.properties file before building.
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/build.xml	2006-10-04 13:40:38 UTC (rev 6575)
+++ labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/build.xml	2006-10-04 13:40:57 UTC (rev 6576)
@@ -13,7 +13,13 @@
 	<property name="org.jboss.esb.samples.loanbroker.smooks"      	   value="${basedir}/transform/smooks"/>
 	<property name="org.jboss.esb.samples.loanbroker.tests.report.dir" value="${basedir}/build/tests"/>
 	<property environment="env" />
-
+
+	<!-- Build from ESB source? -->
+	<property name="org.jboss.soa.esb.lib.dir" value="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/build/dist"/>
+	<condition property="org.jboss.soa.esb.lib.dir" value="${org.jboss.soa.esb.samples.loanbroker.esb_home}/lib">
+		<equals arg1="${org.jboss.soa.esb.buildfrom.distribution}" arg2="yes"/>
+	</condition>
+			
 	<!--
 		TODO: Can these classpaths be cleaned up any???
 	-->
@@ -27,9 +33,9 @@
 			includes="jboss-annotations-ejb3.jar jboss-ejb3.jar jboss-ejb3x.jar"/>
 		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.jboss_home}/server/default/deploy/jboss-aop-jdk50.deployer/" 
 			includes="jboss-aop-jdk50.jar jboss-aspect-library-jdk50.jar jboss-aop-jdk50.deployer/trove.jar"/>
-		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/build/dist/lib" 
+		<fileset dir="${org.jboss.soa.esb.lib.dir}" 
 			includes="jbossesb-rosetta.jar jbossesb-listeners.jar jbossesb-processors.jar jbossesb-services.jar"/>
-		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/lib/ext" 
+		<fileset dir="${org.jboss.soa.esb.lib.dir}/ext" 
 			includes="milyn*.jar commons*.jar xerces*.jar xalan*.jar xml-apis*.jar jbossts-rosetta.jar"/>
 	</path>
 	<path id="org.jboss.esb.samples.loanbroker.testclasspath">
@@ -42,9 +48,9 @@
 			includes="jboss-annotations-ejb3.jar jboss-ejb3.jar jboss-ejb3x.jar"/>
 		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.jboss_home}/server/default/deploy/jboss-aop-jdk50.deployer/" 
 			includes="jboss-aop-jdk50.jar jboss-aspect-library-jdk50.jar jboss-aop-jdk50.deployer/trove.jar"/>
-		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/build/dist/lib" 
+		<fileset dir="${org.jboss.soa.esb.lib.dir}" 
 			includes="jbossesb-rosetta.jar jbossesb-listeners.jar jbossesb-processors.jar jbossesb-services.jar"/>
-		<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/lib/ext" 
+		<fileset dir="${org.jboss.soa.esb.lib.dir}/ext" 
 			includes="milyn*.jar commons*.jar xerces*.jar xalan*.jar xml-apis*.jar jbossts-rosetta.jar"/>
 		<pathelement location="${org.jboss.esb.samples.loanbroker.classes.dir}"/>
 	</path>
@@ -105,7 +111,7 @@
 		<war    warfile="${org.jboss.esb.samples.loanbroker.dest}/dist/lib/loanbroker.war"
 		        webxml="${org.jboss.esb.samples.loanbroker.dest}/web.xml">
 			<classes dir="build/classes/loanbroker" includes="**/web/**/*.class"/>
-			<lib dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/build/dist/lib">
+			<lib dir="${org.jboss.soa.esb.lib.dir}">
 				<include name="*.jar"/>
 			</lib>
 			<lib dir="${org.jboss.esb.samples.loanbroker.dest}/dist/lib">

Modified: labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/loanbroker.properties.template
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/loanbroker.properties.template	2006-10-04 13:40:38 UTC (rev 6575)
+++ labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/loanbroker.properties.template	2006-10-04 13:40:57 UTC (rev 6576)
@@ -10,3 +10,6 @@
 # Structure.  If you've checked out the LoanBroker seperately, you'll need
 # to modify this property.
 org.jboss.soa.esb.samples.loanbroker.esb_home=../../../../../
+
+# Is this an ESB build from source, or a distribution?
+org.jboss.soa.esb.buildfrom.distribution=no