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

Author: alessio.soldano(a)jboss.com Date: 2010-09-03 06:09:05 -0400 (Fri, 03 Sep 2010) New Revision: 12892 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/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-3117] Avoid installing saaj apis and removing references in tool scripts Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-09-03 09:14:11 UTC (rev 12891) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-09-03 10:09:05 UTC (rev 12892) @@ -80,7 +80,6 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar 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/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-09-03 09:14:11 UTC (rev 12891) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-09-03 10:09:05 UTC (rev 12892) @@ -122,7 +122,6 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-context.jar" 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/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-09-03 09:14:11 UTC (rev 12891) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-09-03 10:09:05 UTC (rev 12892) @@ -101,7 +101,6 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar 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/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-09-03 09:14:11 UTC (rev 12891) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-09-03 10:09:05 UTC (rev 12892) @@ -121,7 +121,6 @@ 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/spring-expression.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.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-09-03 09:14:11 UTC (rev 12891) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-09-03 10:09:05 UTC (rev 12892) @@ -43,7 +43,6 @@ <include name="**/jbossws-cxf-transports-httpserver.jar"/> <include name="**/jdom.jar"/> <include name="**/neethi.jar"/> - <include name="**/saaj-api.jar"/> <include name="**/stax-api.jar"/> <include name="**/velocity.jar"/> <include name="**/wsdl4j.jar"/> @@ -81,7 +80,6 @@ <include name="**/jbossws-spi.jar"/> <include name="**/jdom.jar"/> <include name="**/neethi.jar"/> - <include name="**/saaj-api.jar"/> <include name="**/XmlSchema.jar"/> <include name="**/xmlsec.jar"/> <include name="**/wsdl4j.jar"/> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-03 09:14:11 UTC (rev 12891) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-03 10:09:05 UTC (rev 12892) @@ -56,29 +56,20 @@ <include>org.codehaus.woodstox:wstx-lgpl:jar</include> </includes> </dependencySet> - <dependencySet> - <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>saaj-api.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include> - </includes> - </dependencySet> - + <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet>