[jboss-svn-commits] JBL Code SVN: r21322 - in labs/jbossesb/trunk: product/lib/ext and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 1 11:52:43 EDT 2008
Author: tfennelly
Date: 2008-08-01 11:52:42 -0400 (Fri, 01 Aug 2008)
New Revision: 21322
Removed:
labs/jbossesb/trunk/product/lib/ext/activation.jar
labs/jbossesb/trunk/product/lib/ext/asm.jar
labs/jbossesb/trunk/product/lib/ext/cglib-2.1_3.jar
labs/jbossesb/trunk/product/lib/ext/commons-collections-3.2.jar
labs/jbossesb/trunk/product/lib/ext/javassist.jar
labs/jbossesb/trunk/product/lib/ext/jaxr-api-1.0rc1.jar
labs/jbossesb/trunk/product/lib/ext/jboss-aop-jdk50.jar
labs/jbossesb/trunk/product/lib/ext/jsch-0.1.38.jar
labs/jbossesb/trunk/product/lib/ext/juddi-client-2.0rc5.jar
labs/jbossesb/trunk/product/lib/ext/mail.jar
labs/jbossesb/trunk/product/lib/ext/scout-1.0rc1.jar
labs/jbossesb/trunk/product/lib/ext/stax-api-1.0.1.jar
labs/jbossesb/trunk/product/lib/ext/wstx-lgpl-3.2.1.jar
labs/jbossesb/trunk/product/lib/ext/xbean.jar
Modified:
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/ivy.xml
labs/jbossesb/trunk/product/rosetta/build.xml
labs/jbossesb/trunk/qa/base-cp.xml
labs/jbossesb/trunk/qa/build.xml
Log:
More https://jira.jboss.org/jira/browse/JBESB-1763
Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml 2008-08-01 13:12:34 UTC (rev 21321)
+++ labs/jbossesb/trunk/product/build-distr.xml 2008-08-01 15:52:42 UTC (rev 21322)
@@ -97,22 +97,21 @@
<fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
<fileset dir="${build.lib.dir}" includes="jbossesb*.jar"/>
<!-- scout -->
- <fileset dir="${lib.ext.dir}" includes="scout-*.jar"/>
+ <fileset dir="${lib.dir}" includes="scout-*.jar"/>
<!-- xbean for reading/marchalling xml for configuration, and scout -->
- <fileset dir="${lib.ext.dir}" includes="xbean.jar,stax-api-*.jar"/>
- <fileset dir="${lib.dir}" includes="xmlpublic-*.jar"/>
+ <fileset dir="${lib.dir}" includes="xbean*.jar"/>
+ <fileset dir="${lib.dir}" includes="xmlpublic-*.jar,stax-api-*.jar"/>
<!-- jUDDI Registry, we're one -->
- <fileset dir="${lib.ext.dir}" includes="juddi-client-*.jar"/>
<fileset dir="${lib.dir}" includes="juddi-*.jar"/>
<!-- ftp -->
- <fileset dir="${lib.ext.dir}" includes="commons-net-*.jar,jsch-0.1.38.jar"/>
- <fileset dir="${lib.dir}" includes="commons-io-*.jar"/>
+ <fileset dir="${lib.ext.dir}" includes="commons-net-*.jar"/>
+ <fileset dir="${lib.dir}" includes="commons-io-*.jar,jsch-*.jar"/>
<!-- Commons lang... -->
<fileset dir="${lib.dir}" includes="commons-lang-*.jar"/>
<!-- XStream jars -->
<fileset dir="${lib.dir}" includes="xstream-*.jar"/>
<!-- woodstox for the StaxDriver -->
- <fileset dir="${lib.ext.dir}" includes="wstx-lgpl-*.jar"/>
+ <fileset dir="${lib.dir}" includes="wstx-*.jar"/>
<!-- JBossCache jars - including jgroups -->
<fileset dir="${lib.dir}" includes="jboss-cache-*.jar"/>
<fileset dir="${lib.ext.dir}" includes="jgroups-all.jar"/>
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2008-08-01 13:12:34 UTC (rev 21321)
+++ labs/jbossesb/trunk/product/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
@@ -375,7 +375,7 @@
</copy>
</target>
- <target name="org.jboss.esb.dist" depends="org.jboss.esb.install, org.jboss.esb.javadocs">
+ <target name="org.jboss.esb.dist" depends="dependencies.get, org.jboss.esb.install, org.jboss.esb.javadocs">
<echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml 2008-08-01 13:12:34 UTC (rev 21321)
+++ labs/jbossesb/trunk/product/ivy.xml 2008-08-01 15:52:42 UTC (rev 21322)
@@ -1,8 +1,12 @@
<ivy-module version="2.0">
<info organisation="org.jboss" module="jbossesb"/>
<dependencies>
- <dependency org="jboss" name="jboss-cache" rev="1.2.4.SP2"/>
+ <dependency org="javax.mail" name="mail" rev="1.4"/>
+
+ <dependency org="asm" name="asm" rev="1.5.3"/>
<dependency org="commons-codec" name="commons-codec" rev="1.3"/>
+ <dependency org="commons-collections" name="commons-collections" rev="3.2"/>
+
<dependency org="commons-httpclient" name="commons-httpclient" rev="3.0.1"/>
<dependency org="commons-io" name="commons-io" rev="1.3"/>
<dependency org="commons-lang" name="commons-lang" rev="2.1"/>
@@ -11,20 +15,43 @@
<dependency org="groovy" name="groovy-all" rev="1.0"/>
<dependency org="com.h2database" name="h2" rev="1.0.68"/>
<dependency org="hibernate" name="hibernate3" rev="3.2.4.SP1"/>
+ <dependency org="jboss" name="jboss-cache" rev="1.2.4.SP2"/>
+
+ <dependency org="javassist" name="javassist" rev="3.6.0.GA"/>
+
+ <!-- Only declaring a direct dependency on jaxr-api because there's an issue with
+ the scout-1.0rc1 pom in the repo. It declares a dep on an unavailable (easily)
+ SNAPSHOT version. -->
+ <dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0rc1">
+ <exclude org="axis" module="axis"/>
+ <exclude org="geronimo-spec" module="geronimo-spec-activation"/>
+ </dependency>
+ <dependency org="org.apache.ws.scout" name="scout" rev="1.0rc1">
+ <exclude org="axis" module="axis"/>
+ <exclude org="geronimo-spec" module="geronimo-spec-activation"/>
+ </dependency>
+
+ <dependency org="jboss.aop" name="jboss-aop-jdk50" rev="1.5.6.GA"/>
+ <!-- dependency org="jboss.messaging" name="jboss-messaging-client" rev="1.4.1.CR1"/ -->
<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="jgroups" name="jgroups" rev="2.4.1-SP3"/ -->
- <!-- dependency org="jsch" name="jsch" rev="0.1.38"/ -->
- <dependency org="juddi" name="juddi" rev="2.0rc5"/>
- <!-- dependency org="juddi-client" name="juddi-client" rev="2.0rc5"/ -->
+ <dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
+ <dependency org="org.apache.juddi" name="juddi" rev="2.0rc5">
+ <exclude org="axis" module="axis"/>
+ </dependency>
+ <dependency org="org.apache.juddi" name="juddi-client" rev="2.0rc5"/>
<dependency org="log4j" name="log4j" rev="1.2.14"/>
<dependency org="org.mvel" name="mvel" rev="1.3.1-java1.4"/>
+
<dependency org="ognl" name="ognl" rev="2.6.9"/>
<!-- dependency org="quartz" name="quartz" rev="1.5.2"/ -->
<dependency org="org.antlr" name="stringtemplate" rev="3.0"/>
- <dependency org="xerces" name="xercesImpl" rev="2.7.1"/>
+
+ <!-- dependency org="trove" name="trove" rev="2.1.1"/ -->
+
<dependency org="xml-apis" name="xml-apis" rev="1.3.02"/>
<dependency org="xmlbeans" name="xmlpublic" rev="2.2.0"/>
<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.2.2"/>
Deleted: labs/jbossesb/trunk/product/lib/ext/activation.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/asm.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/cglib-2.1_3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/commons-collections-3.2.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/javassist.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/jaxr-api-1.0rc1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/jboss-aop-jdk50.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/jsch-0.1.38.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/juddi-client-2.0rc5.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/mail.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/scout-1.0rc1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/stax-api-1.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/wstx-lgpl-3.2.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/lib/ext/xbean.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml 2008-08-01 13:12:34 UTC (rev 21321)
+++ labs/jbossesb/trunk/product/rosetta/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
@@ -153,6 +153,7 @@
</target>
<path id="xbeans-classpath">
+ <fileset dir="${org.jboss.esb.lib.dir}" includes="*.jar"/>
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
</path>
Modified: labs/jbossesb/trunk/qa/base-cp.xml
===================================================================
--- labs/jbossesb/trunk/qa/base-cp.xml 2008-08-01 13:12:34 UTC (rev 21321)
+++ labs/jbossesb/trunk/qa/base-cp.xml 2008-08-01 15:52:42 UTC (rev 21322)
@@ -14,7 +14,7 @@
location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" />
<dirname property="pwd" file="${ant.file.base-cp}" />
<path id="base.cp">
- <pathelement location="${product.dir}/lib/ext/jaxr-api-1.0rc1.jar" />
+ <pathelement location="${product.dir}/lib/jaxr-api-1.0rc1.jar" />
<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"
@@ -55,7 +55,7 @@
<pathelement location="${org.jboss.esb.server.home}/lib/jboss-system.jar" />
<pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar" />
<pathelement location="${org.jboss.esb.server.server}/lib/log4j.jar" />
- <fileset dir="${product.dir}/lib/ext">
+ <fileset dir="${product.dir}/../testlib">
<include name="emma*.jar" />
</fileset>
<fileset dir="${qa.lib}/ext" includes="*.jar" />
Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml 2008-08-01 13:12:34 UTC (rev 21321)
+++ labs/jbossesb/trunk/qa/build.xml 2008-08-01 15:52:42 UTC (rev 21322)
@@ -104,7 +104,11 @@
<ant dir="quickstarts" target="all-test" />
</target>
- <target name="ci-test.junit" depends="esb.init" description="Run JUnit based QA tests.">
+ <target name="runant.ci-test.junit">
+ <runant target="ci-test.junit" failonerror="false" resultproperty="integration.qa.resultproperty"/>
+ </target>
+
+ <target name="ci-test.junit" depends="esb.init" description="Run JUnit based QA tests.">
<ant dir="junit" target="ci-test" />
<ant dir="quickstarts" target="ci-test" />
</target>
More information about the jboss-svn-commits
mailing list