Author: richard.opalka(a)jboss.com Date: 2010-07-21 08:41:09 -0400 (Wed, 21 Jul 2010) New Revision: 12667 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/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-3092] do not distribute saaj-impl and jaxp-ri. CXF works with JDK provided SAAJ & JAXP providers. 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 16:45:32 UTC (rev 12666) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-21 12:41:09 UTC (rev 12667) @@ -82,8 +82,6 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar 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 16:45:32 UTC (rev 12666) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-21 12:41:09 UTC (rev 12667) @@ -124,8 +124,6 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-core.jar" 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 16:45:32 UTC (rev 12666) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-21 12:41:09 UTC (rev 12667) @@ -103,8 +103,6 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar 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 16:45:32 UTC (rev 12666) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-21 12:41:09 UTC (rev 12667) @@ -123,8 +123,6 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-core.jar" 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 16:45:32 UTC (rev 12666) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-07-21 12:41:09 UTC (rev 12667) @@ -43,8 +43,6 @@ <include name="**/jetty*.jar"/> <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,8 +80,6 @@ <include name="**/jdom.jar"/> <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 16:45:32 UTC (rev 12666) +++ stack/cxf/trunk/modules/server/pom.xml 2010-07-21 12:41:09 UTC (rev 12667) @@ -241,10 +241,6 @@ </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/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-07-20 16:45:32 UTC (rev 12666) +++ stack/cxf/trunk/pom.xml 2010-07-21 12:41:09 UTC (rev 12667) @@ -86,7 +86,6 @@ <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> @@ -300,6 +299,10 @@ <artifactId>saaj-api</artifactId> </exclusion> <exclusion> + <groupId>com.sun.xml.messaging.saaj</groupId> + <artifactId>saaj-impl</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-activation_1.1_spec</artifactId> </exclusion> @@ -941,11 +944,6 @@ <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 16:45:32 UTC (rev 12666) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-21 12:41:09 UTC (rev 12667) @@ -11,15 +11,6 @@ <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> @@ -31,7 +22,6 @@ <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> @@ -42,7 +32,6 @@ <include>org.jboss.ws:jbossws-spi:jar</include> <include>junit:junit:jar</include> <include>org.apache.neethi:neethi:jar</include> - <include>com.sun.xml.messaging.saaj:saaj-impl:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.apache.ws.commons.schema:XmlSchema:jar</include> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>