Author: fnasser(a)redhat.com Date: 2009-12-03 09:20:30 -0500 (Thu, 03 Dec 2009) New Revision: 11188 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml Log: Use the versions from the AS cleint directory to recreate FastInfoset, xmlsec and wsdl4j in the new CXF jbossws.deploy directory, avoiding a different MD5 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 10:02:58 UTC (rev 11187) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 14:20:30 UTC (rev 11188) @@ -29,7 +29,7 @@ <include name="**/asm.jar"/> <include name="**/cxf-*.jar"/> <include name="**/commons-collections.jar"/> - <include name="**/commons-lang.jar"/> + <include name="**/commons-lang.jar"/ <include name="**/jbossws-common.jar"/> <include name="**/jbossws-cxf-client*.jar"/> <include name="**/jbossws-framework.jar"/> @@ -74,12 +74,15 @@ <include name="**/spring-context.jar"/> <include name="**/spring-core.jar"/> <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> <include name="**/xml-resolver.jar"/> - <include name="**/xmlsec.jar"/> <include name="**/asm.jar"/> <include name="**/XmlSchema.jar"/> - <include name="**/FastInfoset.jar"/> + <!-- <include name="**/FastInfoset.jar"/> --> + <include name="${installserver}/../../client/FastInfoset.jar"/> + <!-- <include name="**/xmlsec.jar"/> --> + <include name="${installserver}/../../client/xmlsec.jar"/> + <!-- <include name="**/wss4j.jar"/> --> + <include name="${installserver}/../../client/wss4j.jar"/> </patternset> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-03 10:02:58 UTC (rev 11187) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-03 14:20:30 UTC (rev 11188) @@ -38,16 +38,16 @@ <include>org.springframework:spring-beans:jar</include> <include>org.springframework:spring-context:jar</include> <include>org.springframework:spring-core:jar</include> - <include>wsdl4j:wsdl4j:jar</include> <include>xml-resolver:xml-resolver:jar</include> <include>org.apache.ws.commons.schema:XmlSchema:jar</include> - <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>org.apache.ws.security:wss4j:jar</include> - <include>org.apache.santuario:xmlsec:jar</include> <include>asm:asm:jar</include> <include>apache-velocity:velocity:jar</include> <include>commons-collections:commons-collections:jar</include> <include>commons-lang:commons-lang:jar</include> + <!-- <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> --> + <!-- <include>org.apache.santuario:xmlsec:jar</include> --> + <!-- <include>wsdl4j:wsdl4j:jar</include> --> </includes> </dependencySet> <dependencySet>