[jbossws-commits] JBossWS SVN: r13350 - in stack/native/trunk: modules/resources/src/main/resources/bin and 3 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-11-27 21:28:47 -0500 (Sat, 27 Nov 2010) New Revision: 13350 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/src/main/distro/build-project-gen.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2709] jbossws-native stack changes for installing jbossws-api.jar Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2010-11-28 02:28:47 UTC (rev 13350) @@ -99,6 +99,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaDataParser; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.xb.binding.ObjectModelFactory; @@ -286,12 +287,14 @@ InputStream is = fileURL.openStream(); try { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - unmarshaller.setValidation(true); - unmarshaller.setSchemaValidation(true); - unmarshaller.setEntityResolver(new JBossWSEntityResolver()); - ObjectModelFactory factory = new HandlerChainsObjectFactory(); - handlerChainsMetaData = (UnifiedHandlerChainsMetaData)unmarshaller.unmarshal(is, factory, null); +// Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); +// unmarshaller.setValidation(true); +// unmarshaller.setSchemaValidation(true); +// unmarshaller.setEntityResolver(new JBossWSEntityResolver()); +// ObjectModelFactory factory = new HandlerChainsObjectFactory(); +// handlerChainsMetaData = (UnifiedHandlerChainsMetaData)unmarshaller.unmarshal(is, factory, null); + + handlerChainsMetaData = UnifiedHandlerChainsMetaDataParser.parse(is); } finally { Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-11-28 02:28:47 UTC (rev 13350) @@ -33,6 +33,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-api.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-11-28 02:28:47 UTC (rev 13350) @@ -57,6 +57,7 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-framework.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-11-28 02:28:47 UTC (rev 13350) @@ -26,6 +26,7 @@ rem Shared libs set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JAVAC_JAR% +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-api.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-11-28 02:28:47 UTC (rev 13350) @@ -50,6 +50,7 @@ # Shared libs WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JAVA_HOME/lib/tools.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-framework.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-11-28 02:28:47 UTC (rev 13350) @@ -60,6 +60,7 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-services.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-11-28 02:28:47 UTC (rev 13350) @@ -80,6 +80,7 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-services.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-11-28 02:28:47 UTC (rev 13350) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client! /jbossws-framework.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*.jar lib/endorsed/*ja! xws*.jar +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client! /jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/! *jbossws* lib/endorsed/*jaxb*.jar lib/endorsed/*jaxws*.jar Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-11-28 02:28:47 UTC (rev 13350) @@ -36,6 +36,7 @@ <include name="**/jaxws-tools.jar"/> <include name="**/jaxws-rt.jar"/> <include name="**/policy.jar"/> + <include name="**/jbossws-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-native-client.jar"/> @@ -72,6 +73,7 @@ <include name="**/jaxws-api.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/jboss-jaxb-intros.jar"/> + <include name="**/jbossws-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-native-core.jar"/> Modified: stack/native/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/native/trunk/src/main/distro/build-project-gen.xml 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/src/main/distro/build-project-gen.xml 2010-11-28 02:28:47 UTC (rev 13350) @@ -109,6 +109,7 @@ <pathelement location="${jboss.client}/jaxws-api.jar"/> <pathelement location="${jboss.client}/jsr181-api.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jbossws-api.jar"/> <pathelement location="${jboss.client}/jbossws-common.jar"/> <pathelement location="${jboss.client}/jbossws-spi.jar"/> <pathelement location="${jboss.client}/jaxrpc-api.jar"/> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-28 02:27:42 UTC (rev 13349) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-28 02:28:47 UTC (rev 13350) @@ -50,6 +50,7 @@ <include>com.sun.xml.ws:jaxws-rt:jar</include> <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include> <include>junit:junit:jar</include> + <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> <include>org.codehaus.jettison:jettison:jar</include>