[jbossws-commits] JBossWS SVN: r4814 - in stack/metro/trunk: ant-import and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-10-20 03:04:14 -0400 (Sat, 20 Oct 2007) New Revision: 4814 Added: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt Removed: stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt Modified: stack/metro/trunk/ant-import/build-deploy.xml stack/metro/trunk/ant-import/build-setup.xml stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/ant-import/macros-deploy-sunri.xml stack/metro/trunk/ant.properties.example stack/metro/trunk/build.xml stack/metro/trunk/src/ stack/metro/trunk/src/main/distro/bin-dist-build.xml stack/metro/trunk/src/main/distro/bin-dist-deploy.xml stack/metro/trunk/src/main/etc/bin-dist-build.xml stack/metro/trunk/src/main/etc/bin-dist-deploy.xml stack/metro/trunk/version.properties Log: Use explicit container deploy targets Modified: stack/metro/trunk/ant-import/build-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-deploy.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/ant-import/build-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -21,37 +21,37 @@ <!-- ================================================================== --> <!-- Deploy to jboss50 --> - <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <macro-deploy-sunri50 + <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50"> + <macro-deploy-sunri500 stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${int.sunri.dir}/thirdparty" - jbosshome="${jboss50.home}"/> + jbosshome="${jboss500.home}"/> </target> <!-- Remove from jboss50 --> - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri50/> - <macro-undeploy-framework jbosshome="${jboss50.home}"/> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri500/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> <!-- Deploy to jboss42 --> - <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> - <macro-deploy-sunri42 + <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42"> + <macro-deploy-sunri422 stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${int.sunri.dir}/thirdparty" - jbosshome="${jboss42.home}"/> + jbosshome="${jboss422.home}"/> </target> <!-- Remove from jboss42 --> - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri42/> - <macro-undeploy-framework jbosshome="${jboss42.home}"/> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri422/> + <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> </project> Modified: stack/metro/trunk/ant-import/build-setup.xml =================================================================== --- stack/metro/trunk/ant-import/build-setup.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/ant-import/build-setup.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -24,37 +24,34 @@ <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <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="jboss40.lib" value="${jboss40.home}/lib"/> - <property name="jboss40.client" value="${jboss40.home}/client"/> - <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> - <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> - <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> - <available property="jboss40.available" file="${jboss40.available.file}"/> - <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <condition property="jbossws.integration.jboss42" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> <!-- JDK Detection --> Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -103,7 +103,7 @@ <!-- The compile classpath for jboss50 integration --> <path id="sunri50.integration.classpath"> <path refid="sunri.integration.classpath"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> + <pathelement location="${jboss500.server.lib}/jboss.jar"/> </path> </target> Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -14,17 +14,15 @@ <project> <!-- ================================================================== --> - <!-- Deployment JBoss50 --> + <!-- Deployment JBoss422 --> <!-- ================================================================== --> - <macrodef name="macro-deploy-sunri50"> + <macrodef name="macro-deploy-sunri422"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <!-- CLIENT JARS --> - <copy todir="${jboss50.home}/client" overwrite="true"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <copy todir="${jboss422.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <include name="jbossws-sunri-client.jar"/> </fileset> @@ -42,38 +40,24 @@ <include name="saaj-impl.jar"/> </fileset> </copy> - - <!-- BOOTSTRAP JARS --> - <copy todir="${jboss50.home}/lib" overwrite="true"> + <copy todir="${jboss422.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> </fileset> </copy> - - <!--SERVER JARS --> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxws-api.jar"/> - <include name="jsr181-api.jar"/> - <include name="saaj-api.jar"/> - </fileset> - </copy> - - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri50.sar&quot;/&gt; - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri42.sar&quot;/&gt; + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; </sequential> </macrodef> - <!-- Remove jbossws/sunri from jboss50 --> - <macrodef name="macro-undeploy-sunri50"> + <!-- Remove jbossws/sunri from jboss42 --> + <macrodef name="macro-undeploy-sunri422"> <sequential> <delete> - - <!-- CLIENT JARS --> - <fileset dir="${jboss50.home}/client"> + <fileset dir="${jboss422.home}/client"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -87,26 +71,24 @@ <include name="saaj-impl.jar"/> <include name="jbossws-sunri-client.jar"/> </fileset> - - <!-- SERVER JARS --> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jaxws-api.jar"/> - <include name="jsr181-api.jar"/> - <include name="saaj-api.jar"/> - </fileset> </delete> - - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> - <macrodef name="macro-deploy-sunri42"> + <!-- ================================================================== --> + <!-- Deployment JBoss500 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-sunri500"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/client" overwrite="true"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss500.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <include name="jbossws-sunri-client.jar"/> </fileset> @@ -124,24 +106,38 @@ <include name="saaj-impl.jar"/> </fileset> </copy> - <copy todir="${jboss42.home}/lib" overwrite="true"> + + <!-- BOOTSTRAP JARS --> + <copy todir="${jboss500.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> </fileset> </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri42.sar&quot;/&gt; - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + + <!--SERVER JARS --> + <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxws-api.jar"/> + <include name="jsr181-api.jar"/> + <include name="saaj-api.jar"/> + </fileset> + </copy> + + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri50.sar&quot;/&gt; + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; </sequential> </macrodef> - <!-- Remove jbossws/sunri from jboss42 --> - <macrodef name="macro-undeploy-sunri42"> + <!-- Remove jbossws/sunri from jboss500 --> + <macrodef name="macro-undeploy-sunri500"> <sequential> <delete> - <fileset dir="${jboss42.home}/client"> + + <!-- CLIENT JARS --> + <fileset dir="${jboss500.home}/client"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -155,9 +151,17 @@ <include name="saaj-impl.jar"/> <include name="jbossws-sunri-client.jar"/> </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> + <include name="jaxws-api.jar"/> + <include name="jsr181-api.jar"/> + <include name="saaj-api.jar"/> + </fileset> </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> Modified: stack/metro/trunk/ant.properties.example =================================================================== --- stack/metro/trunk/ant.properties.example 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/ant.properties.example 2007-10-20 07:04:14 UTC (rev 4814) @@ -7,12 +7,11 @@ #java.home.jdk16=/usr/java/jdk1.6 # Optional JBoss Home -#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA -#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 +#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 +#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA -# The JBoss server under test. This can be [jboss50|jboss42] -jbossws.integration.target=jboss50 +# The JBoss server under test. This can be [jboss422|jboss500] +jbossws.integration.target=jboss422 # The JBoss settings jboss.server.instance=default Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/build.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -141,7 +141,7 @@ </zip> </target> - <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> + <target name="jars-jboss50" depends="jars-common" if="jboss500.home"> <!-- Concat jbossws-beans.xml --> <concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml"> @@ -187,7 +187,7 @@ </jar> </target> - <target name="jars-jboss42" depends="jars-common" if="jboss42.home"> + <target name="jars-jboss42" depends="jars-common" if="jboss422.home"> <unzip dest="${sunri.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> Property changes on: stack/metro/trunk/src ___________________________________________________________________ Name: svn:externals - test-framework https://svn.jboss.org/repos/jbossws/framework/trunk/src/test + test-framework http://anonsvn.jboss.org/repos/jbossws/framework/trunk/src/test Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -28,26 +28,26 @@ <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <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="jbossws.integration.${jbossws.integration.target}" value="true"/> - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> <!-- JDK Detection --> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> @@ -67,10 +67,10 @@ <target name="prepare"> <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss50.home}"> + <condition property="jboss.home" value="${jboss500.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> - <condition property="jboss.home" value="${jboss42.home}"> + <condition property="jboss.home" value="${jboss422.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -24,18 +24,18 @@ thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" - jbosshome="${jboss50.home}"/> + jbosshome="${jboss500.home}"/> </target> <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed - jbosshome="${jboss50.home}" + jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/> </target> <!-- Remove jbossws/sunri from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> <macro-undeploy-sunri50/> - <macro-undeploy-framework jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> <!-- Deploy jbossws/sunri to jboss42 --> @@ -45,21 +45,21 @@ thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" - jbosshome="${jboss42.home}"/> + jbosshome="${jboss422.home}"/> </target> <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed - jbosshome="${jboss42.home}" + jbosshome="${jboss422.home}" thirdpartylibs="${lib.dir}"/> </target> <!-- Remove jbossws/sunri from jboss42 --> <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/sunri from jboss42"> <macro-undeploy-sunri42/> - <macro-undeploy-framework jbosshome="${jboss42.home}"/> + <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> + <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> </target> </project> Modified: stack/metro/trunk/src/main/etc/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/etc/bin-dist-build.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/src/main/etc/bin-dist-build.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -28,26 +28,26 @@ <property file="${basedir}/version.properties"/> <property file="${build.dir}/version.properties"/> - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <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="jbossws.integration.${jbossws.integration.target}" value="true"/> - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/build-testsuite.xml"/> @@ -63,10 +63,10 @@ <target name="prepare"> <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss50.home}"> + <condition property="jboss.home" value="${jboss500.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> - <condition property="jboss.home" value="${jboss42.home}"> + <condition property="jboss.home" value="${jboss422.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> Modified: stack/metro/trunk/src/main/etc/bin-dist-deploy.xml =================================================================== --- stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814) @@ -30,13 +30,13 @@ <macro-deploy-spi spilibs="${lib.dir}" thirdpartylibs="${lib.dir}" - jbosshome="${jboss50.home}"/> + jbosshome="${jboss500.home}"/> </target> <!-- Remove jbossws/sunri from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> <macro-undeploy-sunri50/> - <macro-undeploy-spi jbosshome="${jboss50.home}"/> + <macro-undeploy-spi jbosshome="${jboss500.home}"/> </target> <!-- Deploy jbossws/sunri to jboss42 --> @@ -52,13 +52,13 @@ <macro-deploy-spi spilibs="${lib.dir}" thirdpartylibs="${lib.dir}" - jbosshome="${jboss42.home}"/> + jbosshome="${jboss422.home}"/> </target> <!-- Remove jbossws/sunri from jboss42 --> <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> <macro-undeploy-sunri42/> - <macro-undeploy-spi jbosshome="${jboss42.home}"/> + <macro-undeploy-spi jbosshome="${jboss422.home}"/> </target> </project> Deleted: stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-20 07:04:14 UTC (rev 4814) @@ -1,19 +0,0 @@ -# -# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ -# - -################################################################### -# Exclude JBossWS-Native stuff -# -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -# -################################################################### - -# [JBWS-1673] Fix JAXR samples for SunRI -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1674] Fix @WebServiceRef with SunRI -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webserviceref/** Copied: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt (from rev 4812, stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt) =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt (rev 0) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2007-10-20 07:04:14 UTC (rev 4814) @@ -0,0 +1,19 @@ +# +# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ +# + +################################################################### +# Exclude JBossWS-Native stuff +# +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +# +################################################################### + +# [JBWS-1673] Fix JAXR samples for SunRI +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1674] Fix @WebServiceRef with SunRI +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webserviceref/** Deleted: stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-20 07:04:14 UTC (rev 4814) @@ -1,18 +0,0 @@ -# -# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ -# - -################################################################### -# Exclude JBossWS-Native stuff -# -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -# -################################################################### - -# [JBWS-1673] Fix JAXR samples for SunRI -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1674] Fix @WebServiceRef with SunRI -org/jboss/test/ws/jaxws/samples/retail/** Copied: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt (from rev 4812, stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt) =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt (rev 0) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2007-10-20 07:04:14 UTC (rev 4814) @@ -0,0 +1,18 @@ +# +# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ +# + +################################################################### +# Exclude JBossWS-Native stuff +# +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +# +################################################################### + +# [JBWS-1673] Fix JAXR samples for SunRI +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1674] Fix @WebServiceRef with SunRI +org/jboss/test/ws/jaxws/samples/retail/** Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2007-10-20 06:53:19 UTC (rev 4813) +++ stack/metro/trunk/version.properties 2007-10-20 07:04:14 UTC (rev 4814) @@ -14,10 +14,9 @@ implementation.vendor.id=http://www.jboss.org # Thirdparty library versions -jbossws-framework=2.0.1.GA -jbossws-common=1.0.0.GA +jbossws-framework=snapshot +jbossws-common=snapshot jbossws-spi=1.0.0.GA -jbossws-jboss50=2.0.1.GA jbossws-jboss42=2.0.1.GA jboss-common-core=2.0.2.GA