[jbossws-commits] JBossWS SVN: r12665 - in stack/cxf/trunk: modules/resources/src/main/resources/bin and 4 other directories.

Author: richard.opalka(a)jboss.com Date: 2010-07-20 08:11:27 -0400 (Tue, 20 Jul 2010) New Revision: 12665 Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBPAPP-4642] applying fix upstream Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-20 12:11:27 UTC (rev 12665) @@ -83,6 +83,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-expression.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxp-ri.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-20 12:11:27 UTC (rev 12665) @@ -125,6 +125,7 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-expression.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxp-ri.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/velocity.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/XmlSchema.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-20 12:11:27 UTC (rev 12665) @@ -104,6 +104,7 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-expression.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxp-ri.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-20 12:11:27 UTC (rev 12665) @@ -124,6 +124,7 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-expression.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-impl.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxp-ri.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/velocity.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/XmlSchema.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-07-20 12:11:27 UTC (rev 12665) @@ -44,6 +44,7 @@ <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> + <include name="**/jaxp-ri.jar"/> <include name="**/stax-api.jar"/> <include name="**/velocity.jar"/> <include name="**/wsdl4j.jar"/> @@ -82,6 +83,7 @@ <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> + <include name="**/jaxp-ri.jar"/> <include name="**/XmlSchema.jar"/> <include name="**/xmlsec.jar"/> <include name="**/wsdl4j.jar"/> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/modules/server/pom.xml 2010-07-20 12:11:27 UTC (rev 12665) @@ -241,6 +241,10 @@ </exclusions> </dependency> <dependency> + <groupId>com.sun.xml.parsers</groupId> + <artifactId>jaxp-ri</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.xml.bind</groupId> <artifactId>jboss-jaxb-api_2.2_spec</artifactId> </dependency> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties 2010-07-20 12:11:27 UTC (rev 12665) @@ -18,6 +18,6 @@ org.apache.ws.security.crypto.merlin.keystore.type=PKCS12 org.apache.ws.security.crypto.merlin.keystore.password=password # for some reason, bouncycastle has issues with bob.pfx -org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE +#org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE org.apache.ws.security.crypto.merlin.file=META-INF/certs/bob.pfx Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/pom.xml 2010-07-20 12:11:27 UTC (rev 12665) @@ -86,6 +86,7 @@ <xerces.version>2.9.1</xerces.version> <xmlsec.version>1.4.3</xmlsec.version> <wstx.version>3.2.9</wstx.version> + <jaxp.ri.version>1.4.2</jaxp.ri.version> <spring.version>3.0.3.RELEASE</spring.version> </properties> @@ -940,6 +941,11 @@ <version>${saaj.api.version}</version> </dependency> <dependency> + <groupId>com.sun.xml.parsers</groupId> + <artifactId>jaxp-ri</artifactId> + <version>${jaxp.ri.version}</version> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.xml.ws</groupId> <artifactId>jboss-jaxws-api_2.2_spec</artifactId> <version>${jaxws.api.version}</version> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-20 11:07:54 UTC (rev 12664) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-20 12:11:27 UTC (rev 12665) @@ -11,6 +11,15 @@ <moduleSet> <includes> <include>org.jboss.ws.cxf:jbossws-cxf-client</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + </binaries> + </moduleSet> + <moduleSet> + <includes> <include>org.jboss.ws.cxf:jbossws-cxf-server</include> </includes> <binaries> @@ -22,6 +31,7 @@ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes> + <include>com.sun.xml.parsers:jaxp-ri:jar</include> <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include> <include>org.apache.cxf:cxf-*</include> <include>org.apache.cxf.xjcplugins:cxf-*</include>