[jbossws-commits] JBossWS SVN: r13849 - in stack/native/branches/ropalka: modules/client and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Mar 4 07:03:29 EST 2011
Author: richard.opalka at jboss.com
Date: 2011-03-04 07:03:28 -0500 (Fri, 04 Mar 2011)
New Revision: 13849
Modified:
stack/native/branches/ropalka/modules/client/pom.xml
stack/native/branches/ropalka/modules/core/pom.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/pom.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wstools.xml
stack/native/branches/ropalka/modules/testsuite/pom.xml
stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml
stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
stack/native/branches/ropalka/pom.xml
Log:
[JBWS-3206] updating excludes, fixing tools endorsement issue, disabling JAX-RPC tests
Modified: stack/native/branches/ropalka/modules/client/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/client/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/client/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -36,12 +36,8 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
</dependencies>
<build>
Modified: stack/native/branches/ropalka/modules/core/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/core/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -16,7 +16,6 @@
<properties>
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
<jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
- <jboss.jbossxb.version>2.0.1.GA</jboss.jbossxb.version>
</properties>
<!-- Dependencies -->
@@ -82,9 +81,13 @@
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<scope>provided</scope>
- <version>${jboss.jbossxb.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>provided</scope>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -56,6 +56,7 @@
<property name="project.version" value="${project.version}" />
<property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="endorsed.dirs" value="${endorsed.dirs}"/>
<property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
</tasks>
@@ -75,6 +76,7 @@
<property name="jboss.bind.address" value="${jboss.bind.address}" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
<property name="jboss.home" value="${jboss.home}"/>
+ <property name="jaxrpc.enabled" value="${jaxrpc.enabled}"/>
<ant antfile="scripts/antrun-wstools.xml" target="wstools" />
</tasks>
</configuration>
@@ -93,6 +95,7 @@
<property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
<property name="jboss.home" value="${jboss.home}"/>
+ <property name="endorsed.dirs" value="${endorsed.dirs}"/>
<ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" />
</tasks>
</configuration>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -20,6 +20,7 @@
wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl"
package="org.jboss.test.ws.benchmark.jaxws.doclit"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -29,6 +30,7 @@
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.basedoclitb"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -38,6 +40,7 @@
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.basedoclitw"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -47,6 +50,7 @@
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.baserpclit"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -56,6 +60,7 @@
wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -65,6 +70,7 @@
wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -74,6 +80,7 @@
wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecurity"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -89,6 +96,7 @@
<attribute name="jbossHome"/>
<attribute name="log4jConf"/>
<attribute name="loggingDir"/>
+ <attribute name="javaEndorsedDirs"/>
<sequential>
<wsconsume
@@ -102,7 +110,7 @@
target="2.2"
fork="true"
>
- <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
<jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
<jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
</wsconsume>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -20,6 +20,7 @@
<wsprovide-macro
sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"
destDir=""
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
outputDir="${tests.output.dir}"
log4jConf="${log4j.conf}"
@@ -30,6 +31,7 @@
<wsprovide-macro
sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"
destDir=""
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
outputDir="${tests.output.dir}"
log4jConf="${log4j.conf}"
@@ -48,6 +50,7 @@
<attribute name="log4jConf"/>
<attribute name="loggingDir"/>
<attribute name="resourcesDir"/>
+ <attribute name="javaEndorsedDirs"/>
<sequential>
<wsprovide
@@ -61,7 +64,7 @@
resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
sourcedestdir="@{outputDir}/test-sources/@{resourcesDir}"
>
- <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
<jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
<jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
</wsprovide>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wstools.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -7,23 +7,31 @@
<!-- ============================================================ -->
<project>
-
+
<!-- ================================================================== -->
<!-- Generating sources -->
<!-- ================================================================== -->
-
- <target name="wstools" depends="generate-sources,compile-sources,copy-resources" description="Generate the JAX-RPC artifacts.">
+
+ <target name="wstools" description="Generate the JAX-RPC artifacts.">
+ <condition property="generate.jaxrpc.artifacts" value="true">
+ <and>
+ <equals arg1="${jaxrpc.enabled}" arg2="true"/>
+ </and>
+ </condition>
+ <antcall target="generate-sources"/>
+ <antcall target="compile-sources"/>
+ <antcall target="copy-resources"/>
</target>
-
+
<!-- Generate JAX-RPC artifacts -->
- <target name="generate-sources">
-
+ <target name="generate-sources" if="generate.jaxrpc.artifacts">
+
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath>
<pathelement path="${maven.test.classpath}"/>
</classpath>
</taskdef>
-
+
<macro-wstools dest="jaxrpc/samples/docstyle/wrapped/WEB-INF" config="jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/docstyle/bare/WEB-INF" config="jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/dynamichandler/WEB-INF" config="jaxrpc/samples/dynamichandler/wstools-config.xml"/>
@@ -42,12 +50,12 @@
<macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/>
-
+
</target>
-
+
<!-- Copy generated resources -->
- <target name="compile-sources">
-
+ <target name="compile-sources" if="generate.jaxrpc.artifacts">
+
<mkdir dir="${tests.output.dir}/wstools/java"/>
<move todir="${tests.output.dir}/wstools/java">
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
@@ -58,7 +66,7 @@
<move todir="${tests.output.dir}/wstools/java">
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/>
</move>
-
+
<!--
Cannot run javac from tasks
http://jira.codehaus.org/browse/MANTRUN-91
@@ -71,17 +79,17 @@
</classpath>
</javac>
</target>
-
+
<!-- Copy generated resources -->
- <target name="copy-resources">
-
+ <target name="copy-resources" if="generate.jaxrpc.artifacts">
+
<copy todir="${tests.output.dir}/test-resources">
<fileset dir="${tests.output.dir}/wstools/resources">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
</fileset>
</copy>
-
+
<copy todir="${tests.output.dir}/test-resources/jaxrpc/samples" overwrite="true">
<fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
<filterset>
@@ -89,8 +97,8 @@
</filterset>
</copy>
</target>
-
- <!-- macro-wstools -->
+
+ <!-- macro-wstools -->
<macrodef name="macro-wstools">
<attribute name="dest"/>
<attribute name="config"/>
@@ -100,5 +108,5 @@
</wstools>
</sequential>
</macrodef>
-
+
</project>
Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -63,6 +63,11 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -138,6 +143,35 @@
</testResource>
</testResources>
<plugins>
+ <plugin> <!-- This copies jboss-jaxws-api_2.2_spec & jboss-jaxb-api_2.2_spec jars to endorsed dir before the integration-tests are run -->
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin> <!-- This copies jbossws-native-factories jar to endorsed dir before the integration-tests are run -->
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -154,6 +188,7 @@
<directory>${basedir}/../endorsed/target/</directory>
<includes>
<include>jbossws-native-factories-${project.version}.jar</include>
+ <include>jboss-jaxb-api_2.2_spec-${jaxb.api.version}.jar</include>
</includes>
</resource>
</resources>
@@ -368,6 +403,8 @@
<properties>
<jboss.version>6.0.0.Final</jboss.version>
<jbossws.integration.target>jboss600</jbossws.integration.target>
+ <endorsed.dirs>${jboss600.home}/lib/endorsed</endorsed.dirs>
+ <jaxrpc.enabled>true</jaxrpc.enabled>
</properties>
<dependencies>
<dependency>
@@ -503,6 +540,8 @@
<properties>
<jboss.version>6.0.1-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss601</jbossws.integration.target>
+ <endorsed.dirs>${jboss601.home}/lib/endorsed</endorsed.dirs>
+ <jaxrpc.enabled>true</jaxrpc.enabled>
</properties>
<dependencies>
<dependency>
@@ -619,6 +658,8 @@
<properties>
<jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss700</jbossws.integration.target>
+ <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
+ <jaxrpc.enabled>false</jaxrpc.enabled>
</properties>
<dependencies>
<dependency>
@@ -638,13 +679,11 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -663,8 +702,11 @@
<testExcludes>
<!-- AS7 compilation excludes -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude>
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
@@ -699,8 +741,11 @@
<!--# not yet supported on AS7 -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude>
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
Modified: stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -124,6 +124,7 @@
<property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
<property name="jboss.home" value="${jboss.home}"/>
+ <property name="endorsed.dirs" value="${endorsed.dirs}"/>
<ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" />
</tasks>
</configuration>
@@ -141,6 +142,7 @@
<property name="project.version" value="${project.version}" />
<property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
<property name="log4j.output.dir" value="${log4j.output.dir}"/>
+ <property name="endorsed.dirs" value="${endorsed.dirs}"/>
<property name="jboss.home" value="${jboss.home}"/>
<ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
<ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" />
Modified: stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -20,6 +20,7 @@
wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"
package="org.jboss.test.ws.jaxws.complex"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -29,6 +30,7 @@
wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl"
package="org.jboss.test.ws.jaxws.holder"
outputDir="${tests.output.dir}"
+ javaEndorsedDirs="${endorsed.dirs}"
jbossHome="${jboss.home}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -42,6 +44,7 @@
<attribute name="package"/>
<attribute name="outputDir"/>
<attribute name="jbossHome"/>
+ <attribute name="javaEndorsedDirs"/>
<attribute name="log4jConf"/>
<attribute name="loggingDir"/>
@@ -57,7 +60,7 @@
target="2.2"
fork="true"
>
- <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
<jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
<jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
</wsconsume>
Modified: stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -20,6 +20,7 @@
sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl"
destdir="jaxws/jbws2960"
jbossHome="${jboss.home}"
+ javaEndorsedDirs="${endorsed.dirs}"
outputDir="${tests.output.dir}"
log4jConf="${log4j.conf}"
loggingDir="${log4j.output.dir}"
@@ -33,6 +34,7 @@
<attribute name="sei"/>
<attribute name="destDir"/>
<attribute name="jbossHome"/>
+ <attribute name="javaEndorsedDirs"/>
<attribute name="outputDir"/>
<attribute name="log4jConf"/>
<attribute name="loggingDir"/>
@@ -48,7 +50,7 @@
destdir="@{outputDir}/test-classes/@{destDir}"
resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}"
>
- <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/>
+ <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/>
<jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/>
<jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/>
</wsprovide>
Modified: stack/native/branches/ropalka/pom.xml
===================================================================
--- stack/native/branches/ropalka/pom.xml 2011-03-04 08:50:51 UTC (rev 13848)
+++ stack/native/branches/ropalka/pom.xml 2011-03-04 12:03:28 UTC (rev 13849)
@@ -65,7 +65,7 @@
<jaxb.api.version>1.0.0.Final</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
- <jboss.logging.version>2.2.0.CR1</jboss.logging.version>
+ <jboss.logging.version>3.0.0.Beta3</jboss.logging.version>
<jboss.jaxr.version>2.0.2</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
@@ -78,6 +78,7 @@
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.4.3</xmlsec.version>
<xerces.version>2.9.1</xerces.version>
+ <jbossxb.version>2.0.3.GA</jbossxb.version>
<junit.version>3.8.1</junit.version>
</properties>
@@ -167,13 +168,18 @@
<artifactId>jboss-common-core</artifactId>
<version>${jboss.common.core.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
-
<!-- transitive dependencies -->
<dependency>
<groupId>commons-logging</groupId>
@@ -320,15 +326,10 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${jboss.logging.version}</version>
- </dependency>
- <dependency>
<groupId>ws-commons</groupId>
<artifactId>policy</artifactId>
<version>${wscommons.policy.version}</version>
@@ -358,6 +359,37 @@
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jbossxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>junit</groupId>
More information about the jbossws-commits
mailing list