Author: richard.opalka(a)jboss.com Date: 2008-12-11 09:57:12 -0500 (Thu, 11 Dec 2008) New Revision: 8866 Added: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt Removed: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf Modified: stack/native/trunk/build.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/profiles.xml.example stack/native/trunk/src/main/distro/Install.txt stack/native/trunk/src/main/distro/ant.properties.example stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/build-setup.xml stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-bin-dist.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: adding support for JBossAS 510 Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/build.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -10,7 +10,7 @@ <!-- ====================================================================== --> <project basedir="." name="JBossWS-Native"> - + <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> @@ -20,15 +20,15 @@ <property name="stack.output.dir" value="${stack.dir}/target"/> <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/> <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> - + <import file="${stack.distro.dir}/build-setup.xml"/> <import file="${stack.distro.dir}/build-deploy.xml"/> <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> - - <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/> + + <property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/> <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> - + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -66,7 +66,10 @@ <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}"> <isset property="profiles.profile.properties.jboss501.home"/> </condition> - + <condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}"> + <isset property="profiles.profile.properties.jboss510.home"/> + </condition> + <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> <property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/> @@ -74,52 +77,54 @@ <property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/> <property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/> <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/> - + <property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/> + <echo/> <echo message="jboss422.home=${jboss422.home}"/> <echo message="jboss423.home=${jboss423.home}"/> <echo message="jboss424.home=${jboss424.home}"/> <echo message="jboss500.home=${jboss500.home}"/> <echo message="jboss501.home=${jboss501.home}"/> + <echo message="jboss501.home=${jboss510.home}"/> </target> - + <target name="init" depends="mvn-settings,prepare,os-init"> - + <xmlproperty file="${stack.dir}/pom.xml"/> <property name="version.id" value="${project.version}"/> - + <echo message="java.version=${java.version}"/> <echo message="version.id=${version.id}"/> <echo message="integration.target=${jbossws.integration.target}"/> - + <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/> </target> - + <!-- ================================================================== --> <!-- Distribution --> <!-- ================================================================== --> - + <target name="prepare-deploy" depends="prepare,os-init"> - + <!-- Use a system property to overwrite the empty default value --> <property name="maven.opts" value=""/> - + <echo/> <echo message="${mvn} ${maven.opts} package assembly:directory"/> <echo/> - + <delete dir="${deploy.artifacts.dir}"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> <arg line="${maven.opts} package assembly:directory"/> </exec> </target> - + <target name="build-bin-dist" depends="prepare-deploy,os-init" description="Build the binary distribution"> <echo/> <echo message="${mvn} ${maven.opts} -Pbindist package assembly:directory"/> <echo/> - + <delete dir="${stack.output.dir}/jbossws-native-bin-dist"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> <arg line="${maven.opts} -Pbindist package assembly:directory"/> @@ -132,12 +137,12 @@ prefix="jbossws-native-bin-dist"/> </zip> </target> - + <target name="build-src-dist" depends="prepare-deploy,os-init" description="Build the source distribution"> <echo/> <echo message="${mvn} ${maven.opts} -Psrcdist package assembly:directory"/> <echo/> - + <delete dir="${stack.output.dir}/jbossws-native-src-dist"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> <arg line="${maven.opts} -Psrcdist package assembly:directory"/> @@ -150,5 +155,5 @@ prefix="jbossws-native-src-dist"/> </zip> </target> - + </project> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/modules/core/pom.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -209,8 +209,6 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory> </artifactItem> - <!-- [JBWS-2263] --> - <!-- START --> <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> @@ -219,6 +217,8 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> </artifactItem> + <!-- [JBWS-2263] --> + <!-- START --> <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501CR1</artifactId> @@ -227,6 +227,14 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510x</artifactId> + <version>${jbossws.jboss510.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> + </artifactItem> <!-- END --> </artifactItems> </configuration> 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 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -10,20 +10,20 @@ <!-- ====================================================================== --> <project default="main"> - + <property name="project.resources.directory" value="${basedir}/src/main/resources"/> <property name="project.build.directory" value="${basedir}/target"/> <property name="project.build.resources.directory" value="${project.build.directory}/resources"/> - + <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/> - + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> - + <target name="init"> </target> - + <!-- Compile resource files --> <target name="main" depends="init"> @@ -38,7 +38,7 @@ <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> - + <!-- Concat jbossws-jboss423/jbossws.beans --> <echo message="Concat jbossws-jboss423/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml"> @@ -50,7 +50,7 @@ <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> - + <!-- Concat jbossws-jboss424/jbossws.beans --> <echo message="Concat jbossws-jboss424/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss424/jbossws.beans/META-INF/jboss-beans.xml"> @@ -62,7 +62,7 @@ <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> - + <!-- Concat jbossws-jboss500/jbossws.beans --> <echo message="Concat jbossws-jboss500/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml"> @@ -72,7 +72,7 @@ <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> - + <!-- Concat jbossws-jboss501/jbossws.beans --> <echo message="Concat jbossws-jboss501/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml"> @@ -82,7 +82,17 @@ <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> - + + <!-- Concat jbossws-jboss510/jbossws.beans --> + <echo message="Concat jbossws-jboss510/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + </target> - + </project> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/modules/management/pom.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -1,20 +1,20 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBoss Web Services - Stack Native Management</name> <artifactId>jbossws-native-management</artifactId> <packaging>war</packaging> - + <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.5-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - + <dependencies> - <!-- + <!-- These runtime dependencies are picked up by the assembly-deploy-artifacts descriptor. They have no real relevants to this module. --> @@ -22,7 +22,7 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <scope>runtime</scope> - </dependency> + </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> @@ -45,18 +45,23 @@ <artifactId>jbossws-jboss424x</artifactId> <scope>runtime</scope> </dependency> - <!-- [JBWS-2263] --> - <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <scope>runtime</scope> </dependency> + <!-- [JBWS-2263] --> + <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501CR1</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510x</artifactId> + <scope>runtime</scope> + </dependency> <!-- END --> <dependency> <groupId>org.jboss.jaxr</groupId> @@ -65,7 +70,7 @@ <type>sar</type> </dependency> </dependencies> - + <!-- Build --> <build> <plugins> @@ -99,7 +104,7 @@ <filtering>true</filtering> </resource> </webResources> - </configuration> + </configuration> </plugin> </plugins> </build> Added: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2008-12-11 14:57:12 UTC (rev 8866) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 14:57:12 UTC (rev 8866) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -10,8 +10,8 @@ <!-- ====================================================================== --> <project> - - <!-- + + <!-- These patterns should be common for all supported containers. All jars must also be declared in component-info.xml to ensure that the AS build uses the same version. @@ -26,7 +26,7 @@ <include name="**/wstools.bat"/> <include name="**/wstools.sh"/> </patternset> - + <patternset id="jbossws.client.patternset"> <include name="**/FastInfoset.jar"/> <include name="**/jaxb-api.jar"/> @@ -51,11 +51,11 @@ <include name="**/wsdl4j.jar"/> <include name="**/wstx.jar"/> </patternset> - + <patternset id="jbossws.lib.patternset"> <include name="**/nothing-to-deploy"/> </patternset> - + <patternset id="jbossws.lib.endorsed.patternset"> <include name="**/jbossws-native-jaxrpc.jar"/> <include name="**/jbossws-native-jaxws.jar"/> @@ -63,7 +63,7 @@ <include name="**/jbossws-native-saaj.jar"/> <include name="**/jaxb-api.jar"/> </patternset> - + <patternset id="jbossws.server.lib.patternset"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> @@ -73,7 +73,7 @@ <include name="**/jbossws-native-saaj.jar"/> <include name="**/jbossws-spi.jar"/> </patternset> - + <patternset id="jbossws.service.lib.patternset"> <include name="**/FastInfoset.jar"/> <include name="**/jboss-jaxb-intros.jar"/> @@ -83,11 +83,11 @@ <include name="**/wsdl4j.jar"/> <include name="**/xmlsec.jar"/> </patternset> - + <!-- ================================================================== --> <!-- Deploy Bin --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-bin"> <attribute name="artifactsdir"/> <attribute name="targetdir"/> @@ -100,11 +100,11 @@ </copy> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy Lib --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-lib42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -117,7 +117,7 @@ </copy> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-lib50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -134,11 +134,28 @@ </copy> </sequential> </macrodef> - + + <macrodef name="macro-deploy-jbossws-lib51"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-endorsed"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -151,11 +168,11 @@ </copy> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy Client --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-client42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -188,11 +205,29 @@ </copy> </sequential> </macrodef> - + + <macrodef name="macro-deploy-jbossws-client51"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + <!-- JBWS-2263 --> + <!-- START --> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + <!-- END --> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Server Lib --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-server-lib42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -207,7 +242,7 @@ </copy> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-server-lib50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -221,11 +256,25 @@ </copy> </sequential> </macrodef> - + + <macrodef name="macro-deploy-jbossws-server-lib51"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy JUDDI Service --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-juddi-sar"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -244,11 +293,11 @@ </copy> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-sar42"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -283,7 +332,7 @@ </copy> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-sar50"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -298,11 +347,26 @@ </unzip> </sequential> </macrodef> - + + <macrodef name="macro-deploy-jbossws-sar51"> + <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-native-management.war"/> + </fileset> + </unzip> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Deployers --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-deployers50"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -346,6 +410,49 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-deployers51"> + <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + </fileset> + </copy> + <copy todir="@{targetdir}"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{artifactsdir}/resources"> + <include name="standard-*-config.xml"/> + </fileset> + </copy> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <!-- [JBWS-2263] --> + <!-- START --> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + <!-- END --> + </fileset> + </copy> + <!-- [JBWS-2263] --> + <!-- START --> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <include name="**/jbossws-deployer-jboss-beans.xml"/> + </fileset> + </copy> + <!-- END --> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy JBossWS --> <!-- ================================================================== --> @@ -361,7 +468,7 @@ <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - + <target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -371,33 +478,43 @@ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - + + <target name="deploy-jbossws-native51" depends="check-parameters,deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! --> + <macro-deploy-jbossws-sar51 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + </target> + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> - + <target name="check-parameters"> <fail message="artifactsdir must be specified" unless="artifactsdir"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> <fail message="installserver must be specified" unless="installserver"/> </target> - + <!-- ================================================================== --> <!-- Undeploy JBossWS --> <!-- ================================================================== --> - + <macrodef name="macro-undeploy-jbossws42"> <attribute name="defaultconf"/> <attribute name="targetdir"/> <sequential> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - + <property name="jboss.server.home" value="@{targetdir}/../.."/> <property name="jboss.home" value="${jboss.server.home}/../.."/> <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - + <!-- delete stale container integration jars --> <delete> <fileset dir="${jboss.server.home}"> @@ -407,18 +524,18 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> - + <!-- delete content of last deployment --> <delete> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> - + <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> - + <!-- delete juddi-service.sar --> <delete dir="@{targetdir}/../juddi-service.sar"/> - + </sequential> </macrodef> @@ -461,4 +578,43 @@ </sequential> </macrodef> + <macrodef name="macro-undeploy-jbossws51"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + + <!-- [JBWS-2263] --> + <!-- START --> + <!-- delete stale container integration jars --> + <delete> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + <!-- END --> + + <!-- delete content of last deployment --> + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + + <!-- delete jbossws.sar --> + <delete dir="@{targetdir}"/> + + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + + </sequential> + </macrodef> + </project> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -1,11 +1,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBoss Web Services - Stack Native Testsuite</name> <artifactId>jbossws-native-testsuite</artifactId> <packaging>pom</packaging> - + <!-- Parent --> <parent> <groupId>org.jboss.ws.native</groupId> @@ -13,7 +13,7 @@ <version>3.0.5-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - + <!-- Properties --> <properties> <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args> @@ -27,13 +27,13 @@ <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> </properties> - + <!-- Modules --> <modules> <module>native-tests</module> <module>framework-tests</module> </modules> - + <!-- Dependencies --> <dependencies> <dependency> @@ -93,7 +93,7 @@ <scope>test</scope> </dependency> </dependencies> - + <!-- Build --> <build> <testResources> @@ -172,7 +172,7 @@ <property> <name>jboss.home</name> <value>${jboss.home}</value> - </property> + </property> <property> <name>jbossws.integration.target</name> <value>${jbossws.integration.target}</value> @@ -226,13 +226,13 @@ </plugin> </plugins> </build> - + <!-- Profiles --> <profiles> - - <!-- + + <!-- Name: debug - Descr: Enable remote debuging for tests + Descr: Enable remote debuging for tests --> <profile> <id>debug</id> @@ -256,8 +256,8 @@ <surefire.jvm.args>${surefire.security.args} ${surefire.gc.args}</surefire.jvm.args> </properties> </profile> - - <!-- + + <!-- Name: hudson Descr: Ignore test failures on hudson --> @@ -275,9 +275,9 @@ </build> </profile> - <!-- + <!-- Name: jboss422 - Descr: JBoss-4.2.2 specific options + Descr: JBoss-4.2.2 specific options --> <profile> <id>jboss422</id> @@ -314,10 +314,10 @@ </plugins> </build> </profile> - - <!-- + + <!-- Name: jboss423 - Descr: JBoss-4.2.3 specific options + Descr: JBoss-4.2.3 specific options --> <profile> <id>jboss423</id> @@ -354,10 +354,10 @@ </plugins> </build> </profile> - - <!-- + + <!-- Name: jboss424 - Descr: JBoss-4.2.4 specific options + Descr: JBoss-4.2.4 specific options --> <profile> <id>jboss424</id> @@ -394,10 +394,10 @@ </plugins> </build> </profile> - - <!-- + + <!-- Name: jboss500 - Descr: JBoss-5.0.0 specific options + Descr: JBoss-5.0.0 specific options --> <profile> <id>jboss500</id> @@ -468,10 +468,10 @@ </plugins> </build> </profile> - - <!-- + + <!-- Name: jboss501 - Descr: JBoss-5.0.1 specific options + Descr: JBoss-5.0.1 specific options --> <profile> <id>jboss501</id> @@ -542,13 +542,87 @@ </plugins> </build> </profile> - - <!-- + + <!-- + Name: jboss510 + Descr: JBoss-5.1.0 specific options + --> + <profile> + <id>jboss510</id> + <properties> + <jboss.version>5.1.0-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss510</jbossws.integration.target> + </properties> + <dependencies> + <!-- [JBWS-2263] --> + <!-- START --> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510x</artifactId> + </dependency> + <!--dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-webservices</artifactId> + <version>${jboss.version}</version> + </dependency--> + <!-- END --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>${hibernate.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3</artifactId> + <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-security</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>${jboss.javaee.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine> + <!-- TODO: replace with maven dependencies --> + <additionalClasspathElements> + <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> + </additionalClasspathElements> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address - + command line cannot overwrite pom properties - http://jira.codehaus.org/browse/MNG-3546 + http://jira.codehaus.org/browse/MNG-3546 --> <profile> <id>no-jboss-bind-address</id> @@ -561,13 +635,13 @@ <jboss.bind.address>localhost</jboss.bind.address> </properties> </profile> - - <!-- + + <!-- Name: no-jboss-server-instance Descr: Set the default jboss.server.instance - + command line cannot overwrite pom properties - http://jira.codehaus.org/browse/MNG-3546 + http://jira.codehaus.org/browse/MNG-3546 --> <profile> <id>no-jboss-server-instance</id> @@ -581,5 +655,5 @@ </properties> </profile> </profiles> - + </project> Added: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt (rev 0) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2008-12-11 14:57:12 UTC (rev 8866) @@ -0,0 +1,20 @@ +# Exclude endpoints with AS42 @SecurityDomain +org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* +org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.* +org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.* + +# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* + +# [JBAS-5114] MessageDriven EJB3 does not create destination automatically +org/jboss/test/ws/jaxws/samples/jmstransport/** +org/jboss/test/ws/jaxws/samples/dar/** + +# [JBAS-5257] Cannot deploy through jax-ws endpoint API +org/jboss/test/ws/jaxws/endpoint/** + +# [JBWS-2217] Fix BPEL samples before AS50 goes final +org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/pom.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -12,28 +12,28 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBoss Web Services - Stack Native</name> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <packaging>pom</packaging> - + <version>3.0.5-SNAPSHOT</version> - + <!-- Parent --> <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> <version>1.0.2.GA</version> </parent> - + <!-- Source Control Management --> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native... <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/... <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</ur... </scm> - + <!-- Modules --> <modules> <module>modules/saaj</module> @@ -45,7 +45,7 @@ <module>modules/management</module> <module>modules/resources</module> </modules> - + <!-- Properties --> <properties> <jbossws.common.version>1.0.8-SNAPSHOT</jbossws.common.version> @@ -54,10 +54,11 @@ <jbossws.jboss422.version>3.0.5-SNAPSHOT</jbossws.jboss422.version> <jbossws.jboss423.version>3.0.5-SNAPSHOT</jbossws.jboss423.version> <jbossws.jboss424.version>3.0.5-SNAPSHOT</jbossws.jboss424.version> + <jbossws.jboss500.version>3.0.5-SNAPSHOT</jbossws.jboss500.version> <!-- [JBWS-2263] --> <!-- START --> - <jbossws.jboss500.version>3.0.5-SNAPSHOT</jbossws.jboss500.version> <jbossws.jboss501.version>3.0.5-SNAPSHOT</jbossws.jboss501.version> + <jbossws.jboss510.version>3.0.5-SNAPSHOT</jbossws.jboss510.version> <!-- END --> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -80,11 +81,10 @@ <xalan.version>2.7.0</xalan.version> <xerces.version>2.8.1</xerces.version> </properties> - + <!-- DependencyManagement --> <dependencyManagement> <dependencies> - <!-- jbossws dependencies --> <dependency> <groupId>org.jboss.ws</groupId> @@ -108,7 +108,6 @@ <classifier>testsuite</classifier> <type>zip</type> </dependency> - <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> @@ -171,8 +170,19 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510x</artifactId> + <version>${jbossws.jboss510.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510x</artifactId> + <version>${jbossws.jboss510.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> <!-- END --> - <!-- provided apis --> <dependency> <groupId>javax.activation</groupId> @@ -204,7 +214,6 @@ <artifactId>servlet-api</artifactId> <version>2.5</version> </dependency> - <!-- jboss provided --> <dependency> <groupId>javassist</groupId> @@ -221,7 +230,6 @@ <artifactId>jboss-remoting</artifactId> <version>${jboss.remoting.version}</version> </dependency> - <!-- transitive dependencies --> <dependency> <groupId>commons-logging</groupId> @@ -341,7 +349,7 @@ </dependency> </dependencies> </dependencyManagement> - + <!-- Plugins --> <build> <plugins> @@ -390,7 +398,7 @@ </plugin> </plugins> </build> - + <!-- Repositories --> <repositories> <repository> @@ -408,13 +416,13 @@ </snapshots> </repository> </repositories> - + <!-- Profiles --> <profiles> - - <!-- + + <!-- Name: bindist - Descr: Build the binary distribution + Descr: Build the binary distribution --> <profile> <id>bindist</id> @@ -434,10 +442,10 @@ </plugins> </build> </profile> - - <!-- + + <!-- Name: srcdist - Descr: Build the source distribution + Descr: Build the source distribution --> <profile> <id>srcdist</id> @@ -458,9 +466,9 @@ </build> </profile> - <!-- + <!-- Name: jboss422 - Descr: JBoss-4.2.2 specific options + Descr: JBoss-4.2.2 specific options --> <profile> <id>jboss422</id> @@ -469,10 +477,10 @@ <jboss.home>${jboss422.home}</jboss.home> </properties> </profile> - - <!-- + + <!-- Name: jboss423 - Descr: JBoss-4.2.3 specific options + Descr: JBoss-4.2.3 specific options --> <profile> <id>jboss423</id> @@ -481,7 +489,7 @@ <jboss.home>${jboss423.home}</jboss.home> </properties> </profile> - + <!-- Name: jboss424 Descr: JBoss-4.2.4 specific options @@ -494,9 +502,9 @@ </properties> </profile> - <!-- + <!-- Name: jboss500 - Descr: JBoss-5.0.0 specific options + Descr: JBoss-5.0.0 specific options --> <profile> <id>jboss500</id> @@ -505,10 +513,10 @@ <jboss.home>${jboss500.home}</jboss.home> </properties> </profile> - - <!-- + + <!-- Name: jboss501 - Descr: JBoss-5.0.0 specific options + Descr: JBoss-5.0.1 specific options --> <profile> <id>jboss501</id> @@ -517,10 +525,22 @@ <jboss.home>${jboss501.home}</jboss.home> </properties> </profile> - - <!-- + + <!-- + Name: jboss510 + Descr: JBoss-5.1.0 specific options + --> + <profile> + <id>jboss510</id> + <properties> + <jbossws.integration.target>jboss510</jbossws.integration.target> + <jboss.home>${jboss510.home}</jboss.home> + </properties> + </profile> + + <!-- Name: jdk16 - Descr: Compile with jdk1.6 + Descr: Compile with jdk1.6 --> <profile> <id>jdk16</id> @@ -540,10 +560,10 @@ </plugins> </build> </profile> - - <!-- + + <!-- Name: smoketest - Descr: Executes the smoke tests + Descr: Executes the smoke tests --> <profile> <id>smoketest</id> @@ -563,10 +583,10 @@ </plugins> </build> </profile> - - <!-- + + <!-- Name: testsuite - Descr: Executes the testsuite + Descr: Executes the testsuite --> <profile> <id>testsuite</id> @@ -575,5 +595,5 @@ </modules> </profile> </profiles> - + </project> Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/profiles.xml.example 2008-12-11 14:57:12 UTC (rev 8866) @@ -15,8 +15,9 @@ <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> <jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home> - <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.home> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> + <jboss501.home>/home/tdiesler/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.CR1</jboss501.home> + <jboss510.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.1.0.Beta1</jboss510.home> </properties> </profile> Modified: stack/native/trunk/src/main/distro/Install.txt =================================================================== --- stack/native/trunk/src/main/distro/Install.txt 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/src/main/distro/Install.txt 2008-12-11 14:57:12 UTC (rev 8866) @@ -15,6 +15,7 @@ ant deploy-jboss42x ant deploy-jboss50x + ant deploy-jboss51x 4.) Execute the samples to verify your installation Modified: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/src/main/distro/ant.properties.example 2008-12-11 14:57:12 UTC (rev 8866) @@ -8,8 +8,9 @@ jboss424.home=(a)jboss424.home@ jboss500.home=(a)jboss500.home@ jboss501.home=(a)jboss501.home@ +jboss510.home=(a)jboss510.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501] +# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510] jbossws.integration.target=jboss500 # The JBoss settings Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -10,11 +10,11 @@ <!-- ====================================================================== --> <project> - + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-4.2.x --> <!-- ================================================================== --> - + <target name="deploy-structure-jboss42" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <antcall target="deploy-jbossws-native42" inheritall="false"> @@ -42,12 +42,12 @@ </copy> <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> </target> - + <target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> </target> - + <!-- ================================================================== --> <!-- Deployment JBoss423 --> <!-- ================================================================== --> @@ -64,12 +64,12 @@ </copy> <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> </target> - + <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> </target> - + <!-- ================================================================== --> <!-- Deployment JBoss424 --> <!-- ================================================================== --> @@ -86,16 +86,16 @@ </copy> <chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/> </target> - + <target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424"> <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/> - <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> </target> - + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> - + <target name="deploy-structure-jboss50" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <antcall target="deploy-jbossws-native50" inheritall="false"> @@ -106,7 +106,7 @@ </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> - + <!-- ================================================================== --> <!-- Deployment JBoss500 --> <!-- ================================================================== --> @@ -123,12 +123,12 @@ </copy> <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> </target> - + <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> </target> - + <!-- ================================================================== --> <!-- Deployment JBoss501 --> <!-- ================================================================== --> @@ -145,16 +145,53 @@ </copy> <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> </target> - + <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> </target> - + <!-- ================================================================== --> + <!-- Prepare Deployment Structure JBoss-5.1.x --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss51" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-native51" inheritall="false"> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss510 --> + <!-- ================================================================== --> + + <target name="target-jboss510"> + <property name="jbossws.integration.target" value="jboss510"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51" description="Deploy jbossws to jboss510"> + <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> + <copy todir="${jboss510.home}" overwrite="true"> + <fileset dir="${deploy.structure}"/> + </copy> + <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> + <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> + <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> <!-- Create jbossws-deploy.conf --> <!-- ================================================================== --> - + <macrodef name="macro-create-deploy-conf"> <attribute name="deploystructure"/> <sequential> @@ -165,5 +202,5 @@ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> </sequential> </macrodef> - + </project> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/src/main/distro/build-setup.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -10,13 +10,13 @@ <!-- ====================================================================== --> <project> - + <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - + <target name="prepare"> - + <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> @@ -26,13 +26,13 @@ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - + <property name="jboss423.lib" value="${jboss423.home}/lib"/> <property name="jboss423.client" value="${jboss423.home}/client"/> <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - + <property name="jboss424.lib" value="${jboss424.home}/lib"/> <property name="jboss424.client" value="${jboss424.home}/client"/> <property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/> @@ -45,7 +45,7 @@ <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/> <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - + <property name="jboss501.lib" value="${jboss501.home}/lib"/> <property name="jboss501.client" value="${jboss501.home}/client"/> <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> @@ -53,21 +53,30 @@ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + <property name="jboss510.lib" value="${jboss510.home}/lib"/> + <property name="jboss510.client" value="${jboss510.home}/client"/> + <property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/> + <property name="jboss510.server.lib" value="${jboss510.home}/common/lib"/> + <property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/> + <property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> <property name="jboss424.available.file" value="${jboss424.client}/jboss-client.jar"/> <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + <property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/> <available property="jboss422.available" file="${jboss422.available.file}"/> <available property="jboss423.available" file="${jboss423.available.file}"/> <available property="jboss424.available" file="${jboss424.available.file}"/> <available property="jboss500.available" file="${jboss500.available.file}"/> <available property="jboss501.available" file="${jboss501.available.file}"/> - + <available property="jboss510.available" file="${jboss510.available.file}"/> + <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> </target> - + </project> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/src/main/distro/build.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -10,11 +10,11 @@ <!-- ====================================================================== --> <project basedir="." name="JBossWS-Native"> - + <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - + <property name="build.dir" value="${basedir}/build"/> <property name="docs.dir" value="${basedir}/docs"/> <property name="output.dir" value="${basedir}/output"/> @@ -23,26 +23,26 @@ <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> - + <!-- Check if ant.properties is available --> <available property="ant.properties.available" file="${basedir}/ant.properties"/> <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> <property file="${basedir}/ant.properties"/> - + <import file="${build.dir}/build-setup.xml"/> <import file="${build.dir}/build-deploy.xml"/> <import file="${build.dir}/jbossws-deploy-macros.xml"/> <import file="${tests.dir}/ant-import/build-testsuite.xml"/> <import file="${build.dir}/build-project-gen.xml"/> - + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> - + <target name="init" depends="prepare"> - + <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> @@ -59,13 +59,18 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> </or> </condition> - + <condition property="jbossws.integration.jboss51" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss510"/> + </or> + </condition> + <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> </target> - + <target name="tests-init" depends="init,tests-classpath"> - + <path id="ws.stack.classpath"> <!-- Move the native API to the front of the classpath --> <pathelement location="${thirdparty.dir}/jbossws-native-jaxws-ext.jar"/> @@ -74,45 +79,45 @@ <pathelement location="${thirdparty.dir}/jbossws-native-saaj.jar"/> <fileset dir="${thirdparty.dir}"/> </path> - + <path id="tests.extra.classpath"> </path> - + <property name="jbossws.test.log" value="${tests.output.dir}"/> </target> - + <!-- ================================================================== --> <!-- Compile --> <!-- ================================================================== --> - + <target name="tests-compile" depends="tests-init" description="Compile sources"> <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> </target> - + <!-- ================================================================== --> <!-- Building --> <!-- ================================================================== --> - + <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init"> <macro-copy-resources srcdir="${tests.dir}"/> </target> - + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> </target> - + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - + <!-- dummy targets --> <target name="prepare-deploy" depends="init"/> - + <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> - + <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${tests.output.dir}"/> </target> - + </project> Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -40,7 +40,7 @@ <outputDirectory>build</outputDirectory> <includes> <include>jbossws-as5-default-deploy.conf</include> - <include>jbossws-default-deploy.conf</include> + <include>jbossws-as4-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes> </fileSet> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 14:02:10 UTC (rev 8865) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 14:57:12 UTC (rev 8866) @@ -112,6 +112,16 @@ <include>org.jboss.ws:jbossws-jboss501CR1:jar</include> </includes> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss510x:jar</include> + </includes> + </dependencySet> <!-- END --> </dependencySets> </binaries>