[jbossws-commits] JBossWS SVN: r13837 - in stack/native/branches/ropalka: modules/core/src/main/resources and 32 other directories.

Author: richard.opalka(a)jboss.com Date: 2011-03-03 10:31:02 -0500 (Thu, 03 Mar 2011) New Revision: 13837 Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/ stack/native/branches/ropalka/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/server/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/ stack/native/branches/ropalka/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/ws/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/api/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/ stack/native/branches/ropalka/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/common/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/ stack/native/branches/ropalka/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/jaxws-client/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/ stack/native/branches/ropalka/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/native/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/ stack/native/branches/ropalka/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-factories/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/ stack/native/branches/ropalka/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-services/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/ stack/native/branches/ropalka/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/spi/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml stack/native/branches/ropalka/modules/resources/src/main/resources/resources/modules-deploy.conf Modified: stack/native/branches/ropalka/build.xml stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config-as7.xml stack/native/branches/ropalka/modules/dist/pom.xml stack/native/branches/ropalka/modules/dist/src/main/distro/ant.properties.example stack/native/branches/ropalka/modules/dist/src/main/distro/build-deploy.xml stack/native/branches/ropalka/modules/dist/src/main/distro/build-setup.xml stack/native/branches/ropalka/modules/dist/src/main/distro/build.xml stack/native/branches/ropalka/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/ropalka/modules/testsuite/pom.xml stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml stack/native/branches/ropalka/pom.xml Log: [JBWS-3206] resuscitating native against AS7 (WIP) Modified: stack/native/branches/ropalka/build.xml =================================================================== --- stack/native/branches/ropalka/build.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/build.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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/branches/ropalka/modules/core/src/main/resources/jbossws-native-config-as7.xml =================================================================== --- stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config-as7.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config-as7.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -25,8 +25,8 @@ <deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0"> <deploymentAspect class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties, StackDescriptor</property> - <property name="contextProperties"> + <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> @@ -37,43 +37,43 @@ </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">InitializedMetaDataModel</property> + <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">ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> + <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">UnifiedMetaDataModel, JAXBIntros</property> - <property name="provides">PublishedContract</property> + <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">UnifiedMetaDataModel</property> + <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property> </deploymentAspect> <deploymentAspect class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> - <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> + <property name="requires" class="java.lang.String">StackEndpointHandler, UnifiedMetaDataModel</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property> - <property name="provides">UnifiedMetaDataModel</property> + <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">JAXBIntros</property> + <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">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</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"/> @@ -83,7 +83,7 @@ </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> + <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property> </deploymentAspect> --> Modified: stack/native/branches/ropalka/modules/dist/pom.xml =================================================================== --- stack/native/branches/ropalka/modules/dist/pom.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/dist/pom.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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> Modified: stack/native/branches/ropalka/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/native/branches/ropalka/modules/dist/src/main/distro/ant.properties.example 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/dist/src/main/distro/ant.properties.example 2011-03-03 15:31:02 UTC (rev 13837) @@ -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/branches/ropalka/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/branches/ropalka/modules/dist/src/main/distro/build-deploy.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/dist/src/main/distro/build-deploy.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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/branches/ropalka/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/branches/ropalka/modules/dist/src/main/distro/build-setup.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/dist/src/main/distro/build-setup.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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/branches/ropalka/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/branches/ropalka/modules/dist/src/main/distro/build.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/dist/src/main/distro/build.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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/branches/ropalka/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/ropalka/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -0,0 +1,57 @@ +<?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="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.jaxws-client" services="import"/> + <module name="org.jboss.ws.native.jbossws-native-core" services="import"/> + <module name="org.jboss.ws.spi" /> + </dependencies> +</module> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -0,0 +1,44 @@ +<?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.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> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -0,0 +1,53 @@ +<?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="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.jws.api" /> + <module name="javax.xml.bind.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <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-core" services="import"> + <imports> + <include path="META-INF/jbossws-entities.properties"/> + <include path="META-INF/standard-*-config.xml"/> + </imports> + </module> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + <module name="wsdl4j.wsdl4j" /> + </dependencies> +</module> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-services/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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> Added: stack/native/branches/ropalka/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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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> Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -276,6 +276,70 @@ </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}/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 +361,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"/> Added: stack/native/branches/ropalka/modules/resources/src/main/resources/resources/modules-deploy.conf =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/resources/modules-deploy.conf (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-03-03 15:31:02 UTC (rev 13837) @@ -0,0 +1 @@ +org/jboss/ws/native/**, org/jboss/ws/** \ No newline at end of file Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -611,6 +611,207 @@ </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> + </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.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArguments> + <endorseddirs>${project.build.directory}/endorsed</endorseddirs> + </compilerArguments> + </configuration> + <executions> + <execution> + <id>default-testCompile</id> + <phase>test-compile</phase> + <configuration> + <testExcludes> + <!-- AS7 compilation excludes --> + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> + <!-- EJB3 client API dependencies --> + <exclude>org/jboss/test/ws/jaxws/jbws944/**</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=${project.build.directory}/endorsed</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 --> + <!-- ////////////////////////// --> + + <!--# not yet supported on AS7 --> + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> + <!-- EJB3 client API dependencies --> + <exclude>org/jboss/test/ws/jaxws/jbws944/**</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/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/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/jbws1872/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2449/**</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/benchmark/**</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/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/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> + + <!-- # [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-3230] WS RM namespace issue --> + <exclude>org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase*</exclude> + + <!-- # [JBWS-3231] not satisfied policy alternatives --> + <exclude>org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase*</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> + + <!-- JAXR not available --> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + + <!-- JAXRPC deployments --> + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address Modified: stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/modules/testsuite/shared-tests/pom.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -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 --> Modified: stack/native/branches/ropalka/pom.xml =================================================================== --- stack/native/branches/ropalka/pom.xml 2011-03-03 12:21:33 UTC (rev 13836) +++ stack/native/branches/ropalka/pom.xml 2011-03-03 15:31:02 UTC (rev 13837) @@ -64,6 +64,7 @@ <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.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>2.2.0.CR1</jboss.logging.version> <jboss.jaxr.version>2.0.2</jboss.jaxr.version> <apache.scout.version>1.1.1</apache.scout.version> @@ -162,6 +163,12 @@ </dependency> <!-- jboss provided --> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>${jboss.common.core.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>${javassist.version}</version>