Author: alessio.soldano(a)jboss.com Date: 2008-11-12 04:28:35 -0500 (Wed, 12 Nov 2008) New Revision: 8706 Modified: stack/metro/trunk/modules/client/pom.xml stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/pom.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2392] Using WSIT-1.3.1 Modified: stack/metro/trunk/modules/client/pom.xml =================================================================== --- stack/metro/trunk/modules/client/pom.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/client/pom.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -48,12 +48,12 @@ <artifactId>jaxws-tools</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.wsit</groupId> - <artifactId>txnannprocessor</artifactId> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> - <artifactId>xmldsig</artifactId> + <artifactId>txnannprocessor</artifactId> </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2008-11-12 09:28:35 UTC (rev 8706) @@ -33,6 +33,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2008-11-12 09:28:35 UTC (rev 8706) @@ -67,6 +67,7 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/streambuffer.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-ex.jar" Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2008-11-12 09:28:35 UTC (rev 8706) @@ -31,6 +31,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2008-11-12 09:28:35 UTC (rev 8706) @@ -65,6 +65,7 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/streambuffer.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/stax-ex.jar" Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -36,6 +36,7 @@ <include name="**/jbossws-metro-wsit-rt.jar"/> <include name="**/jbossws-metro-wsit-tools.jar"/> <include name="**/jbossws-spi.jar"/> + <include name="**/policy.jar"/> <include name="**/streambuffer.jar"/> <include name="**/stax-api.jar"/> <include name="**/stax-ex.jar"/> @@ -86,17 +87,16 @@ <include name="**/jsr181-api.jar"/> <include name="**/jsr250-api.jar"/> <include name="**/mimepull.jar"/> + <include name="**/policy.jar"/> <include name="**/resolver.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> - <include name="**/sjsxp.jar"/> <include name="**/stax-ex.jar"/> <include name="**/stax-utils.jar"/> <include name="**/streambuffer.jar"/> <include name="**/txnannprocessor.jar"/> <include name="**/wsdl4j.jar"/> <include name="**/wstx.jar"/> - <include name="**/xmldsig.jar"/> <include name="**/xmlsec.jar"/> <include name="**/xws-security.jar"/> </patternset> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/modules/server/pom.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -70,12 +70,12 @@ <artifactId>jaxws-tools</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.wsit</groupId> - <artifactId>txnannprocessor</artifactId> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> - <artifactId>xmldsig</artifactId> + <artifactId>txnannprocessor</artifactId> </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/pom.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -68,7 +68,7 @@ <sun.sjsxp.version>1.0.1</sun.sjsxp.version> <sun.http-transport.version>2.1.3</sun.http-transport.version> <sun.jaxws.version>2.1.4</sun.jaxws.version> - <sun.wsit.version>1.1</sun.wsit.version> + <sun.wsit.version>1.3.1</sun.wsit.version> <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.1</wsdl4j.version> </properties> @@ -210,6 +210,11 @@ <version>${sun.jaxws.version}</version> </dependency> <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> + <version>${sun.wsit.version}</version> + </dependency> + <dependency> <groupId>com.sun.xml.wsit</groupId> <artifactId>wsit-rt</artifactId> <version>${sun.wsit.version}</version> @@ -226,11 +231,6 @@ </dependency> <dependency> <groupId>com.sun.xml.wsit</groupId> - <artifactId>xmldsig</artifactId> - <version>${sun.wsit.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.wsit</groupId> <artifactId>xmlsec</artifactId> <version>${sun.wsit.version}</version> </dependency> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-12 09:24:23 UTC (rev 8705) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-12 09:28:35 UTC (rev 8706) @@ -37,16 +37,15 @@ <include>*:jsr181-api:jar</include> <include>*:jsr250-api:jar</include> <include>*:mimepull:jar</include> + <include>*:policy:jar</include> <include>*:resolver:jar</include> <include>*:saaj-api:jar</include> <include>*:saaj-impl:jar</include> - <include>*:sjsxp:jar</include> <include>*:stax-api:jar</include> <include>*:stax-ex:jar</include> <include>*:streambuffer:jar</include> <include>*:txnannprocessor:jar</include> <include>*:wsdl4j:jar</include> - <include>*:xmldsig:jar</include> <include>*:xmlsec:jar</include> <include>*:xws-security:jar</include> <include>*:junit:jar</include>