[jboss-svn-commits] JBL Code SVN: r38020 - in labs/jbossesb/branches/JBESB_4_10_CP/product: rosetta and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Apr 15 15:42:49 EDT 2012
Author: tcunning
Date: 2012-04-15 15:42:48 -0400 (Sun, 15 Apr 2012)
New Revision: 38020
Modified:
labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/ivy.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/build.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetterUnitTest.java
labs/jbossesb/branches/JBESB_4_10_CP/product/services/soap/build.xml
Log:
JBESB-3781
Fix issues with jaas JAR.
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml 2012-04-14 01:50:16 UTC (rev 38019)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml 2012-04-15 19:42:48 UTC (rev 38020)
@@ -143,9 +143,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"/>
@@ -181,6 +187,8 @@
<dependency org="com.envoisolutions.sxc" name="sxc-xpath" rev="0.7.3">
<exclude org="com.sun.xml.bind" module="jaxb-xjc"/>
</dependency>
+
+ <exclude org="apache-httpclient" module="commons-httpclient"/>
</dependencies>
</ivy-module>
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/ivy.xml 2012-04-14 01:50:16 UTC (rev 38019)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/ivy.xml 2012-04-15 19:42:48 UTC (rev 38020)
@@ -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/branches/JBESB_4_10_CP/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/build.xml 2012-04-14 01:50:16 UTC (rev 38019)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/build.xml 2012-04-15 19:42:48 UTC (rev 38020)
@@ -45,6 +45,9 @@
<fileset dir="${org.jboss.esb.lib.dir}">
<include name="*.jar"/>
<exclude name="ant-**"/>
+ <exclude name="jboss-aop-2.1.1.GA.jar"/>
+ <exclude name="jboss-aop-mc-int-2.0.6.GA.jar"/>
+ <exclude name="jbossall-client-4.2.3.GA.jar"/>
</fileset>
<fileset dir="${org.jboss.esb.root.dir}/../testlib" includes="*.jar"/>
<fileset dir="${org.jboss.esb.ftp.lib.dir}" includes="*.jar"/>
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetterUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetterUnitTest.java 2012-04-14 01:50:16 UTC (rev 38019)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/tests/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetterUnitTest.java 2012-04-15 19:42:48 UTC (rev 38020)
@@ -177,7 +177,7 @@
fromESBMessage.getProperties().setProperty( propertyKey, propertyValue );
strategy.setJMSProperties( fromESBMessage, toJMSMessage );
- assertEquals ( propertyValue, toJMSMessage.getFloatProperty( propertyKey ) );
+ assertEquals ( propertyValue, toJMSMessage.getFloatProperty( propertyKey ), 1 );
}
@Test
@@ -187,7 +187,7 @@
fromESBMessage.getProperties().setProperty( propertyKey, propertyValue );
strategy.setJMSProperties( fromESBMessage, toJMSMessage );
- assertEquals ( propertyValue, toJMSMessage.getDoubleProperty( propertyKey ) );
+ assertEquals ( propertyValue, toJMSMessage.getDoubleProperty( propertyKey ), 1 );
}
@Test
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/services/soap/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/services/soap/build.xml 2012-04-14 01:50:16 UTC (rev 38019)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/services/soap/build.xml 2012-04-15 19:42:48 UTC (rev 38020)
@@ -39,11 +39,21 @@
<target name="init.classpath">
<path id="classpath">
- <path refid="base-classpath" />
+ <pathelement location="src/test/resources"/>
+ <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="*.jar"/>
+ <include name="**.jar"/>
<exclude name="ant**"/>
</fileset>
<!-- Adding the Smooks jars... -->
@@ -52,8 +62,51 @@
<!-- 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"/>
</path>
</target>
@@ -131,7 +184,10 @@
<target name="service-esb" depends="base-esb">
<copy todir="${build.dir}/${ant.project.name}.esb">
<fileset dir="${esb.root.dir}/build/lib"
- includes="jaxws-rt*.jar jaxb-xjc*.jar"/>
+ includes="jaxws-rt*.jar"/>
+ <!-- Need to include the compatible version according to server -->
+ <fileset dir="${esb.product.lib.ext}/endorsed"
+ includes="jaxb-impl*.jar jaxb-xjc*.jar"/>
<fileset file="${aop.jar}"/>
</copy>
More information about the jboss-svn-commits
mailing list