Author: alessio.soldano(a)jboss.com Date: 2009-07-29 06:36:03 -0400 (Wed, 29 Jul 2009) New Revision: 10409 Removed: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/ Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/jbossws-native-3.1.2/pom.xml Log: svn merge -r 10405:10407 https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-native-3.1.... . Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2009-07-29 09:45:18 UTC (rev 10408) +++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2009-07-29 10:36:03 UTC (rev 10409) @@ -49,7 +49,7 @@ <configuration> <archive> <manifestEntries> - <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path> + <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar stax-api.jar wsdl4j.jar</Class-Path> </manifestEntries> </archive> </configuration> Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2009-07-29 09:45:18 UTC (rev 10408) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2009-07-29 10:36:03 UTC (rev 10409) @@ -149,10 +149,6 @@ <artifactId>jboss-remoting</artifactId> </dependency> <dependency> - <groupId>wscommons-policy</groupId> - <artifactId>policy</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-lgpl</artifactId> </dependency> Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2009-07-29 09:45:18 UTC (rev 10408) +++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2009-07-29 10:36:03 UTC (rev 10409) @@ -44,7 +44,6 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar rem Execute the command Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2009-07-29 09:45:18 UTC (rev 10408) +++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2009-07-29 10:36:03 UTC (rev 10409) @@ -78,7 +78,6 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" ### Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-07-29 09:45:18 UTC (rev 10408) +++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-07-29 10:36:03 UTC (rev 10409) @@ -53,7 +53,6 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-07-29 09:45:18 UTC (rev 10408) +++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-07-29 10:36:03 UTC (rev 10409) @@ -80,7 +80,6 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xmlsec.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 09:45:18 UTC (rev 10408) +++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 10:36:03 UTC (rev 10409) @@ -44,7 +44,6 @@ <include name="**/jbossws-native-saaj.jar"/> <include name="**/jbossws-spi.jar"/> <include name="**/jettison.jar"/> - <include name="**/policy.jar"/> <include name="**/stax-api.jar"/> <include name="**/stax-ex.jar"/> <include name="**/streambuffer.jar"/> @@ -78,7 +77,6 @@ <include name="**/jboss-jaxb-intros.jar"/> <include name="**/jbossws-native-core.jar"/> <include name="**/jettison.jar"/> - <include name="**/policy.jar"/> <include name="**/wsdl4j.jar"/> <include name="**/xmlsec.jar"/> </patternset> Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-07-29 09:45:18 UTC (rev 10408) +++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-07-29 10:36:03 UTC (rev 10409) @@ -71,7 +71,6 @@ <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version> <sun.jaxws.version>2.1.3</sun.jaxws.version> <woodstox.version>3.2.6</woodstox.version> - <wscommons.policy.version>1.0</wscommons.policy.version> <wsdl4j.version>1.6.1</wsdl4j.version> <xmlsec.version>1.4.2</xmlsec.version> <xalan.version>2.7.0</xalan.version> @@ -256,11 +255,6 @@ <version>${jboss.logging.version}</version> </dependency> <dependency> - <groupId>wscommons-policy</groupId> - <artifactId>policy</artifactId> - <version>${wscommons.policy.version}</version> - </dependency> - <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-lgpl</artifactId> <version>${woodstox.version}</version>