Author: richard.opalka(a)jboss.com Date: 2011-04-18 09:22:10 -0400 (Mon, 18 Apr 2011) New Revision: 14143 Added: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3273] refactoring jbossws-common.jar -> jbossws-common-tools.jar AS7 modules Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-18 13:07:20 UTC (rev 14142) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-18 13:22:10 UTC (rev 14143) @@ -29,7 +29,6 @@ </resources> <dependencies> - <module name="gnu.getopt"/> <module name="javax.api"/> <module name="javax.annotation.api"/> <module name="javax.ejb.api"/> @@ -38,12 +37,10 @@ <module name="javax.wsdl4j.api" /> <module name="javax.xml.ws.api"/> <module name="org.jboss.jaxbintros"/> - <module name="org.jboss.modules"/> <module name="org.jboss.ws.api"/> <module name="org.jboss.ws.spi"/> <module name="org.jboss.logging"/> <module name="org.jboss.common-core"/> - <module name="org.apache.log4j"/> <module name="org.apache.xerces" services="import"/> </dependencies> </module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml 2011-04-18 13:22:10 UTC (rev 14143) @@ -0,0 +1,38 @@ +<?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.0" name="org.jboss.ws.tools.common"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="gnu.getopt"/> + <module name="org.apache.log4j"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.ws.api"/> + </dependencies> + +</module> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-18 13:07:20 UTC (rev 14142) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-18 13:22:10 UTC (rev 14143) @@ -27,7 +27,7 @@ <main-class name="org.jboss.wsf.spi.tools.cmd.WSConsume"/> <dependencies> - <module name="org.jboss.ws.common"/> + <module name="org.jboss.ws.tools.common"/> </dependencies> </module> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-18 13:07:20 UTC (rev 14142) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-18 13:22:10 UTC (rev 14143) @@ -27,7 +27,7 @@ <main-class name="org.jboss.wsf.spi.tools.cmd.WSProvide"/> <dependencies> - <module name="org.jboss.ws.common"/> + <module name="org.jboss.ws.tools.common"/> </dependencies> </module> 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 2011-04-18 13:07:20 UTC (rev 14142) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-18 13:22:10 UTC (rev 14143) @@ -380,6 +380,11 @@ <include name="**/jbossws-common.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/org/jboss/ws/tools/common/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-common-tools.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/org/jboss/ws/spi/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-spi.jar"/> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-04-18 13:07:20 UTC (rev 14142) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-04-18 13:22:10 UTC (rev 14143) @@ -52,6 +52,12 @@ <artifactId>jbossws-common-tools</artifactId> </dependency> <dependency> + <groupId>gnu-getopt</groupId> + <artifactId>getopt</artifactId> + <version>1.0.13</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun</groupId> <artifactId>tools</artifactId> <version>1.5.0</version>