[jbossws-commits] JBossWS SVN: r17340 - in stack/native/trunk: modules/core/src/main/scripts and 28 other directories.

Author: alessio.soldano(a)jboss.com Date: 2013-02-20 12:30:30 -0500 (Wed, 20 Feb 2013) New Revision: 17340 Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/xb/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/xb/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/xb/main/module.xml Removed: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/ Modified: stack/native/trunk/build.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/dist/pom.xml 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/pom.xml Log: [JBWS-3600] Adding jboss800 target container, removing jboss713 Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/build.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -65,18 +65,18 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss713.home" value="${profiles.profile.properties.jboss713.home}"> - <isset property="profiles.profile.properties.jboss713.home"/> - </condition> <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> <isset property="profiles.profile.properties.jboss720.home"/> - </condition> + </condition> + <condition property="jboss800.home" value="${profiles.profile.properties.jboss800.home}"> + <isset property="profiles.profile.properties.jboss800.home"/> + </condition> - <fail message="jboss home not set, use jboss713.home=value or jboss720.home=value to set"> + <fail message="jboss home not set, use jboss800.home=value or jboss720.home=value to set"> <condition> <and> <not> - <isset property="jboss713.home"/> + <isset property="jboss800.home"/> </not> <not> <isset property="jboss720.home"/> @@ -86,7 +86,7 @@ </fail> <echo/> - <echo message="jboss713.home=${jboss713.home}"/> + <echo message="jboss800.home=${jboss800.home}"/> <echo message="jboss720.home=${jboss720.home}"/> </target> 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 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -31,12 +31,12 @@ <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> </target> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/modules/dist/pom.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -30,14 +30,14 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss713</classifier> + <classifier>jboss720</classifier> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss720</classifier> + <classifier>jboss800</classifier> </dependency> <dependency> @@ -60,7 +60,7 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-server-integration</artifactId> + <artifactId>jbossws-jboss720-server-integration</artifactId> <scope>provided</scope> </dependency> Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -25,10 +25,10 @@ <project> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-7.1.x --> + <!-- Prepare Deployment Structure JBoss-7.2.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss71x" depends="prepare-deploy"> + <target name="deploy-structure-jboss72x" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <path id="jbossws-common.path"> @@ -39,23 +39,23 @@ <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}/modules"/> + <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss713"/> + <param name="modules-jbossid" value="jboss720"/> </antcall> - <copy toDir="${deploy.structure}/modules"> - <fileset dir="${deploy.artifacts.dir}/modules/jboss713"> + <copy toDir="${deploy.structure}/modules/system/layers/base"> + <fileset dir="${deploy.artifacts.dir}/modules/jboss720"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </copy> </target> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-7.2.x --> + <!-- Prepare Deployment Structure JBoss-8.0.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss72x" depends="prepare-deploy"> + <target name="deploy-structure-jboss80x" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <path id="jbossws-common.path"> @@ -69,71 +69,71 @@ <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss720"/> + <param name="modules-jbossid" value="jboss800"/> </antcall> <copy toDir="${deploy.structure}/modules/system/layers/base"> - <fileset dir="${deploy.artifacts.dir}/modules/jboss720"> + <fileset dir="${deploy.artifacts.dir}/modules/jboss800"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </copy> </target> <!-- ================================================================== --> - <!-- Deployment jboss713 --> + <!-- Deployment jboss720 --> <!-- ================================================================== --> - <target name="target-jboss713"> - <property name="jbossws.integration.target" value="jboss713"/> + <target name="target-jboss720"> + <property name="jbossws.integration.target" value="jboss720"/> <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss713" depends="undeploy-jboss713,deploy-structure-jboss71x" description="Deploy jbossws to jboss713"> - <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> - <copy todir="${jboss713.home}" overwrite="true" verbose="true"> + <target name="deploy-jboss720" depends="undeploy-jboss720,deploy-structure-jboss72x" description="Deploy jbossws to jboss720"> + <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> + <copy todir="${jboss720.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="${jboss713.home}/modules"> - <fileset dir="${deploy.structure}/modules"> + <installModules targetDir="${jboss720.home}/modules/system/layers/base/"> + <fileset dir="${deploy.structure}/modules/system/layers/base"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> </target> - <target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713"> - <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> + <target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720"> + <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> - <!-- Deployment jboss720 --> + <!-- Deployment jboss800 --> <!-- ================================================================== --> - <target name="target-jboss720"> - <property name="jbossws.integration.target" value="jboss720"/> + <target name="target-jboss800"> + <property name="jbossws.integration.target" value="jboss800"/> <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss720" depends="undeploy-jboss720,deploy-structure-jboss72x" description="Deploy jbossws to jboss720"> - <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> - <copy todir="${jboss720.home}" overwrite="true" verbose="true"> + <target name="deploy-jboss800" depends="undeploy-jboss800,deploy-structure-jboss80x" description="Deploy jbossws to jboss800"> + <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> + <copy todir="${jboss800.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="${jboss720.home}/modules/system/layers/base/"> + <installModules targetDir="${jboss800.home}/modules/system/layers/base/"> <fileset dir="${deploy.structure}/modules/system/layers/base"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> </target> - <target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720"> - <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <target name="undeploy-jboss800" depends="target-jboss800,init" description="Remove jbossws from jboss800"> + <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss800.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> </target> </project> Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -34,11 +34,11 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss713.available.file" value="${jboss713.home}/jboss-modules.jar"/> <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> + <property name="jboss800.available.file" value="${jboss800.home}/jboss-modules.jar"/> - <available property="jboss713.available" file="${jboss713.available.file}"/> <available property="jboss720.available" file="${jboss720.available.file}"/> + <available property="jboss800.available" file="${jboss800.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 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -57,15 +57,15 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss71x" value="true"> + <condition property="jbossws.integration.jboss72x" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> </or> </condition> - <condition property="jbossws.integration.jboss72x" value="true"> + <condition property="jbossws.integration.jboss80x" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss800"/> </or> </condition> 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 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -59,9 +59,9 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss713-server-integration:jar</include> + <include>org.jboss.ws:jbossws-jboss720-server-integration:jar</include> </includes> - <outputFileNameMapping>jbossws-jboss713.jar</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss720.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/modules/resources/pom.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -43,21 +43,21 @@ <phase>package</phase> </execution> <execution> - <id>jboss713</id> + <id>jboss720</id> <goals><goal>jar</goal></goals> <phase>package</phase> <configuration> - <classifier>jboss713</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss713/jbossws.beans</classesDirectory> + <classifier>jboss720</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss720/jbossws.beans</classesDirectory> </configuration> </execution> <execution> - <id>jboss720</id> + <id>jboss800</id> <goals><goal>jar</goal></goals> <phase>package</phase> <configuration> - <classifier>jboss720</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss720/jbossws.beans</classesDirectory> + <classifier>jboss800</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss800/jbossws.beans</classesDirectory> </configuration> </execution> </executions> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/main/module.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -0,0 +1,64 @@ +<?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.1" name="org.jboss.as.webservices"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.annotation.api"/> + <module name="javax.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ejb3"/> + <module name="org.jboss.invocation"/> + <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.ejb3"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.security"/> + <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" services="import" /> + <module name="org.jboss.ws.spi" /> + <module name="org.picketbox" /> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/integration/main/module.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -0,0 +1,53 @@ +<?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.1" name="org.jboss.as.webservices.server.integration"> + + <resources> + </resources> + + <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.wsdl4j.api" export="true"/> + <module name="org.jboss.ws.api" export="true"/> + <module name="org.jboss.ws.spi" export="true"/> + <module name="org.jboss.ws.common" services="import" export="true"/> + <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> + <imports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </imports> + <exports> + <include path="META-INF"/> + <include path="dtd"/> + <include path="schema"/> + </exports> + </module> + <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + </dependencies> + +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/api/main/module.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -0,0 +1,40 @@ +<?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.1" name="org.jboss.ws.api"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.soap.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.ws.jaxws-client" services="import"/> + </dependencies> + +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/common/main/module.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -0,0 +1,51 @@ +<?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.1" name="org.jboss.ws.common"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.annotation.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.wsdl4j.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="org.jboss.jaxbintros"/> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-core/main/module.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -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.1" name="org.jboss.ws.native.jbossws-native-core"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.mail.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.xerces" services="import"/> + <module name="org.javassist" /> + <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.native.jbossws-native-services" services="import"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/jbossws-native-services/main/module.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -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.1" name="org.jboss.ws.native.jbossws-native-services"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/spi/main/module.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -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.1" name="org.jboss.ws.spi"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.as.webservices"/> + </dependencies> +</module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/xb/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/xb/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/xb/main/module.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -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.1" name="org.jboss.xb"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.apache.xerces" services="import"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + </dependencies> + +</module> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2013-02-20 17:29:44 UTC (rev 17339) +++ stack/native/trunk/pom.xml 2013-02-20 17:30:30 UTC (rev 17340) @@ -61,9 +61,9 @@ <jbossws.common.version>2.1.1.Final</jbossws.common.version> <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.1.0.Final</jbossws.shared.testsuite.version> - <jbossws.jboss713.version>4.1.1.Final</jbossws.jboss713.version> - <jboss713.version>7.1.3.Final</jboss713.version> - <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> + <jbossws.jboss720.version>4.2.0-SNAPSHOT</jbossws.jboss720.version> + <jboss720.version>7.2.0.Final</jboss720.version> + <jboss800.version>8.0.0.Alpha1-SNAPSHOT</jboss800.version> <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> @@ -115,13 +115,13 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-server-integration</artifactId> - <version>${jbossws.jboss713.version}</version> + <artifactId>jbossws-jboss720-server-integration</artifactId> + <version>${jbossws.jboss720.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> - <version>${jbossws.jboss713.version}</version> + <artifactId>jbossws-jboss720-tests-integration</artifactId> + <version>${jbossws.jboss720.version}</version> </dependency> <!-- provided apis --> <dependency> @@ -361,26 +361,26 @@ </profile> <!-- - Name: jboss713 - Descr: JBoss-7.1.3 specific options + Name: jboss720 + Descr: JBoss-7.2.0 specific options --> <profile> - <id>jboss713</id> + <id>jboss720</id> <properties> - <jbossws.integration.target>jboss713</jbossws.integration.target> - <jboss.home>${jboss713.home}</jboss.home> + <jbossws.integration.target>jboss720</jbossws.integration.target> + <jboss.home>${jboss720.home}</jboss.home> </properties> </profile> <!-- - Name: jboss720 - Descr: JBoss-7.2.0 specific options + Name: jboss800 + Descr: JBoss-8.0.0 specific options --> <profile> - <id>jboss720</id> + <id>jboss800</id> <properties> - <jbossws.integration.target>jboss720</jbossws.integration.target> - <jboss.home>${jboss720.home}</jboss.home> + <jbossws.integration.target>jboss800</jbossws.integration.target> + <jboss.home>${jboss800.home}</jboss.home> </properties> </profile>