Author: alessio.soldano(a)jboss.com Date: 2011-04-15 04:01:35 -0400 (Fri, 15 Apr 2011) New Revision: 14117 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml Removed: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: Restore tools functionalities now that AS7 is update (svn merge -r 14110:14109 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .) Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-15 03:32:50 UTC (rev 14116) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -41,6 +41,7 @@ <module name="javax.xml.stream.api" /> <module name="javax.xml.ws.api" /> <module name="org.apache.neethi" /> + <module name="org.apache.velocity" /> <module name="org.apache.ws.commons.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-15 03:32:50 UTC (rev 14116) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -28,7 +28,10 @@ </resources> <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.jws.api" export="true"/> <module name="javax.wsdl4j.api" export="true"/> + <module name="javax.xml.ws.api" export="true"/> <module name="com.sun.xml.bind" services="export" export="true"/> <module name="org.jboss.ws.api" export="true"/> <module name="org.jboss.ws.spi" export="true"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-15 03:32:50 UTC (rev 14116) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -29,6 +29,7 @@ </resources> <dependencies> + <module name="gnu.getopt"/> <module name="javax.api"/> <module name="javax.annotation.api"/> <module name="javax.ejb.api"/> @@ -36,10 +37,12 @@ <module name="javax.servlet.api"/> <module name="javax.wsdl4j.api" /> <module name="javax.xml.ws.api"/> + <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> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-04-15 03:32:50 UTC (rev 14116) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -49,6 +49,7 @@ <include path="META-INF/"/> </imports> </module> + <module name="org.apache.log4j" /> <module name="org.apache.neethi" /> <module name="org.jboss.logging" /> <module name="org.springframework.spring" optional="true" /> Deleted: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-14 18:54:10 UTC (rev 14109) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -1,33 +0,0 @@ -<?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.wsconsume"> - - <main-class name="org.jboss.wsf.spi.tools.cmd.WSConsume"/> - - <dependencies> - <module name="org.jboss.ws.common"/> - </dependencies> - -</module> Copied: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml (from rev 14109, stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml) =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -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.0" name="org.jboss.ws.tools.wsconsume"> + + <main-class name="org.jboss.wsf.spi.tools.cmd.WSConsume"/> + + <dependencies> + <module name="org.jboss.ws.common"/> + </dependencies> + +</module> Deleted: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-14 18:54:10 UTC (rev 14109) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -1,33 +0,0 @@ -<?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.wsprovide"> - - <main-class name="org.jboss.wsf.spi.tools.cmd.WSProvide"/> - - <dependencies> - <module name="org.jboss.ws.common"/> - </dependencies> - -</module> Copied: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml (from rev 14109, stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml) =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -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.0" name="org.jboss.ws.tools.wsprovide"> + + <main-class name="org.jboss.wsf.spi.tools.cmd.WSProvide"/> + + <dependencies> + <module name="org.jboss.ws.common"/> + </dependencies> + +</module> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-15 03:32:50 UTC (rev 14116) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-15 08:01:35 UTC (rev 14117) @@ -978,6 +978,14 @@ <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude> + <!-- # [JBWS-3222] Script tests --> + <exclude>org/jboss/test/ws/jaxws/jbws2528/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2529/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2591/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2593/**</exclude> + <exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude> + <!-- # [JBWS-3205] JDKLogManager not used --> <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>