[jboss-svn-commits] JBL Code SVN: r13763 - in labs/jbossesb/trunk/product: rosetta and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 24 11:11:23 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-07-24 11:11:23 -0400 (Tue, 24 Jul 2007)
New Revision: 13763
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/esb-config.xml
labs/jbossesb/trunk/product/product.properties
labs/jbossesb/trunk/product/rosetta/build.xml
labs/jbossesb/trunk/product/rosetta/tests/build.xml
Log:
Updated to deploy into AS: JBESB-737
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-07-24 14:23:49 UTC (rev 13762)
+++ labs/jbossesb/trunk/product/build.xml 2007-07-24 15:11:23 UTC (rev 13763)
@@ -26,8 +26,6 @@
<!-- Set module name -->
<property name="org.jboss.esb.internal.modulename" value="jbesb"/>
- <property name="org.jboss.esb.jboss.home" location="."/>
-
<!-- Product properties file -->
<property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
@@ -50,35 +48,23 @@
<property name="editor.dir" value="tools/configeditor/editor"/>
<!-- Compile with debugging? -->
- <property name="org.jboss.esb.debug" value="yes"/>
<condition property="org.jboss.esb.debug" value="no">
<equals arg1="${org.jboss.esb.build.debug}" arg2="no"/>
</condition>
+ <property name="org.jboss.esb.debug" value="yes"/>
<!-- Compile with deprecation? -->
- <property name="org.jboss.esb.deprecation" value="no"/>
<condition property="org.jboss.esb.deprecation" value="yes">
<equals arg1="${org.jboss.esb.build.deprecation}" arg2="yes"/>
</condition>
+ <property name="org.jboss.esb.deprecation" value="no"/>
<!-- Compile with optimization? -->
- <property name="org.jboss.esb.optimize" value="on"/>
<condition property="org.jboss.esb.optimize" value="off">
<equals arg1="${org.jboss.esb.build.optimize}" arg2="off"/>
</condition>
+ <property name="org.jboss.esb.optimize" value="on"/>
- <!-- Build from local libs? -->
- <property name="org.jboss.esb.frominstall" value="no"/>
- <condition property="org.jboss.esb.frominstall" value="yes">
- <equals arg1="${org.jboss.esb.build.frominstall}" arg2="yes"/>
- </condition>
-
- <!-- Build tests? -->
- <property name="org.jboss.esb.buildtests" value="no"/>
- <condition property="org.jboss.esb.buildtests" value="yes">
- <equals arg1="${org.jboss.esb.build.tests}" arg2="yes"/>
- </condition>
-
<!-- Path names -->
<property name="org.jboss.esb.internal.rosetta" value="esb"/>
<property name="org.jboss.esb.internal.dest" location="build"/>
Modified: labs/jbossesb/trunk/product/esb-config.xml
===================================================================
--- labs/jbossesb/trunk/product/esb-config.xml 2007-07-24 14:23:49 UTC (rev 13762)
+++ labs/jbossesb/trunk/product/esb-config.xml 2007-07-24 15:11:23 UTC (rev 13763)
@@ -106,12 +106,32 @@
<!-- Configuring an app server installation -->
<target name="esb.init-app-server" if="org.jboss.esb.server.home">
<property name="org.jboss.esb.test.server.config" value="test-esb"/>
+ <condition property="esb.server.config.nameclash">
+ <equals arg1="${org.jboss.esb.test.server.config}" arg2="${org.jboss.esb.server.config}"/>
+ </condition>
+ <fail if="esb.server.config.nameclash" message="Specified server config matches test profile name: ${org.jboss.esb.test.server.config}"/>
+
+ <property name="esb.server.deploy.dir"
+ value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+
+ <condition property="org.jboss.soa.esb.qa.jmsprovider" value="jbm">
+ <available file="${esb.server.deploy.dir}/jboss-messaging"/>
+ </condition>
+ <condition property="org.jboss.soa.esb.qa.jmsprovider" value="jbm">
+ <available file="${esb.server.deploy.dir}/jboss-messaging.sar"/>
+ </condition>
+
+ <condition property="org.jboss.soa.esb.qa.jmsprovider" value="jbmq">
+ <available file="${esb.server.deploy.dir}/jms/jbossmq-service.xml"/>
+ </condition>
+
+ <fail unless="org.jboss.soa.esb.qa.jmsprovider" message="Could not determine server messaging subsystem"/>
<property name="org.jboss.esb.server.config.appserver" value="true"/>
</target>
<target name="esb.configure-app-server" if="org.jboss.esb.server.config.appserver">
<property name="esb.target-dir" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}"/>
- <delete dir="${esb.target.dir}" quiet="true"/>
+ <delete dir="${esb.target-dir}" quiet="true"/>
<copy todir="${esb.target-dir}">
<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
Modified: labs/jbossesb/trunk/product/product.properties
===================================================================
--- labs/jbossesb/trunk/product/product.properties 2007-07-24 14:23:49 UTC (rev 13762)
+++ labs/jbossesb/trunk/product/product.properties 2007-07-24 15:11:23 UTC (rev 13763)
@@ -3,12 +3,11 @@
#
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.jboss.home=.
+# uncomment the following if you wish to use an app server installation
+# for tests instead of the included jbossesb-server
+#org.jboss.esb.server.home=<app server home>
# Uncomment all the ftp properties if you wish to override the ftp server
#org.jboss.esb.test.ftp.hostname=<hostname:port>
Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml 2007-07-24 14:23:49 UTC (rev 13762)
+++ labs/jbossesb/trunk/product/rosetta/build.xml 2007-07-24 15:11:23 UTC (rev 13763)
@@ -11,9 +11,6 @@
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
- <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
- </condition>
<path id="org.jboss.esb.rosetta.base.classpath">
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
Modified: labs/jbossesb/trunk/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/build.xml 2007-07-24 14:23:49 UTC (rev 13762)
+++ labs/jbossesb/trunk/product/rosetta/tests/build.xml 2007-07-24 15:11:23 UTC (rev 13763)
@@ -21,10 +21,6 @@
<property name="org.jboss.esb.test.persistdb.dir" location="${org.jboss.esb.internal.dest}/testdb"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
- <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
- </condition>
-
<property name="org.jboss.esb.ftp.lib.dir" location="${org.jboss.esb.root.dir}/ftp/lib"/>
<path id="org.jboss.esb.tests.base.classpath">
@@ -52,7 +48,7 @@
<delete file="TESTS-TestSuites.xml"/>
</target>
- <target name="org.jboss.esb.rosetta.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
+ <target name="org.jboss.esb.rosetta.tests.compile" depends="org.jboss.esb.tests.init">
<javac
destdir="${org.jboss.esb.tests.classes.dir}"
More information about the jboss-svn-commits
mailing list