[jboss-svn-commits] JBL Code SVN: r37962 - in labs/jbossesb/trunk/product: rosetta and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 28 10:41:08 EDT 2012
Author: tcunning
Date: 2012-03-28 10:41:06 -0400 (Wed, 28 Mar 2012)
New Revision: 37962
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/ivy.xml
labs/jbossesb/trunk/product/rosetta/ivy.xml
labs/jbossesb/trunk/product/services/soap/build.xml
Log:
JBESB-3767
Fix issues with JAAS jar and issues with multiple versions of AspectHandler class being pulled in.
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2012-03-28 13:39:17 UTC (rev 37961)
+++ labs/jbossesb/trunk/product/build.xml 2012-03-28 14:41:06 UTC (rev 37962)
@@ -172,6 +172,10 @@
<target name="dependencies.get" unless="no.ivy">
<ant antfile="ivy-build.xml" />
+
+ <delete>
+ <fileset dir="build/lib" includes="commons-httpclient-2.0.2.jar"/>
+ </delete>
</target>
<target name="dependencies.report">
Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml 2012-03-28 13:39:17 UTC (rev 37961)
+++ labs/jbossesb/trunk/product/ivy.xml 2012-03-28 14:41:06 UTC (rev 37962)
@@ -144,9 +144,15 @@
<dependency org="org.jboss.jbossas" name="jboss-as-jmx" rev="5.1.0.GA"/>
<dependency org="org.jboss.jbossas" name="jboss-as-main" rev="5.1.0.GA"/>
<dependency org="org.jboss.jbossas" name="jboss-as-mbeans" rev="5.1.0.GA"/>
- <dependency org="org.jboss.jbossas" name="jboss-as-system" rev="5.1.0.GA"/>
- <dependency org="org.jboss.jbossas" name="jboss-as-system-jmx" rev="5.1.0.GA"/>
- <dependency org="org.jboss.jbossas" name="jboss-as-webservices" rev="5.1.0.GA"/>
+ <dependency org="org.jboss.jbossas" name="jboss-as-system" rev="5.1.0.GA">
+ <exclude org="javax.security" module="jaas"/>
+ </dependency>
+ <dependency org="org.jboss.jbossas" name="jboss-as-system-jmx" rev="5.1.0.GA">
+ <exclude org="javax.security" module="jaas"/>
+ </dependency>
+ <dependency org="org.jboss.jbossas" name="jboss-as-webservices" rev="5.1.0.GA">
+ <exclude org="javax.security" module="jaas"/>
+ </dependency>
<dependency org="org.jboss.logging" name="jboss-logging-spi" rev="2.1.0.GA"/>
<dependency org="org.jboss.javaee" name="jboss-ejb-api" rev="3.0.0.GA"/>
Modified: labs/jbossesb/trunk/product/rosetta/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/ivy.xml 2012-03-28 13:39:17 UTC (rev 37961)
+++ labs/jbossesb/trunk/product/rosetta/ivy.xml 2012-03-28 14:41:06 UTC (rev 37962)
@@ -7,16 +7,16 @@
<exclude org="jboss" module="jboss-vfs"/>
</dependency>
- <dependency org="org.jboss.deployers" name="jboss-deployers-vfs" rev="2.2.0.GA"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-spi" rev="2.2.0.GA"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-core-spi" rev="2.2.0.GA"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-core" rev="2.2.0.GA"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-impl" rev="2.2.0.GA"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-structure-spi" rev="2.2.0.GA"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-client" rev="2.2.0.GA"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-client-spi" rev="2.2.0.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-vfs" rev="2.2.0.GA" transitive="false"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-spi" rev="2.2.0.GA" transitive="false"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-core-spi" rev="2.2.0.GA" transitive="false"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-core" rev="2.2.0.GA" transitive="false"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-impl" rev="2.2.0.GA" transitive="false"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-structure-spi" rev="2.2.0.GA" transitive="false"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-client" rev="2.2.0.GA" transitive="false"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-client-spi" rev="2.2.0.GA" transitive="false"/>
- <dependency org="org.jboss" name="jboss-vfs" rev="3.0.0.GA"/>
+ <dependency org="org.jboss" name="jboss-vfs" rev="3.0.0.GA" transitive="false"/>
</dependencies>
</ivy-module>
Modified: labs/jbossesb/trunk/product/services/soap/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soap/build.xml 2012-03-28 13:39:17 UTC (rev 37961)
+++ labs/jbossesb/trunk/product/services/soap/build.xml 2012-03-28 14:41:06 UTC (rev 37962)
@@ -39,25 +39,23 @@
<target name="init.classpath">
<path id="classpath">
- <path refid="base-classpath" />
+ <pathelement location="src/test/resources"/>
- <fileset dir="../../lib/ext">
- <include name="cxf-api*.jar"/>
- <include name="cxf-common-utilities*.jar"/>
- <include name="cxf-rt-core*.jar"/>
- <include name="cxf-rt-transports-http*.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-cxf-server.jar"/>
- <include name="servlet-api.jar"/>
- <include name="wsdl4j*.jar"/>
- </fileset>
+ <fileset dir="build/lib" includes="*.jar"/>
+ <pathelement location="build/${ant.project.name}.esb" />
+ <pathelement location="build/classes" />
+ <pathelement location="build/test/classes" />
+ <fileset dir="${esb.main.lib}" includes="jboss-system-*.jar" />
+ <fileset dir="lib/ext" includes="*.jar" />
+ <fileset dir="lib/ext/build-time" includes="*.jar" />
+ <fileset dir="${esb.product.lib.ext}/endorsed" includes="jboss-saaj.jar" />
+ <fileset dir="${esb.product.lib.dir}" includes="jbossesb-rosetta.jar jbossesb-config-model*.jar test-util.jar" />
+ <fileset dir="${esb.product.lib.ext}" includes="jaxb-impl.jar jbossts-common.jar jboss-messaging-client.jar wstx-asl-3.2.8.jar" />
+ <fileset dir="../../lib/ext" includes="*.jar"/>
<fileset dir="../../build/lib">
- <include name="commons-httpclient*.jar"/>
- <include name="javassist*.jar"/>
- <include name="jboss-aop*.jar"/>
- <include name="jboss-metadata*.jar"/>
- <include name="spring-context*.jar"/>
+ <include name="**.jar"/>
+ <exclude name="ant**"/>
+ <exclude name="jboss-aop-jdk50-1.5.6.GA.jar"/>
</fileset>
<!-- Adding the Smooks jars... -->
<fileset dir="../smooks/lib/ext" includes="*.jar"/>
@@ -65,29 +63,50 @@
<!-- Stuff required for testing... -->
<fileset dir="../soapui-client/src/lib" includes="*.jar"/>
<pathelement location="../soapui-client/target/classes" />
+
+ <pathelement location="${esb.root.dir}/etc/test/registry"/>
+
+ <fileset dir="${esb.main.lib}" includes="activation*.jar" />
+ <fileset dir="${esb.main.lib}" includes="antlr*.jar" />
+ <fileset dir="${esb.main.lib}" includes="bsh*.jar" />
+ <fileset dir="${esb.main.lib}" includes="cglib-nodep*.jar" />
+ <fileset dir="${esb.main.lib}" includes="commons-codec*.jar" />
+ <fileset dir="${esb.main.lib}" includes="commons-collections*.jar" />
+ <fileset dir="${esb.main.lib}" includes="commons-configuration*.jar" />
+ <fileset dir="${esb.main.lib}" includes="commons-io*.jar" />
+ <fileset dir="${esb.main.lib}" includes="commons-lang*.jar" />
+ <fileset dir="${esb.main.lib}" includes="commons-logging*.jar" />
+ <fileset dir="${esb.main.lib}" includes="dom4j*.jar" />
+ <fileset dir="${esb.root.dir}/lib/ext" includes="ejb3-persistence*.jar" />
+ <fileset dir="${esb.main.lib}" includes="groovy*.jar" />
+ <fileset dir="${esb.main.lib}" includes="hibernate*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="jaxb-api*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="jaxr-api*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="jboss-4.2.3.GA.jar"/>
+ <fileset dir="${esb.main.lib}" includes="jboss-ejb-api*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="jbossall-client*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="jcr*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="juddi-client*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="juddi-core*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="log4j*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="mail*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="milyn-smooks-*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="jaxen-*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="freemarker-*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="mvel*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="ognl*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="picketlink*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="quartz*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="scout*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="stax-api*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="uddi-ws*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="xbean*.jar"/>
+ <fileset dir="${esb.main.lib}" includes="xstream*.jar"/>
+
+
</path>
<path id="exec.classpath">
- <pathelement location="${aop.jar}"/>
- <pathelement location="${build.dir}/${wise.jar}"/>
<path refid="classpath"/>
-
- <fileset dir="../../lib/ext">
- <include name="commons-ssl*.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="policy.jar"/>
- </fileset>
- <fileset dir="../../build/lib">
- <include name="javassist*.jar"/>
- <include name="jaxb-xjc*.jar"/>
- <include name="jaxws-rt*.jar"/>
- <include name="jaxws-tools*.jar"/>
- <include name="jbossxb*.jar"/>
- <include name="xerces*.jar"/>
- <include name="wstx*.jar"/>
- </fileset>
- <fileset dir="${java.home}/lib" includes="tools.jar"/>
- <fileset dir="${java.home}/../lib" includes="tools.jar"/>
</path>
</target>
More information about the jboss-svn-commits
mailing list