Author: richard.opalka(a)jboss.com Date: 2011-04-15 05:34:06 -0400 (Fri, 15 Apr 2011) New Revision: 14119 Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/ 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/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/ 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/jvnet/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/module.xml Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 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/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: [JBWS-3222] resuscitating JBossWS command line tools for Native Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2011-04-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2011-04-15 09:34:06 UTC (rev 14119) @@ -130,14 +130,20 @@ @Override public void provide(String endpointClass) { + final ClassLoader origLoader = SecurityActions.getContextClassLoader(); try { + SecurityActions.setContextClassLoader(loader); provide(loader.loadClass(endpointClass)); } catch (ClassNotFoundException e) { throw new WSException("Class not found: " + endpointClass); } + finally + { + SecurityActions.setContextClassLoader(origLoader); + } } @Override Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SecurityActions.java 2011-04-15 09:34:06 UTC (rev 14119) @@ -0,0 +1,89 @@ +/* + * 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. + */ + +package org.jboss.ws.tools.jaxws.impl; + +import java.security.AccessController; +import java.security.PrivilegedAction; + +/** + * TCCL utility methods. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class SecurityActions +{ + + private SecurityActions() + { + // forbidden instantiation + } + + /** + * Get context classloader. + * + * @return the current context classloader + */ + static ClassLoader getContextClassLoader() + { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) + { + return Thread.currentThread().getContextClassLoader(); + } + else + { + return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { + public ClassLoader run() + { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + } + + /** + * Set context classloader. + * + * @param classLoader the classloader + */ + static void setContextClassLoader(final ClassLoader classLoader) + { + if (System.getSecurityManager() == null) + { + Thread.currentThread().setContextClassLoader(classLoader); + } + else + { + AccessController.doPrivileged(new PrivilegedAction<Object>() + { + public Object run() + { + Thread.currentThread().setContextClassLoader(classLoader); + return null; + } + }); + } + } + + +} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2011-04-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2011-04-15 09:34:06 UTC (rev 14119) @@ -197,6 +197,7 @@ if (stream != null) { args.add("-verbose"); + args.add("-Xdebug"); } else { Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/javac/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -0,0 +1,34 @@ +<?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="com.sun.tools.javac"> + <dependencies> + <module name="system" export="false"> + <exports> + <include-set> + <path name="com/sun/tools/javac"/> + </include-set> + </exports> + </module> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/tools/ws/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -0,0 +1,41 @@ +<?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="com.sun.tools.ws"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.jws.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + <module name="com.sun.xml.bind" services="import"/> + <module name="com.sun.xml.ws"/> + <module name="com.sun.xml.ws.policy"/> + </dependencies> + +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/stream/buffer/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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="com.sun.xml.stream.buffer"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api"/> + <module name="org.jvnet.staxex"/> + </dependencies> + +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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="com.sun.xml.ws"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="com.sun.xml.stream.buffer"/> + <module name="javax.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + </dependencies> + +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ws/policy/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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="com.sun.xml.ws.policy"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + </dependencies> +</module> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -28,8 +28,12 @@ </resources> <dependencies> + <module name="javax.api"/> + <module name="javax.jws.api"/> <module name="javax.wsdl4j.api" export="true"/> + <module name="javax.xml.ws.api"/> <module name="com.sun.xml.bind" services="export" export="true"/> + <module name="com.sun.tools.javac"/> <module name="org.jboss.ws.api" export="true"/> <module name="org.jboss.ws.spi" export="true"/> <module name="org.jboss.ws.common" export="true"/> @@ -38,9 +42,13 @@ <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> <imports> <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> </imports> <exports> <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> </exports> </module> <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/> 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-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -29,6 +29,7 @@ </resources> <dependencies> + <module name="gnu.getopt"/> <module name="javax.api"/> <module name="javax.annotation.api"/> <module name="javax.ejb.api"/> @@ -37,10 +38,12 @@ <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> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-04-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -29,6 +29,7 @@ </resources> <dependencies> + <module name="com.sun.tools.ws" services="import"/> <module name="com.sun.xml.bind" services="import"/> <module name="com.sun.xml.fastinfoset"/> <module name="javax.api" /> Added: 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 (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -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> Added: 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 (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -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> Added: stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jvnet/staxex/main/module.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -0,0 +1,36 @@ +<?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.jvnet.staxex"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api"/> + </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-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -329,11 +329,36 @@ <include name="**/xmlsec.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/com/sun/tools/ws/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jaxws-tools.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/com/sun/xml/stream/buffer/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/streambuffer.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/com/sun/xml/ws/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jaxws-rt.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/com/sun/xml/ws/policy/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/policy.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/com/sun/xml/fastinfoset/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/FastInfoset.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/stax-ex.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/org/codehaus/jettison/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jettison.jar"/> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -86,9 +86,9 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class" /> </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> </war> <!-- jaxws-handlerlifecycle --> @@ -143,6 +143,9 @@ <include name="org/jboss/test/ws/jaxws/jbws771/*.class" /> <exclude name="org/jboss/test/ws/jaxws/jbws771/*TestCase.class" /> </fileset> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> </jar> <!-- jaxws-jbws871 --> @@ -230,6 +233,9 @@ <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.class" /> </fileset> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> </jar> <!-- jaxws-jbws1909 --> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-04-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-04-15 09:34:06 UTC (rev 14119) @@ -47,6 +47,8 @@ public void testWSToolsFromCommandLine() throws Exception { + if (!isTargetJBoss6()) return; // wstools.sh(.bat) not available since AS7 + // use absolute path for the output to be re-usable File dest = createResourceFile("wstools" + FS + "java"); dest.mkdirs(); Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-04-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -772,7 +772,6 @@ <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude> <!-- EJB3 Ann driven deployments --> - <exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude> <!-- F Cannot find service endpoint target --> <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> <!-- TODO: implement EJB security integration --> <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> <!-- F Failed to determine resource binding value for BindingDescription --> @@ -820,18 +819,6 @@ <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/jbws771/**</exclude> - <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/jbws2633/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2637/**</exclude> - <exclude>org/jboss/test/ws/tools/scripts/ScriptTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude> - <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' --> <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude> @@ -872,6 +859,11 @@ <exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase*</exclude> + <!-- # [JBWS-3271] --> + <exclude>org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase*</exclude> + <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> </excludes> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2011-04-15 08:12:06 UTC (rev 14118) +++ stack/native/trunk/pom.xml 2011-04-15 09:34:06 UTC (rev 14119) @@ -533,6 +533,18 @@ </profile> <!-- + Name: jboss700 + Descr: JBoss-7.0.0 specific options + --> + <profile> + <id>jboss700</id> + <properties> + <jbossws.integration.target>jboss700</jbossws.integration.target> + <jboss.home>${jboss700.home}</jboss.home> + </properties> + </profile> + + <!-- Name: smoketest Descr: Executes the smoke tests -->