Author: alessio.soldano(a)jboss.com Date: 2013-05-02 16:27:08 -0400 (Thu, 02 May 2013) New Revision: 17528 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/module.xml Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-3629] Add wstx 4.2.0 to bin dist and install it on AS 7 Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-05-02 15:16:42 UTC (rev 17527) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-05-02 20:27:08 UTC (rev 17528) @@ -59,6 +59,8 @@ <include>jboss.jaxbintros:jboss-jaxb-intros</include> <include>javax.xml.stream:stax-api:jar</include> <include>javax.jws:jsr181-api:jar</include> + <include>org.codehaus.woodstox:stax2-api:jar</include> + <include>org.codehaus.woodstox:woodstox-core-asl:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useProjectArtifact>false</useProjectArtifact> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/module.xml 2013-05-02 20:27:08 UTC (rev 17528) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<module xmlns="urn:jboss:module:1.1" name="org.codehaus.woodstox"> + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.xml.stream.api"/> + <module name="javax.api"/> + </dependencies> +</module> \ No newline at end of file Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/module.xml 2013-05-02 20:27:08 UTC (rev 17528) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> +<module xmlns="urn:jboss:module:1.1" name="org.codehaus.woodstox"> + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.xml.stream.api"/> + <module name="javax.api"/> + </dependencies> +</module> \ No newline at end of file Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-05-02 15:16:42 UTC (rev 17527) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-05-02 20:27:08 UTC (rev 17528) @@ -235,6 +235,12 @@ <include name="**/xmltooling.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/org/codehaus/woodstox/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/woodstox-core-asl.jar"/> + <include name="**/stax2-api.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name=&quot;**/jbossws-cxf-resources-(a){jbossid}.jar&quot;/&gt;