Author: richard.opalka(a)jboss.com Date: 2010-07-19 09:17:58 -0400 (Mon, 19 Jul 2010) New Revision: 12655 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBPAPP-4642] include jaxp-ri in distribution - since now CXF runs on IBM JDK too Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-19 13:17:58 UTC (rev 12655) @@ -80,6 +80,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-core.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/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-19 13:17:58 UTC (rev 12655) @@ -122,6 +122,7 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-core.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/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-19 13:17:58 UTC (rev 12655) @@ -102,6 +102,7 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-core.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/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-19 13:17:58 UTC (rev 12655) @@ -119,7 +119,7 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-context.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-core.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/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-07-19 13:17:58 UTC (rev 12655) @@ -45,6 +45,7 @@ <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> + <include name="**/jaxp-ri.jar"/> <include name="**/spring-beans.jar"/> <include name="**/spring-context.jar"/> <include name="**/spring-core.jar"/> @@ -86,6 +87,7 @@ <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> + <include name="**/jaxp-ri.jar"/> <include name="**/spring-beans.jar"/> <include name="**/spring-context.jar"/> <include name="**/spring-core.jar"/> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml 2010-07-19 13:17:58 UTC (rev 12655) @@ -79,6 +79,7 @@ <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> + <include name="**/jaxp-ri.jar"/> <include name="**/spring-beans.jar"/> <include name="**/spring-context.jar"/> <include name="**/spring-core.jar"/> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-07-19 13:17:58 UTC (rev 12655) @@ -171,6 +171,10 @@ <artifactId>jaxb-xjc</artifactId> </dependency> <dependency> + <groupId>com.sun.xml.parsers</groupId> + <artifactId>jaxp-ri</artifactId> + </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </dependency> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties 2010-07-19 13:17:58 UTC (rev 12655) @@ -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/branches/jbossws-cxf-3.1.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-07-19 13:17:58 UTC (rev 12655) @@ -73,6 +73,7 @@ <velocity.version>1.5</velocity.version> <xmlsec.version>1.4.3</xmlsec.version> <wstx.version>3.2.9</wstx.version> + <jaxp.ri.version>1.4.2</jaxp.ri.version> </properties> @@ -397,6 +398,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>javax.xml.ws</groupId> <artifactId>jaxws-api</artifactId> <version>${jaxws.api.version}</version> @@ -780,8 +786,8 @@ </plugins> </build> </profile> - - <!-- + + <!-- Name: testsuite Descr: Executes the testsuite --> @@ -792,5 +798,5 @@ </modules> </profile> </profiles> - + </project> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-19 07:35:39 UTC (rev 12654) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-19 13:17:58 UTC (rev 12655) @@ -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,10 +31,9 @@ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes> + <include>com.sun.xml.parsers:jaxp-ri:jar</include> <include>org.apache.cxf:cxf-*</include> <include>org.apache.cxf.xjcplugins:cxf-*</include> - <!-- <include>javax.mail:mail*</include> --> - <!-- ws-metadata --> <include>javax.jws:jsr181-api:jar</include> <include>javax.xml.bind:jaxb-api:jar</include> <include>com.sun.xml.bind:jaxb-impl:jar</include>