Author: richard.opalka(a)jboss.com Date: 2011-03-10 06:53:01 -0500 (Thu, 10 Mar 2011) New Revision: 13880 Added: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml stack/native/trunk/modules/resources/src/main/resources/modules/ stack/native/trunk/modules/resources/src/main/resources/modules/com/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/javax/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/ 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/jaxbintros/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/ 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/jaxws-client/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/ 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-factories/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml stack/native/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf Removed: stack/native/trunk/modules/resources/src/main/resources/modules/com/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/javax/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/ 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/jaxbintros/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/ 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/jaxws-client/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/ 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-factories/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory Modified: stack/native/trunk/ stack/native/trunk/build.xml stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityActions.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/dist/ stack/native/trunk/modules/dist/management/ stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/dist/src/main/distro/build-setup.xml stack/native/trunk/modules/dist/src/main/distro/build.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/ stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/shared-tests/pom.xml stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml stack/native/trunk/pom.xml Log: [JBWS-3216] merging working branch upstream - 'svn merge -r 13835:HEAD https://svn.jboss.org/repos/jbossws/stack/native/branches/ropalka' Property changes on: stack/native/trunk ___________________________________________________________________ Added: svn:mergeinfo + /stack/native/branches/ropalka:13836-13879 Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/build.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -60,8 +60,11 @@ <condition property="jboss601.home" value="${profiles.profile.properties.jboss601.home}"> <isset property="profiles.profile.properties.jboss601.home"/> </condition> + <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}"> + <isset property="profiles.profile.properties.jboss700.home"/> + </condition> - <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value to set"> + <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value or -Djboss700.home=value to set"> <condition> <and> <not> @@ -70,6 +73,9 @@ <not> <isset property="jboss601.home"/> </not> + <not> + <isset property="jboss700.home"/> + </not> </and> </condition> </fail> @@ -77,6 +83,7 @@ <echo/> <echo message="jboss600.home=${jboss600.home}"/> <echo message="jboss601.home=${jboss601.home}"/> + <echo message="jboss700.home=${jboss700.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/client/pom.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -36,12 +36,8 @@ </dependency> <dependency> <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> + <artifactId>jboss-logging</artifactId> </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </dependency> </dependencies> <build> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/core/pom.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -16,7 +16,6 @@ <properties> <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version> <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version> - <jboss.jbossxb.version>2.0.1.GA</jboss.jbossxb.version> </properties> <!-- Dependencies --> @@ -82,9 +81,13 @@ <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> <scope>provided</scope> - <version>${jboss.jbossxb.version}</version> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <scope>provided</scope> @@ -194,6 +197,7 @@ </execution> <execution> <id>copy-dependencies</id> + <phase>prepare-package</phase> <goals> <goal>unpack</goal> </goals> @@ -216,6 +220,7 @@ <!-- <execution> <id>copy-dependencies</id> + <phase>prepare-package</phase> <goals> <goal>unpack</goal> </goals> @@ -242,7 +247,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>run</goal> </goals> Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityActions.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityActions.java 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityActions.java 2011-03-10 11:53:01 UTC (rev 13880) @@ -59,6 +59,30 @@ } /** + * 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; + } + }); + } + } + + /** * Get a system property * * @param name Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java 2011-03-10 11:53:01 UTC (rev 13880) @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.List; +import org.apache.xml.security.Init; import org.jboss.ws.extensions.security.element.EncryptedKey; import org.jboss.ws.extensions.security.element.SecurityHeader; import org.jboss.ws.extensions.security.element.SecurityProcess; @@ -35,7 +36,6 @@ import org.jboss.ws.extensions.security.element.UsernameToken; import org.jboss.ws.extensions.security.exception.WSSecurityException; import org.jboss.ws.extensions.security.nonce.NonceFactory; -import org.jboss.ws.extensions.security.operation.AuthorizeOperation; import org.jboss.ws.extensions.security.operation.DecryptionOperation; import org.jboss.ws.extensions.security.operation.ReceiveUsernameOperation; import org.jboss.ws.extensions.security.operation.ReceiveX509Certificate; @@ -45,7 +45,6 @@ import org.jboss.ws.extensions.security.operation.SignatureVerificationOperation; import org.jboss.ws.extensions.security.operation.TimestampVerificationOperation; import org.jboss.ws.metadata.wsse.Authenticate; -import org.jboss.ws.metadata.wsse.Authorize; import org.jboss.ws.metadata.wsse.TimestampVerification; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -77,7 +76,16 @@ public SecurityDecoder(SecurityStore store, NonceFactory nonceFactory, TimestampVerification timestampVerification, Authenticate authenticate) { - org.apache.xml.security.Init.init(); + final ClassLoader origCL = SecurityActions.getContextClassLoader(); + try + { + SecurityActions.setContextClassLoader(Init.class.getClassLoader()); + Init.init(); + } + finally + { + SecurityActions.setContextClassLoader(origCL); + } this.store = store; this.nonceFactory = nonceFactory; this.timestampVerification = timestampVerification; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityEncoder.java 2011-03-10 11:53:01 UTC (rev 13880) @@ -23,6 +23,7 @@ import java.util.List; +import org.apache.xml.security.Init; import org.jboss.ws.extensions.security.element.SecurityHeader; import org.jboss.ws.extensions.security.exception.WSSecurityException; import org.jboss.ws.extensions.security.operation.EncodingOperation; @@ -43,7 +44,16 @@ public SecurityEncoder(List<EncodingOperation> operations, SecurityStore store) { - org.apache.xml.security.Init.init(); + final ClassLoader origCL = SecurityActions.getContextClassLoader(); + try + { + SecurityActions.setContextClassLoader(Init.class.getClassLoader()); + Init.init(); + } + finally + { + SecurityActions.setContextClassLoader(origCL); + } this.operations = operations; this.store = store; } Copied: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml (from rev 13879, stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config-as7.xml) =================================================================== --- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml (rev 0) +++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,91 @@ +<?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. + --> + +<deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0"> + + <deploymentAspect class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides" class="java.lang.String">ContextProperties, StackDescriptor</property> + <property name="contextProperties" class="java.util.HashMap"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>stack.transport.class</key> + <value>org.jboss.wsf.stack.jbws.EndpointServlet</value> + </entry> + </map> + </property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> + <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property> + <property name="provides" class="java.lang.String">InitializedMetaDataModel</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires" class="java.lang.String">ContainerMetaData</property> + <property name="provides" class="java.lang.String">StackEndpointHandler</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> + <property name="requires" class="java.lang.String">UnifiedMetaDataModel, JAXBIntros</property> + <property name="provides" class="java.lang.String">PublishedContract</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> + <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> + <property name="requires" class="java.lang.String">StackEndpointHandler, UnifiedMetaDataModel</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> + <property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property> + <property name="provides" class="java.lang.String">UnifiedMetaDataModel</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect"> + <property name="provides" class="java.lang.String">JAXBIntros</property> + </deploymentAspect> + + <!-- + + <deploymentAspect class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + <property name="requires" class="java.lang.String">RegisteredEndpoint</property> + <property name="provides" class="java.lang.String">EndpointRecordProcessors</property> + <property name="processors"> + <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> + <inject bean="WSMemoryBufferRecorder"/> + <inject bean="WSLogRecorder"/> + </list> + </property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> + <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property> + </deploymentAspect> + + --> + +</deploymentAspects> Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -26,6 +26,11 @@ tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> + <copy + file="${src.dir}/jbossws-native-config-as7.xml" + tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + /> + </target> </project> Property changes on: stack/native/trunk/modules/dist ___________________________________________________________________ Added: svn:ignore + target .classpath .project .settings Property changes on: stack/native/trunk/modules/dist/management ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/dist/pom.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -46,7 +46,12 @@ <version>${project.version}</version> </dependency> - <!--TODO AS7000--> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss700</classifier> + </dependency> <!--test-suite--> <dependency> Property changes on: stack/native/trunk/modules/dist/src ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-03-10 11:53:01 UTC (rev 13880) @@ -5,8 +5,9 @@ # Optional JBoss Home jboss600.home=(a)jboss600.home@ jboss601.home=(a)jboss601.home@ +jboss700.home=(a)jboss700.home@ -# The JBoss server under test. This can be [jboss600jboss601|] +# The JBoss server under test. This can be [jboss600|jboss601|jboss700] jbossws.integration.target=jboss601 # The JBoss settings Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -94,6 +94,55 @@ </target> <!-- ================================================================== --> + <!-- Prepare Deployment Structure JBoss-7.0.0 --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss700" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + + <path id="jbossws-common.path"> + <fileset dir="${deploy.artifacts.dir}"> + <include name="**/jbossws-common.jar"/> + </fileset> + </path> + <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> + + <antcall target="deploy-jbossws-native-modules" inheritall="false"> + <param name="installserver" value="${deploy.structure}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss700 --> + <!-- ================================================================== --> + + <target name="target-jboss700"> + <property name="jbossws.integration.target" value="jboss700"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss700" depends="undeploy-jboss700,deploy-structure-jboss700" description="Deploy jbossws to jboss700"> + <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/> + <copy todir="${jboss700.home}" overwrite="true" verbose="true"> + <fileset dir="${deploy.structure}"> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> + <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> + <installModules targetDir="${jboss700.home}/modules"> + <fileset dir="${deploy.structure}/modules"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + </target> + + <target name="undeploy-jboss700" depends="target-jboss700,init" description="Remove jbossws from jboss700"> + <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> + </target> + + <!-- ================================================================== --> <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf --> <!-- ================================================================== --> Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -35,11 +35,15 @@ <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/> <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/> + <property name="jboss700.modules" value="${jboss700.home}/modules"/> + <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/> + <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/> <available property="jboss600.available" file="${jboss600.available.file}"/> <available property="jboss601.available" file="${jboss601.available.file}"/> + <available property="jboss700.available" file="${jboss700.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -24,6 +24,7 @@ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/deploy.conf"/> <property name="jbossws.default.server.deploy.conf" value="${build.dir}/server-deploy.conf"/> + <property name="jbossws.default.modules.conf" value="${build.dir}/modules-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- Check if ant.properties is available --> Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -28,8 +28,17 @@ </includes> </fileSet> - <!-- management --> + <!-- module.xml files --> <fileSet> + <directory>../resources/src/main/resources/modules</directory> + <outputDirectory>deploy-artifacts/modules</outputDirectory> + <includes> + <include>**/module.xml</include> + </includes> + </fileSet> + + <!-- management console and port component link servlet --> + <fileSet> <directory>./management/target</directory> <outputDirectory>deploy-artifacts/lib</outputDirectory> <includes> @@ -47,6 +56,7 @@ <include>org.jboss.ws.native:jbossws-native-client</include> <include>org.jboss.ws.native:jbossws-native-factories:jar</include> <include>org.jboss.ws.native:jbossws-native-services:jar</include> + <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss700</include> <include>org.jboss.ws.native:jbossws-native-core</include> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>javax.jws:jsr181-api:jar</include> @@ -80,6 +90,7 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-jboss600:jar</include> + <include>org.jboss:jbossxb:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/pom.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -20,7 +20,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>run</goal> </goals> @@ -34,6 +34,30 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>all</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <excludes> + <exclude>**/jbossws-jboss700/**</exclude> + </excludes> + </configuration> + </execution> + <execution> + <id>jboss700</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss700</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss700/jbossws.beans</classesDirectory> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,35 +0,0 @@ -<?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.fastinfoset"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api"/> - </dependencies> - -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,35 @@ +<?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.fastinfoset"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + </dependencies> + +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,31 +0,0 @@ -<?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="javax.xml.rpc.api"> - - <resources> - <!-- Insert resources here --> - </resources> - -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/javax/xml/rpc/api/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,31 @@ +<?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="javax.xml.rpc.api"> + + <resources> + <!-- Insert resources here --> + </resources> + +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,35 +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.apache.commons.beanutils"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="org.slf4j.jcl-over-slf4j"/> - </dependencies> - -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,35 @@ +<?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.apache.commons.beanutils"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="org.slf4j.jcl-over-slf4j"/> + </dependencies> + +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,37 +0,0 @@ -<?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="org.apache.ws.commons.policy"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="javax.xml.stream.api"/> - <module name="org.slf4j.jcl-over-slf4j"/> - </dependencies> - -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -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="org.apache.ws.commons.policy"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api"/> + <module name="org.slf4j.jcl-over-slf4j"/> + </dependencies> + +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,37 +0,0 @@ -<?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="org.apache.xmlsec"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="org.apache.xalan"/> - <module name="org.slf4j.jcl-over-slf4j"/> - </dependencies> - -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -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="org.apache.xmlsec"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.apache.xalan"/> + <module name="org.slf4j.jcl-over-slf4j"/> + </dependencies> + +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,36 +0,0 @@ -<?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="org.codehaus.jettison"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="javax.xml.stream.api"/> - </dependencies> - -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,36 @@ +<?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="org.codehaus.jettison"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api"/> + </dependencies> + +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,35 +0,0 @@ -<?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="org.codehaus.woodstox"> - - <resources> - <!-- Insert resources here --> - </resources> - - <!--dependencies> - <module name="javax.xml.stream.api"/> - </dependencies--> - -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,35 @@ +<?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="org.codehaus.woodstox"> + + <resources> + <!-- Insert resources here --> + </resources> + + <!--dependencies> + <module name="javax.xml.stream.api"/> + </dependencies--> + +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,63 +0,0 @@ -<?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="org.jboss.as.webservices"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="com.sun.xml.bind" services="import"/> <!-- TODO: JAXB API relies on TCCL - investigate how to workaround this factories import --> - <module name="org.apache.xerces" services="import"/> <!-- TODO: DOM API relies on TCCL - investigate how to workaround this factories import --> - <module name="javax.api"/> - <module name="javax.jws.api"/> - <module name="javax.xml.ws.api"/> - <module name="org.jboss.jandex"/> - <module name="org.jboss.metadata"/> - <module name="org.jboss.staxmapper"/> - <module name="org.jboss.as.controller"/> - <module name="org.jboss.as.managed-beans"/> - <module name="org.jboss.as.server"/> - <module name="org.jboss.as.ee"/> - <module name="org.jboss.as.web"/> - <module name="org.jboss.threads"/> - <module name="org.jboss.modules"/> - <module name="org.jboss.msc"/> - <module name="org.jboss.vfs"/> - <module name="org.jboss.logging"/> - <module name="org.jboss.common-core" /> - <module name="org.jboss.ws.api" /> - <module name="org.jboss.ws.common" /> - <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/> - <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> - <module name="org.jboss.ws.native.jbossws-native-core" services="import"> - <imports> - <include path="META-INF"/> - </imports> - </module> - <module name="org.jboss.ws.jaxws-client" services="import"/> - <module name="org.jboss.ws.spi" /> - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,63 @@ +<?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="org.jboss.as.webservices"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="com.sun.xml.bind" services="import"/> <!-- TODO: JAXB API relies on TCCL - investigate how to workaround this factories import --> + <module name="org.apache.xerces" services="import"/> <!-- TODO: DOM API relies on TCCL - investigate how to workaround this factories import --> + <module name="javax.api"/> + <module name="javax.jws.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.jandex"/> + <module name="org.jboss.metadata"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.managed-beans"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.web"/> + <module name="org.jboss.threads"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.vfs"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/> + <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> + <module name="org.jboss.ws.native.jbossws-native-core" services="import"> + <imports> + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.jaxws-client" services="import"/> + <module name="org.jboss.ws.spi" /> + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,41 +0,0 @@ -<?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="org.jboss.as.webservices.server.integration"> - - <resources> - </resources> - - <dependencies> - <module name="com.sun.xml.bind" services="export" export="true"/> - <module name="org.jboss.ws.spi" export="true"/> - <module name="org.jboss.ws.common" export="true"/> - <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/> - <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"/> - <module name="org.apache.xalan" services="export" export="true"/> - <module name="org.apache.xerces" services="export" export="true"/> - <module name="org.jboss.as.webservices" services="export" export="true"/> - <module name="wsdl4j.wsdl4j" export="true"/> - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml (from rev 13879, stack/native/branches/ropalka/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 (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,41 @@ +<?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="org.jboss.as.webservices.server.integration"> + + <resources> + </resources> + + <dependencies> + <module name="com.sun.xml.bind" services="export" export="true"/> + <module name="org.jboss.ws.spi" export="true"/> + <module name="org.jboss.ws.common" export="true"/> + <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/> + <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"/> + <module name="org.apache.xalan" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + <module name="wsdl4j.wsdl4j" export="true"/> + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,38 +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.jaxbintros"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.xml.bind.api" /> - <module name="com.sun.xml.bind" services="import"/> - <module name="org.slf4j.jcl-over-slf4j"/> - <module name="org.apache.commons.beanutils"/> - </dependencies> - -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -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.jaxbintros"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.xml.bind.api" /> + <module name="com.sun.xml.bind" services="import"/> + <module name="org.slf4j.jcl-over-slf4j"/> + <module name="org.apache.commons.beanutils"/> + </dependencies> + +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,34 +0,0 @@ -<?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="org.jboss.ws.api"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api"/> - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -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="org.jboss.ws.api"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,45 +0,0 @@ -<?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="org.jboss.ws.common"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="javax.annotation.api"/> - <module name="javax.ejb.api"/> - <module name="javax.servlet.api"/> - <module name="javax.xml.ws.api"/> - <module name="org.jboss.jaxbintros"/> - <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.xerces" services="import"/> - <module name="wsdl4j.wsdl4j" /> - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml (from rev 13879, stack/native/branches/ropalka/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 (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,45 @@ +<?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="org.jboss.ws.common"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.annotation.api"/> + <module name="javax.ejb.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.jaxbintros"/> + <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.xerces" services="import"/> + <module name="wsdl4j.wsdl4j" /> + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,47 +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.jaxws-client"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api" /> - <module name="javax.xml.bind.api" /> - <module name="com.sun.xml.bind" services="import"/> - <module name="javax.xml.ws.api" /> - <module name="org.jboss.ws.spi" /> - <module name="org.jboss.ws.common" /> - <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/> - <module name="org.jboss.ws.native.jbossws-native-core" services="import"> - <imports> - <include path="META-INF/jbossws-entities.properties"/> - <include path="META-INF/standard-*-config.xml"/> - </imports> - </module> - <module name="org.jboss.logging" /> - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,47 @@ +<?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.jaxws-client"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.xml.bind.api" /> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/> + <module name="org.jboss.ws.native.jbossws-native-core" services="import"> + <imports> + <include path="META-INF/jbossws-entities.properties"/> + <include path="META-INF/standard-*-config.xml"/> + </imports> + </module> + <module name="org.jboss.logging" /> + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,60 +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.native.jbossws-native-core"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="com.sun.xml.bind" services="import"/> - <module name="com.sun.xml.fastinfoset"/> - <module name="javax.api" /> - <module name="javax.servlet.api" /> - <module name="javax.jws.api" /> - <module name="javax.mail.api" /> - <module name="javax.xml.bind.api" /> - <module name="javax.xml.stream.api" /> - <module name="javax.xml.rpc.api" /> - <module name="javax.xml.ws.api" /> - <module name="org.picketbox"/> - <module name="org.apache.xerces" services="import"/> - <module name="org.apache.xmlsec"/> - <module name="org.apache.ws.commons.policy"/> - <module name="org.javassist" /> - <module name="org.codehaus.jettison"/> - <module name="org.jboss.netty" /> - <module name="org.jboss.xb" /> - <module name="org.jboss.ws.api" /> - <module name="org.jboss.ws.spi" /> - <module name="org.jboss.ws.common" /> - <module name="org.jboss.ws.jaxws-client" /> - <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/> - <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> - <module name="org.jboss.common-core" /> - <module name="org.jboss.logging" /> - <module name="wsdl4j.wsdl4j" /> - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml (from rev 13879, stack/native/branches/ropalka/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 (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,60 @@ +<?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.native.jbossws-native-core"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="com.sun.xml.bind" services="import"/> + <module name="com.sun.xml.fastinfoset"/> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.jws.api" /> + <module name="javax.mail.api" /> + <module name="javax.xml.bind.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.rpc.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.picketbox"/> + <module name="org.apache.xerces" services="import"/> + <module name="org.apache.xmlsec"/> + <module name="org.apache.ws.commons.policy"/> + <module name="org.javassist" /> + <module name="org.codehaus.jettison"/> + <module name="org.jboss.netty" /> + <module name="org.jboss.xb" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.jaxws-client" /> + <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/> + <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + <module name="wsdl4j.wsdl4j" /> + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,34 +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.native.jbossws-native-factories"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -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="org.jboss.ws.native.jbossws-native-factories"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,34 +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.native.jbossws-native-services"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -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="org.jboss.ws.native.jbossws-native-services"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,38 +0,0 @@ -<?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="org.jboss.ws.spi"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="javax.xml.stream.api"/> - <module name="javax.xml.ws.api"/> - <module name="org.jboss.logging"/> - <module name="org.jboss.ws.api"/> - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -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="org.jboss.ws.spi"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.ws.api"/> + </dependencies> +</module> Deleted: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -1,36 +0,0 @@ -<?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="org.jboss.xb"> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="org.jboss.logging"/> - <module name="org.jboss.common-core"/> - </dependencies> -</module> Copied: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1,36 @@ +<?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="org.jboss.xb"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + </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-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -276,6 +276,115 @@ </target> <!-- ================================================================== --> + <!-- Modules --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-modules"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <!-- libraries --> + <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-native-client.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-core/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-native-core.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-factories/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-native-factories.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-services/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-native-services.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-api.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/javax/xml/rpc/api/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jaxrpc-api.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/xb/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossxb.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/ws/commons/policy/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/wscommons-policy.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/xmlsec/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/xmlsec.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/codehaus/jettison/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jettison.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/codehaus/woodstox/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/wstx.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/jaxbintros/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jboss-jaxb-intros.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/commons/beanutils/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/commons-beanutils.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-common.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/spi/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-native-resources.jar"/> + </fileset> + </copy> + <!-- module.xml files --> + <installModules targetDir="@{targetdir}"> + <fileset dir="@{thirdpartydir}/modules"> + <include name="**/module.xml"/> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + <copy toDir="@{targetdir}"> + <fileset dir="@{thirdpartydir}/modules"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deploy JBossWS --> <!-- ================================================================== --> @@ -297,11 +406,39 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-native-modules"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}"/> + </target> <!-- ================================================================== --> <!-- Undeploy JBossWS --> <!-- ================================================================== --> + <macrodef name="macro-undeploy-jbossws-modules"> + <attribute name="defaultmodulesconf"/> + <attribute name="targetdir"/> + + <sequential> + <loadfile property="jbossws.modules.conf" srcfile=&quot;(a){targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf&quot; failonerror="false"/> + <loadfile property="jbossws.modules.conf" srcfile="@{defaultmodulesconf}" failonerror="false"/> + + <property name="jboss.modules" value="@{targetdir}/modules"/> + + <delete includeemptydirs="true" verbose="true"> + <fileset dir="${jboss.modules}"> + <include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/> + </fileset> + </delete> + + <!-- delete content of last deployment --> + <delete includeemptydirs="true" verbose="true"> + <fileset dir="${jboss.modules}" includes="${jbossws.modules.conf}"/> + </delete> + </sequential> + </macrodef> + <macrodef name="macro-undeploy-jbossws"> <attribute name="defaultconf"/> <attribute name="defaultserverconf"/> Copied: stack/native/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf (from rev 13879, stack/native/branches/ropalka/modules/resources/src/main/resources/resources/modules-deploy.conf) =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-03-10 11:53:01 UTC (rev 13880) @@ -0,0 +1 @@ +org/jboss/ws/native/**, org/jboss/ws/** \ No newline at end of file Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2011-03-10 11:53:01 UTC (rev 13880) @@ -1 +0,0 @@ -org.jboss.webservices.integration.invocation.InvocationHandlerFactoryImpl \ No newline at end of file Property changes on: stack/native/trunk/modules/testsuite ___________________________________________________________________ Modified: svn:ignore - .classpath .project .settings + .classpath .project .settings target Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -56,6 +56,7 @@ <property name="project.version" value="${project.version}" /> <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> <property name="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="endorsed.dirs" value="${endorsed.dirs}"/> <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" /> </tasks> @@ -75,6 +76,7 @@ <property name="jboss.bind.address" value="${jboss.bind.address}" /> <property name="log4j.output.dir" value="${log4j.output.dir}"/> <property name="jboss.home" value="${jboss.home}"/> + <property name="jaxrpc.enabled" value="${jaxrpc.enabled}"/> <ant antfile="scripts/antrun-wstools.xml" target="wstools" /> </tasks> </configuration> @@ -93,6 +95,7 @@ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> <property name="log4j.output.dir" value="${log4j.output.dir}"/> <property name="jboss.home" value="${jboss.home}"/> + <property name="endorsed.dirs" value="${endorsed.dirs}"/> <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" /> </tasks> </configuration> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -20,6 +20,7 @@ wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -29,6 +30,7 @@ wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -38,6 +40,7 @@ wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -47,6 +50,7 @@ wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -56,6 +60,7 @@ wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -65,6 +70,7 @@ wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -74,6 +80,7 @@ wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -89,6 +96,7 @@ <attribute name="jbossHome"/> <attribute name="log4jConf"/> <attribute name="loggingDir"/> + <attribute name="javaEndorsedDirs"/> <sequential> <wsconsume @@ -102,7 +110,7 @@ target="2.2" fork="true" - <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/> <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> </wsconsume> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -20,6 +20,7 @@ <wsprovide-macro sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" destDir="" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" outputDir="${tests.output.dir}" log4jConf="${log4j.conf}" @@ -30,6 +31,7 @@ <wsprovide-macro sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean" destDir="" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" outputDir="${tests.output.dir}" log4jConf="${log4j.conf}" @@ -48,6 +50,7 @@ <attribute name="log4jConf"/> <attribute name="loggingDir"/> <attribute name="resourcesDir"/> + <attribute name="javaEndorsedDirs"/> <sequential> <wsprovide @@ -61,7 +64,7 @@ resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}" sourcedestdir="@{outputDir}/test-sources/@{resourcesDir}" - <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/> <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> </wsprovide> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -7,23 +7,31 @@ <!-- ============================================================ --> <project> - + <!-- ================================================================== --> <!-- Generating sources --> <!-- ================================================================== --> - - <target name="wstools" depends="generate-sources,compile-sources,copy-resources" description="Generate the JAX-RPC artifacts."> + + <target name="wstools" description="Generate the JAX-RPC artifacts."> + <condition property="generate.jaxrpc.artifacts" value="true"> + <and> + <equals arg1="${jaxrpc.enabled}" arg2="true"/> + </and> + </condition> + <antcall target="generate-sources"/> + <antcall target="compile-sources"/> + <antcall target="copy-resources"/> </target> - + <!-- Generate JAX-RPC artifacts --> - <target name="generate-sources"> - + <target name="generate-sources" if="generate.jaxrpc.artifacts"> + <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath> <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> - + <macro-wstools dest="jaxrpc/samples/docstyle/wrapped/WEB-INF" config="jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/docstyle/bare/WEB-INF" config="jaxrpc/samples/docstyle/bare/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/dynamichandler/WEB-INF" config="jaxrpc/samples/dynamichandler/wstools-config.xml"/> @@ -42,12 +50,12 @@ <macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/> - + </target> - + <!-- Copy generated resources --> - <target name="compile-sources"> - + <target name="compile-sources" if="generate.jaxrpc.artifacts"> + <mkdir dir="${tests.output.dir}/wstools/java"/> <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> @@ -58,7 +66,7 @@ <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> </move> - + <!-- Cannot run javac from tasks http://jira.codehaus.org/browse/MANTRUN-91 @@ -71,17 +79,17 @@ </classpath> </javac> </target> - + <!-- Copy generated resources --> - <target name="copy-resources"> - + <target name="copy-resources" if="generate.jaxrpc.artifacts"> + <copy todir="${tests.output.dir}/test-resources"> <fileset dir="${tests.output.dir}/wstools/resources"> <include name="**/*.wsdl"/> <include name="**/*.xml"/> </fileset> </copy> - + <copy todir="${tests.output.dir}/test-resources/jaxrpc/samples" overwrite="true"> <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> <filterset> @@ -89,8 +97,8 @@ </filterset> </copy> </target> - - <!-- macro-wstools --> + + <!-- macro-wstools --> <macrodef name="macro-wstools"> <attribute name="dest"/> <attribute name="config"/> @@ -100,5 +108,5 @@ </wstools> </sequential> </macrodef> - + </project> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -63,6 +63,11 @@ <artifactId>servlet-api</artifactId> </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> @@ -138,6 +143,35 @@ </testResource> </testResources> <plugins> + <plugin> <!-- This copies jboss-jaxws-api_2.2_spec & jboss-jaxb-api_2.2_spec jars to endorsed dir before the integration-tests are run --> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> <plugin> <!-- This copies jbossws-native-factories jar to endorsed dir before the integration-tests are run --> <artifactId>maven-resources-plugin</artifactId> <executions> @@ -149,14 +183,20 @@ </goals> <configuration> <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <resources> + <resources> <resource> <directory>${basedir}/../endorsed/target/</directory> <includes> <include>jbossws-native-factories-${project.version}.jar</include> </includes> </resource> - </resources> + <resource> + <directory>${basedir}/../../endorsed/target/</directory> + <includes> + <include>jbossws-native-factories-${project.version}.jar</include> + </includes> + </resource> + </resources> </configuration> </execution> </executions> @@ -369,6 +409,8 @@ <properties> <jboss.version>6.0.0.Final</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> + <endorsed.dirs>${jboss600.home}/lib/endorsed</endorsed.dirs> + <jaxrpc.enabled>true</jaxrpc.enabled> </properties> <dependencies> <dependency> @@ -468,13 +510,13 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <compilerArgument>-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</compilerArgument> + <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> <excludes> <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> @@ -504,6 +546,8 @@ <properties> <jboss.version>6.0.1-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss601</jbossws.integration.target> + <endorsed.dirs>${jboss601.home}/lib/endorsed</endorsed.dirs> + <jaxrpc.enabled>true</jaxrpc.enabled> </properties> <dependencies> <dependency> @@ -585,13 +629,13 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <compilerArgument>-Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</compilerArgument> + <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> <excludes> <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> @@ -612,6 +656,273 @@ </profile> <!-- + Name: jboss700 + Descr: JBoss-7.0.0 specific options + --> + <profile> + <id>jboss700</id> + <properties> + <jboss.version>7.0.0.Alpha2-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss700</jbossws.integration.target> + <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> + <jaxrpc.enabled>false</jaxrpc.enabled> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.naming</groupId> + <artifactId>jnp-client</artifactId> + <version>5.0.5.Final</version> + </dependency> + <dependency> + <groupId>org.picketbox</groupId> + <artifactId>jbosssx-client</artifactId> + <version>3.0.0.CR2</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </dependency> + <!-- Apache XML security depends on Xalan impl classes :( --> + <dependency> + <groupId>apache-xalan</groupId> + <artifactId>serializer</artifactId> + <version>2.7.1.patch01-brew</version> + </dependency> + <dependency> + <groupId>apache-xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1.patch01-brew</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> + </configuration> + <executions> + <execution> + <id>default-testCompile</id> + <phase>test-compile</phase> + <configuration> + <testExcludes> + <!-- AS7 compilation excludes --> + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> + <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude> + <!-- EJB3 client API dependencies --> + <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> + <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude> + </testExcludes> + </configuration> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> + <excludes> + <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration--> + <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> + + <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored--> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + + <!-- # [JBAS-8363] Virtual host issue in JBossWeb --> + <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> + + <!-- # [JBWS-3150] This test causes hudson to freeze --> + <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> + + <!-- ////////////////////////// --> + <!-- AS7 integration exclusions --> + <!-- ////////////////////////// --> + + <!-- EJB3 client API dependencies --> + <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> + <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude> + + <!-- EJB3 endpoint deployments --> + <exclude>org/jboss/test/ws/jaxws/jbws771/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1446/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1665/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1809/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1909/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2014/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2166/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2182/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2221/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2437/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2565/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2701/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2934/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2937/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> + <exclude>org/jboss/test/ws/jaxws/benchmark/**</exclude> + <exclude>org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/endpointReference/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/jaxbintros/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/webservice/**/*EJB3TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude> + <exclude>org/jboss/test/ws/management/recording/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/bus/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/gzip/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/jaxbintros/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude> + + <!-- # [JBWS-3219] unexpected element 'security-domain' encountered --> + <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude> + <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/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-3225] jbossws console not yet available --> + <exclude>org/jboss/test/ws/console/**</exclude> + + <!-- # [JBWS-3226] jboss-service.xml not matching AS7 format --> + <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude> + + <!-- # [JBWS-3227] handles config file not found on classpath --> + <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude> + + <!-- # [JBWS-3228] seems we need to use woodstox for WS endpoints? --> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase*</exclude> + + <!-- # [JBWS-3229] DOMUtils issue on test classpath - probably missing xercesImpl on CP? --> + <exclude>org/jboss/test/ws/jaxws/jbws2960/**</exclude> + + <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' --> + <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude> + + <!-- # [JBWS-3234] JNDI over RMI not available on AS7 --> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> + + <!-- # [JBWS-3239] SPI TCCL issue --> + <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/endpoint/**</exclude> + + <!-- # [JBWS-3240] Rewrite tests relying on $JBOSS_HOME/server/default/tmp/jbossws folder existence --> + <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/**</exclude> + + <!-- # [JBWS-3241] NPE in ServerHandler.handleInbound() --> + <exclude>org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase*</exclude> + + <!-- # [JBWS-3242] Servlet base test throws IllegalArgumentException: Resource META-INF/jbossws-entities.properties not found --> + <exclude>org/jboss/test/ws/jaxws/jbws3223/**</exclude> + + <!-- # [JBWS-3244] resuscitate WS-Eventing --> + <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wseventing/**</exclude> + + <!-- # [JBWS-3245] AS7 RemoteDeployer have to always undeploy deployed archives --> + <exclude>org/jboss/test/ws/jaxws/jbws1582/**</exclude> + + <!-- # [JBWS-3246] Resuscitate JSON --> + <exclude>org/jboss/test/ws/jaxws/json/JsonTestCase*</exclude> + + <!-- # [JBAS-8933] ClassCastException: org.jboss.security.plugins.auth.JaasSecurityManagerBase cannot be cast to org.jboss.security.AuthorizationManager --> + <exclude>org/jboss/test/ws/jaxws/jbws1999/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase*</exclude> + + <!-- # [JBAS-8936] @Resource injection from web.xml doesn't work --> + <exclude>org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase*</exclude> + + <!-- JAXR not available --> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + + <!-- JAXRPC deployments --> + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> + <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address Modified: stack/native/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -69,6 +69,7 @@ <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> + <id>unpack-shared-tests</id> <phase>generate-sources</phase> <goals> <goal>unpack</goal> @@ -79,9 +80,10 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-shared-testsuite</artifactId> <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>src/test</outputDirectory> </artifactItem> </artifactItems> - <outputDirectory>src/test</outputDirectory> </configuration> </execution> <execution> <!-- This is used by WSRunClientTestCase --> @@ -122,6 +124,7 @@ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> <property name="log4j.output.dir" value="${log4j.output.dir}"/> <property name="jboss.home" value="${jboss.home}"/> + <property name="endorsed.dirs" value="${endorsed.dirs}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" /> </tasks> </configuration> @@ -139,6 +142,7 @@ <property name="project.version" value="${project.version}" /> <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> <property name="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="endorsed.dirs" value="${endorsed.dirs}"/> <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" /> Modified: stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -20,6 +20,7 @@ wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -29,6 +30,7 @@ wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" outputDir="${tests.output.dir}" + javaEndorsedDirs="${endorsed.dirs}" jbossHome="${jboss.home}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -42,6 +44,7 @@ <attribute name="package"/> <attribute name="outputDir"/> <attribute name="jbossHome"/> + <attribute name="javaEndorsedDirs"/> <attribute name="log4jConf"/> <attribute name="loggingDir"/> @@ -57,7 +60,7 @@ target="2.2" fork="true" - <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/> <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> </wsconsume> Modified: stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -20,6 +20,7 @@ sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl" destdir="jaxws/jbws2960" jbossHome="${jboss.home}" + javaEndorsedDirs="${endorsed.dirs}" outputDir="${tests.output.dir}" log4jConf="${log4j.conf}" loggingDir="${log4j.output.dir}" @@ -33,6 +34,7 @@ <attribute name="sei"/> <attribute name="destDir"/> <attribute name="jbossHome"/> + <attribute name="javaEndorsedDirs"/> <attribute name="outputDir"/> <attribute name="log4jConf"/> <attribute name="loggingDir"/> @@ -48,7 +50,7 @@ destdir="@{outputDir}/test-classes/@{destDir}" resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}" - <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Djava.endorsed.dirs=@{javaEndorsedDirs}"/> <jvmarg line="-Dlog4j.configuration=file://@{log4jConf}"/> <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> </wsprovide> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2011-03-10 11:24:32 UTC (rev 13879) +++ stack/native/trunk/pom.xml 2011-03-10 11:53:01 UTC (rev 13880) @@ -64,7 +64,8 @@ <jsr181.api.version>1.0-MR1</jsr181.api.version> <jaxb.api.version>1.0.0.Final</jaxb.api.version> <jaxb.impl.version>2.2</jaxb.impl.version> - <jboss.logging.version>2.2.0.CR1</jboss.logging.version> + <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> + <jboss.logging.version>3.0.0.Beta3</jboss.logging.version> <jboss.jaxr.version>2.0.2</jboss.jaxr.version> <apache.scout.version>1.1.1</apache.scout.version> <juddi.version>0.9RC4</juddi.version> @@ -77,6 +78,7 @@ <wsdl4j.version>1.6.2</wsdl4j.version> <xmlsec.version>1.4.3</xmlsec.version> <xerces.version>2.9.1</xerces.version> + <jbossxb.version>2.0.3.GA</jbossxb.version> <junit.version>3.8.1</junit.version> </properties> @@ -162,11 +164,22 @@ </dependency> <!-- jboss provided --> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>${jboss.common.core.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>${javassist.version}</version> </dependency> - <!-- transitive dependencies --> <dependency> <groupId>commons-logging</groupId> @@ -313,15 +326,10 @@ </dependency> <dependency> <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> + <artifactId>jboss-logging</artifactId> <version>${jboss.logging.version}</version> </dependency> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - <version>${jboss.logging.version}</version> - </dependency> - <dependency> <groupId>ws-commons</groupId> <artifactId>policy</artifactId> <version>${wscommons.policy.version}</version> @@ -351,6 +359,37 @@ <artifactId>netty</artifactId> <version>${netty.version}</version> </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>${jbossxb.version}</version> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>wutka-dtdparser</groupId> + <artifactId>dtdparser121</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>junit</groupId>