[jboss-svn-commits] JBL Code SVN: r26969 - in labs/jbossesb/workspace/dbevenius/jbossas5: qa and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 15 05:40:52 EDT 2009
Author: beve
Date: 2009-06-15 05:40:52 -0400 (Mon, 15 Jun 2009)
New Revision: 26969
Modified:
labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml
labs/jbossesb/workspace/dbevenius/jbossas5/qa/base-cp.xml
labs/jbossesb/workspace/dbevenius/jbossas5/qa/build.xml
Log:
still trying to sort the integration build out.
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml 2009-06-15 08:46:12 UTC (rev 26968)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml 2009-06-15 09:40:52 UTC (rev 26969)
@@ -15,6 +15,10 @@
<property name="build.lib.dir" value="${build.dir}/jbossesb/lib"/>
<property name="version" value="4.2.MR1"/>
<property name="installation.files.dir" value="${basedir}/install"/>
+
+ <condition property="skip.unzip" value="true">
+ <available file="${esb.server.home}"/>
+ </condition>
<condition property="skip.server.esb" value="true">
<equals arg1="${skip.unzip}" arg2="true"/>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml 2009-06-15 08:46:12 UTC (rev 26968)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml 2009-06-15 09:40:52 UTC (rev 26969)
@@ -35,7 +35,25 @@
<!-- Some default build locations -->
<property name="org.jboss.esb.internal.dest" location="${basedir}/build"/>
<property name="org.jboss.esb.internal.jar.dest" location="${basedir}/build/jbossesb/lib"/>
+
+ <!--
+ If esb.server.home has been set an external as server is to be used
+ and thus we should skip the unzip step of the standalone server.
+ -->
+ <condition property="skip.unzip" value="true">
+ <available file="${esb.server.home}"/>
+ </condition>
+ <condition property="org.jboss.esb.server.home" value="${esb.server.home}">
+ <available file="${esb.server.home}"/>
+ </condition>
+
+ <!--
+ We need to check skip.unzip because this build.xml calls it self using
+ the runant macro. We pass along the skip.unzip property but we also
+ need to check that it is true and does not contain the string "{skip.unzip}"
+ which inidcates that it was not set.
+ -->
<condition property="skip.unzip" value="true">
<or>
<isset property="${esb.server.home}"/>
@@ -541,18 +559,18 @@
</target>
<target name="start-server" depends="esb.setup-server">
- <start-server serverHome="${org.jboss.esb.server.home}"
+ <start-server serverHome="${esb.server.home}"
serverConfig="${org.jboss.esb.test.server.config}"/>
<wait-on-server/>
</target>
<target name="stop-server" depends="esb.init">
- <stop-server serverHome="${org.jboss.esb.server.home}"/>
+ <stop-server serverHome="${esb.server.home}"/>
<condition property="shutDownString" value="Server exit called, exiting the JVM now!" else="[org.jboss.system.server.Server] Shutdown complete">
- <available file="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}/deployers"/>
+ <available file="${esb.server.home}/server/${org.jboss.esb.test.server.config}/deployers"/>
</condition>
- <wait-on-shutdown serverHome="${org.jboss.esb.server.home}"
+ <wait-on-shutdown serverHome="${esb.server.home}"
serverConfig="${org.jboss.esb.test.server.config}"
shutDownString="${shutDownString}"
/>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml 2009-06-15 08:46:12 UTC (rev 26968)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml 2009-06-15 09:40:52 UTC (rev 26969)
@@ -46,7 +46,7 @@
<attribute name="serverConfig"/>
<element name="serverElements" implicit="yes" optional="true"/>
<sequential>
- <echo message="Starting local ESB server"/>
+ <echo message="Starting local ESB server: @{serverHome}/server/@{serverConfig}"/>
<echo message="java.endorsed.dirs : ${server.endorsed}"/>
<java classname="org.jboss.Main" fork="true" spawn="true"
dir="@{serverHome}/bin">
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/qa/base-cp.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/qa/base-cp.xml 2009-06-15 08:46:12 UTC (rev 26968)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/qa/base-cp.xml 2009-06-15 09:40:52 UTC (rev 26969)
@@ -93,7 +93,7 @@
<property name="org.jboss.esb.server.deploy.dir" location="${org.jboss.esb.server.server}/deploy"/>
<property name="org.jboss.esb.server.common.lib" location="${org.jboss.esb.server.home}/common/lib"/>
- <echo message="JBoss AS 5 compatible build = ${jbossas5}"/>
+ <echo message="JBoss AS 5 compatible build = ${jbossas5} server=${org.jboss.esb.server.server}"/>
<path id="base.cp">
<pathelement location="${product.dir}/build/lib/jaxr-api-1.0rc1.jar" />
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/qa/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/qa/build.xml 2009-06-15 08:46:12 UTC (rev 26968)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/qa/build.xml 2009-06-15 09:40:52 UTC (rev 26969)
@@ -15,6 +15,10 @@
<property name="build.location" location="build"/>
<property file="test.properties" />
+ <condition property="org.jboss.esb.server.home" value="${esb.server.home}">
+ <available file="${esb.server.home}"/>
+ </condition>
+
<import file="${product.dir}/esb-config.xml"/>
<property name="org.jboss.esb.properties" location="${product.dir}/product.properties"/>
@@ -44,7 +48,8 @@
<syspropertyset refid="org.jboss.esb.server"/>
<sysproperty key="ant.home" value="${ant.home}"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
- <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
+ <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
+ <sysproperty key="esb.server.home" value="${esb.server.home}"/>
<arg value="-cp"/>
<arg value="${junit.jar}"/>
<arg value="-f"/>
More information about the jboss-svn-commits
mailing list