[jboss-svn-commits] JBL Code SVN: r32602 - in labs/jbossesb/branches/JBESB_4_7_CP: product/install and 1 other directories.

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

Author: dward
Date: 2010-04-23 10:12:16 -0400 (Fri, 23 Apr 2010)
New Revision: 32602

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml
   labs/jbossesb/branches/JBESB_4_7_CP/qa/base-cp.xml
Log:
Fix for JBESB-3285 ( https://jira.jboss.org/jira/browse/JBESB-3285 ).


Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml	2010-04-23 13:40:19 UTC (rev 32601)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml	2010-04-23 14:12:16 UTC (rev 32602)
@@ -88,7 +88,6 @@
 
         <mkdir dir="${build.dir}/jbossesb.sar/lib"/>
         <copy todir="${build.dir}/jbossesb.sar/lib">
-            <fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
             <fileset dir="${build.lib.dir}" includes="jbossesb*.jar" excludes="jbossesb-registry.jar"/>
             <!-- xbean for reading/marchalling xml for configuration, and scout -->
             <fileset dir="${lib.dir}" includes="xbean*.jar"/>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml	2010-04-23 13:40:19 UTC (rev 32601)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/install/build.xml	2010-04-23 14:12:16 UTC (rev 32602)
@@ -259,7 +259,6 @@
                 <include name="commons-ssl-*.jar"/>
                 <include name="commons-io-*.jar"/>
                 <include name="groovy-all-*.jar"/>
-                <include name="jbossts-common.jar"/>
                 <include name="jsch-*.jar"/>
                 <include name="mina-core-*.jar"/>
                 <include name="mina-filter-ssl-*.jar"/>
@@ -322,7 +321,6 @@
             	<exclude name="lib/commons-ssl-*.jar"/>
                 <exclude name="lib/commons-io-*.jar"/>
             	<exclude name="lib/groovy-all-*.jar"/>
-            	<exclude name="lib/jbossts-common.jar"/>
             	<exclude name="lib/jsch-*.jar"/>
             	<exclude name="lib/mina-core-*.jar"/>
             	<exclude name="lib/mina-filter-ssl-*.jar"/>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml	2010-04-23 13:40:19 UTC (rev 32601)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/ivy.xml	2010-04-23 14:12:16 UTC (rev 32602)
@@ -40,7 +40,6 @@
         <dependency org="jboss" name="jboss-system" rev="4.2.2.GA"/>
         <dependency org="jboss" name="jboss" rev="4.2.2.GA"/>
         <dependency org="jboss" name="jbossall-client" rev="4.2.2.GA"/>
-        <!-- dependency org="jboss" name="jbossts.jbossts-common" rev="4.2.2.GA"/ -->
         <dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
         <!-- temporary until 3.0.1 is pushed into maven.  Also need to add juddiv3.war
 	<dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.1"/>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/qa/base-cp.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/qa/base-cp.xml	2010-04-23 13:40:19 UTC (rev 32601)
+++ labs/jbossesb/branches/JBESB_4_7_CP/qa/base-cp.xml	2010-04-23 14:12:16 UTC (rev 32602)
@@ -37,6 +37,7 @@
 		<echo message="JBoss AS 4.x compatible build = ${jbossas4}"/>
 		<path id="base.cp">
 			<pathelement location="${product.dir}/build/lib/jaxr-api-1.0rc1.jar" />
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="jbossts-common.jar" /> <!-- Required for Arjuna Common Util Code. -->
 			<fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
 			<fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
 			<fileset dir="${org.jboss.esb.server.server}/lib"
@@ -156,6 +157,7 @@
             <fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-aop-*.jar"/>
 
             <!-- common lib jars -->
+            <fileset dir="${org.jboss.esb.server.common.lib}" includes="jbossts-common.jar"/> <!-- Required for Arjuna Common Util Code. -->
             <fileset dir="${org.jboss.esb.server.common.lib}" includes="bsh.jar"/>
             <fileset dir="${org.jboss.esb.server.common.lib}" includes="commons-collections.jar"/>
             <fileset dir="${org.jboss.esb.server.common.lib}" includes="jboss-jaxws.jar jboss-saaj.jar jbossws-common.jar jbossws-spi.jar"/>