Author: heiko.braun(a)jboss.com Date: 2008-03-18 05:34:29 -0400 (Tue, 18 Mar 2008) New Revision: 5991 Modified: stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/ant-import/jbossws-deploy-macros.xml stack/metro/trunk/ant-import/metro-build-adapter.xml stack/metro/trunk/metro-trunk.iml stack/metro/trunk/version.properties Log: The Stax API was missing from deploy. The woodstax lib is pulled from repository and not the metro CVS Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 09:34:29 UTC (rev 5991) @@ -77,6 +77,7 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> <checksum file="${int.metro.dir}/version.properties" fileext=".md5"/> </target> Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-18 09:34:29 UTC (rev 5991) @@ -39,12 +39,14 @@ <include name="**/jboss-wsit-rt.jar"/> <include name="**/jboss-wsit-tools.jar"/> <include name="**/streambuffer.jar"/> + <include name="**/stax-api.jar"/> <include name="**/stax-ex.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> <include name="**/stax-api.jar"/> <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> </patternset> <patternset id="jbossws.lib.patternset"> @@ -67,6 +69,7 @@ <include name="**/jaxws-api.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/saaj-api.jar"/> + <include name="**/stax-api.jar"/> </patternset> <patternset id="jbossws.service.lib.patternset"> @@ -89,14 +92,13 @@ <include name="**/resolver.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> - <include name="**/sjsxp.jar"/> - <include name="**/stax-api.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-asl-3.2.1.jar"/> + <include name="**/wstx.jar"/> <include name="**/xmldsig.jar"/> <include name="**/xws-security.jar"/> </patternset> Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml =================================================================== --- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-18 09:34:29 UTC (rev 5991) @@ -61,7 +61,6 @@ <available property="jaxws-local-transport.available" filepath="${lib.runtime.dir}" file="jaxws-local-transport.jar"/> <available property="stax-utils.available" filepath="${lib.runtime.dir}" file="stax-utils.jar"/> <available property="txnannprocessor.available" filepath="${lib.runtime.dir}" file="txnannprocessor.jar"/> - <available property="wstx-asl-3.2.1.available" filepath="${lib.runtime.dir}" file="wstx-asl-3.2.1.jar"/> <available property="xmldsig.available" filepath="${lib.runtime.dir}" file="xmldsig.jar"/> <available property="xws-security.available" filepath="${lib.runtime.dir}" file="xws-security.jar"/> <available property="resolver.available" filepath="${lib.runtime.dir}" file="resolver.jar"/> @@ -69,7 +68,6 @@ <fail message="jaxws-local-transport.jar not available" unless="jaxws-local-transport.available"/> <fail message="stax-utils.jar not available" unless="stax-utils.available"/> <fail message="txnannprocessor.jar not available" unless="txnannprocessor.available"/> - <fail message="wstx-asl-3.2.1.jar not available" unless="wstx-asl-3.2.1.available"/> <fail message="xmldsig.jar not available" unless="xmldsig.available"/> <fail message="xws-security.jar not available" unless="xws-security.available"/> <fail message="resolver.jar not available" unless="resolver.available"/> @@ -92,7 +90,6 @@ <include name="jaxws-local-transport.jar"/> <include name="stax-utils.jar"/> <include name="txnannprocessor.jar"/> - <include name="wstx-asl-3.2.1.jar"/> <include name="xmldsig.jar"/> <include name="xws-security.jar"/> Modified: stack/metro/trunk/metro-trunk.iml =================================================================== --- stack/metro/trunk/metro-trunk.iml 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/metro-trunk.iml 2008-03-18 09:34:29 UTC (rev 5991) @@ -4,6 +4,7 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/jaxws-src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" /> @@ -274,87 +275,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/wstx-asl-3.2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/stax-utils.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/xws-security.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/jboss-wsit-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/resolver.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/jboss-wsit-rt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/jaxws-local-transport.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/xmldsig.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/txnannprocessor.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/../../../framework/trunk/thirdparty/dom4j.jar!/" /> </CLASSES> <JAVADOC /> @@ -370,7 +290,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="jaxws-2.1.3-src" /> <orderEntryProperties /> </component> </module> Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/version.properties 2008-03-18 09:34:29 UTC (rev 5991) @@ -30,6 +30,7 @@ sun-jaxrpc=1.1 sun-jaxws=2.1.3 sun-servlet=2.5 +stax-api=1.0 ibm-wsdl4j=1.6.2 woodstox=3.1.1