[jbossws-commits] JBossWS SVN: r4804 - in stack/native/trunk: ant-import and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-10-19 07:35:38 -0400 (Fri, 19 Oct 2007) New Revision: 4804 Added: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt stack/native/trunk/src/test/resources/test-excludes-jboss405.txt stack/native/trunk/src/test/resources/test-excludes-jboss421.txt stack/native/trunk/src/test/resources/test-excludes-jboss422.txt stack/native/trunk/src/test/resources/test-excludes-jboss500.txt Removed: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt stack/native/trunk/src/test/resources/test-excludes-jboss40.txt stack/native/trunk/src/test/resources/test-excludes-jboss42.txt stack/native/trunk/src/test/resources/test-excludes-jboss50.txt Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/ant.properties.example stack/native/trunk/build.xml stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: use explicit deploy targets Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant-import/build-deploy.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -16,83 +16,106 @@ <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> - <!-- ================================================================== --> - <!-- Deployment JBoss50 --> - <!-- ================================================================== --> + <!-- Deploy jbossws to jboss405 --> + <target name="deploy-jboss405" depends="jars-jboss40,undeploy-jboss405,deploy-jboss405-no-ejb3" description="Deploy jbossws to jboss405"/> + + <target name="deploy-jboss405-ejb3"> + <macro-deploy-native405 + stacklibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" + jbosshome="${jboss405.home}"/> + </target> + + <target name="deploy-jboss405-no-ejb3" depends="jars-jboss40,undeploy-jboss405,deploy-jboss405-ejb3" unless="jboss405.ejb3.available" + description="Deploy jbossws to jboss405 without EJB3 support"> + <macro-setup-native40-no-ejb3/> + </target> + + <!-- Remove jbossws from jboss405 --> + <target name="undeploy-jboss405" depends="prepare" description="Remove jbossws from jboss405"> + <macro-undeploy-native405/> + <macro-undeploy-framework jbosshome="${jboss405.home}"/> + </target> - <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws to jboss50"> - <macro-deploy-native50 + <!-- Deploy jbossws to jboss421 --> + <target name="deploy-jboss421" depends="jars-jboss42,undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws to jboss421"> + <macro-deploy-native421 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" - jbosshome="${jboss50.home}"/> + jbosshome="${jboss421.home}"/> </target> - <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed - jbosshome="${jboss50.home}" + jbosshome="${jboss421.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> - <!-- Remove jbossws from jboss50 --> - <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-framework jbosshome="${jboss50.home}"/> + <!-- Remove jbossws from jboss421 --> + <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws from jboss421"> + <macro-undeploy-native421/> + <macro-undeploy-framework jbosshome="${jboss421.home}"/> </target> + <target name="undeploy-jboss421-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss421.home}"/> + </target> - <target name="undeploy-jboss50-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss50.home}"/> - </target> - - <!-- Deploy jbossws to jboss42 --> - <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws to jboss42"> - <macro-deploy-native42 + <!-- Deploy jbossws to jboss422 --> + <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422"> + <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" - jbosshome="${jboss42.home}"/> + jbosshome="${jboss422.home}"/> </target> - <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed - jbosshome="${jboss42.home}" + jbosshome="${jboss422.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> - <!-- Remove jbossws from jboss42 --> - <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-framework jbosshome="${jboss42.home}"/> + <!-- Remove jbossws from jboss422 --> + <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422"> + <macro-undeploy-native422/> + <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss42-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> + <target name="undeploy-jboss422-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> </target> - <!-- Deploy jbossws to jboss40 --> - <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-no-ejb3" description="Deploy jbossws to jboss40"/> - - <target name="deploy-jboss40-ejb3"> - <macro-deploy-native40 + <!-- Deploy jbossws to jboss500 --> + <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500"> + <macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" - jbosshome="${jboss40.home}"/> - </target> + jbosshome="${jboss500.home}"/> + </target> - <target name="deploy-jboss40-no-ejb3" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-ejb3" unless="jboss40.ejb3.available" - description="Deploy jbossws to jboss40 without EJB3 support"> - <macro-setup-native40-no-ejb3/> + <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed + jbosshome="${jboss500.home}" + stacklibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> </target> + + <!-- Remove jbossws from jboss500 --> + <target name="undeploy-jboss500" depends="prepare,undeploy-jboss500-endorsed" description="Remove jbossws from jboss500"> + <macro-undeploy-native500/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> + </target> - <!-- Remove jbossws from jboss40 --> - <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40"> - <macro-undeploy-native40/> - <macro-undeploy-framework jbosshome="${jboss40.home}"/> + <target name="undeploy-jboss500-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss500.home}"/> </target> + </project> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant-import/build-setup.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -24,37 +24,60 @@ <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="jboss405.lib" value="${jboss405.home}/lib"/> + <property name="jboss405.client" value="${jboss405.home}/client"/> + <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/> + <property name="jboss405.server.lib" value="${jboss405.server}/lib"/> + <property name="jboss405.server.deploy" value="${jboss405.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="jboss421.lib" value="${jboss421.home}/lib"/> + <property name="jboss421.client" value="${jboss421.home}/client"/> + <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> + <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> + <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + <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="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="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/> + <property name="jboss421.available.file" value="${jboss421.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="jboss405.available" file="${jboss405.available.file}"/> + <available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/> + <available property="jboss421.available" file="${jboss421.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <condition property="jbossws.integration.jboss40" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss405"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss405.no.ejb3"/> + </or> + </condition> + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </or> + </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/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -56,6 +56,8 @@ <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-src.zip" dest="${thirdparty.dir}/jbossws-jboss40-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -12,379 +12,501 @@ <!-- $Id: macros-deploy-native.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ --> <project> - - <!-- ================================================================== --> - <!-- Deployment JBossWS/Native --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-native50"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <!-- ================================================================== --> + <!-- Deploy Endorsed --> + <!-- ================================================================== --> + + <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 --> + <macrodef name="macro-deploy-endorsed"> + <attribute name="jbosshome"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <copy todir="@{jbosshome}/lib/endorsed" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- Undeploy API jars from lib/endorsed --> + <macrodef name="macro-undeploy-endorsed"> + <attribute name="jbosshome"/> + <sequential> + <delete> + <fileset dir="@{jbosshome}/lib/endorsed"> + <include name="jaxb-api.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deployment JBoss-4.0.5 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-native405"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss405.available.file}" unless="jboss405.available"/> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss405.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss405.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss405.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss40.jar"/> + <include name="policy.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="stax-api.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <include name="wstx.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <copy todir="${jboss405.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss405.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss40.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> + <mkdir dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native40.sar&quot;/&gt; + <mkdir dir="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-setup-native405-no-ejb3"> + <sequential> + + <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml" + file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/> + <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml" + file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + + <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml" + file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/> + <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" + file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/> + + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native405"> + <sequential> + <fail message="Not available: ${jboss405.available.file}" unless="jboss405.available"/> + <delete> <!-- BIN SCRIPTS --> - <unzip dest="${jboss50.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/> + <fileset dir="${jboss405.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> <!-- CLIENT JARS --> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="policy.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> + <fileset dir="${jboss405.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-jboss40.jar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-wsconsume-impl.jar"/> + <include name="jbossws14-client.jar"/> + </fileset> <!-- SERVER JARS --> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> + <fileset dir="${jboss405.home}/lib"> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss405.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-jboss40.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <!-- Remove only, do not deploy --> + <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.1 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-native421"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss421.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss421.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jbossws-jboss421.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <copy todir="${jboss421.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss421.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss421.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; + <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native421"> + <sequential> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <delete> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.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; - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native50"> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <delete> - <!-- BIN SCRIPTS --> - <fileset dir="${jboss50.home}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - <include name="wsrunclient.*"/> - <include name="wstools.*"/> - </fileset> - - <!-- CLIENT JARS --> - <fileset dir="${jboss50.home}/client"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - <!-- Remove only, do not deploy --> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - - <!-- SERVER JARS --> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <!-- Remove only, do not deploy --> - <include name="jbossws-integration.jar"/> - </fileset> - </delete> + <!-- BIN SCRIPTS --> + <fileset dir="${jboss421.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-native42"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - - <!-- BIN SCRIPTS --> - <unzip dest="${jboss42.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/> - - <!-- CLIENT JARS --> - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - - <!-- SERVER JARS --> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.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; - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native42"> - <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <delete> - - <!-- BIN SCRIPTS --> - <fileset dir="${jboss42.home}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - <include name="wsrunclient.*"/> - <include name="wstools.*"/> - </fileset> - - <!-- CLIENT JARS --> - <fileset dir="${jboss42.home}/client"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - <!-- Remove only, do not deploy --> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - - <!-- SERVER JARS --> - <fileset dir="${jboss42.home}/lib/endorsed"> - <include name="jaxb-api.jar"/> - </fileset> - <fileset dir="${jboss42.home}/lib"> - <!-- Remove only, do not deploy --> - <include name="jbossws-integration.jar"/> - </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <!-- Remove only, do not deploy --> - <include name="jbossws-integration.jar"/> - </fileset> - </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-native40"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> - - <!-- BIN SCRIPTS --> - <unzip dest="${jboss40.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/> - - <!-- CLIENT JARS --> - <copy todir="${jboss40.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-jboss40.jar"/> - <include name="policy.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-xml-binding.jar"/> - <include name="stax-api.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - <include name="wstx.jar"/> - </fileset> - </copy> - - <!-- SERVER JARS --> - <copy todir="${jboss40.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-jboss40.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native40.sar&quot;/&gt; - <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - </sequential> - </macrodef> - - <macrodef name="macro-setup-native40-no-ejb3"> - <sequential> - - <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml" - file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/> - <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml" - file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> - - <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml" - file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/> - <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" - file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/> - - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native40"> - <sequential> - <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> - <delete> - - <!-- BIN SCRIPTS --> - <fileset dir="${jboss40.home}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - <include name="wsrunclient.*"/> - <include name="wstools.*"/> - </fileset> - - <!-- CLIENT JARS --> - <fileset dir="${jboss40.home}/client"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-jboss40.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - <!-- Remove only, do not deploy --> - <include name="jbossws-wsconsume-impl.jar"/> - <include name="jbossws14-client.jar"/> - </fileset> - - <!-- SERVER JARS --> - <fileset dir="${jboss40.home}/lib"> - <!-- Remove only, do not deploy --> - <include name="jbossws-integration.jar"/> - </fileset> - <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-jboss40.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <!-- Remove only, do not deploy --> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - </sequential> - </macrodef> - - <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 --> - <macrodef name="macro-deploy-endorsed"> - <attribute name="jbosshome"/> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <copy todir="@{jbosshome}/lib/endorsed" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - </fileset> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- Undeploy API jars from lib/endorsed --> - <macrodef name="macro-undeploy-endorsed"> - <attribute name="jbosshome"/> - <sequential> - <delete> - <fileset dir="@{jbosshome}/lib/endorsed"> - <include name="jaxb-api.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - -</project> + <!-- CLIENT JARS --> + <fileset dir="${jboss421.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss421.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss421.home}/lib"> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.2 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-native422"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss422.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss422.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.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> + + <macrodef name="macro-undeploy-native422"> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <delete> + + <!-- BIN SCRIPTS --> + <fileset dir="${jboss422.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + + <!-- CLIENT JARS --> + <fileset dir="${jboss422.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss422.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss422.home}/lib"> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deployment JBoss-5.0.0 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-native500"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss500.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss500.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + <copy todir="${jboss500.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.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> + + <macrodef name="macro-undeploy-native500"> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + + <delete> + <!-- BIN SCRIPTS --> + <fileset dir="${jboss500.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + + <!-- CLIENT JARS --> + <fileset dir="${jboss500.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +</project> \ No newline at end of file Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/ant.properties.example 2007-10-19 11:35:38 UTC (rev 4804) @@ -4,12 +4,13 @@ # $Id$ # 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 +#jboss405.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 +#jboss421.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA +#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA +#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -# The JBoss server under test. This can be [jboss50|jboss42|jboss40|jboss40.no.ejb3] -jbossws.integration.target=jboss50 +# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss500] +jbossws.integration.target=jboss500 # The JBoss server instance jboss.server.instance=default Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/build.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -262,7 +262,7 @@ </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="${core.output.lib.dir}/jbossws-native50/jbossws-beans.xml"> @@ -301,7 +301,7 @@ </target> - <target name="jars-jboss42" depends="jars-common" if="jboss42.home"> + <target name="jars-jboss42" depends="jars-common" if="jboss422.home"> <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> @@ -352,7 +352,7 @@ </jar> </target> - <target name="jars-jboss40" depends="jars-common" if="jboss40.home"> + <target name="jars-jboss40" depends="jars-common" if="jboss405.home"> <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss40-resources.zip"/> Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -28,36 +28,36 @@ <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="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="jboss405.lib" value="${jboss405.home}/lib"/> + <property name="jboss405.client" value="${jboss405.home}/client"/> + <property name="jboss405.server" value="${jboss405.home}/server/${jboss.server.instance}"/> + <property name="jboss405.server.lib" value="${jboss405.server}/lib"/> + <property name="jboss405.server.deploy" value="${jboss405.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="jboss40.available.file" value="${jboss40.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"/> + <property name="jboss405.available.file" value="${jboss405.client}/jboss-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="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss405.available" file="${jboss405.available.file}"/> - <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> + <available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/> <!-- JDK Detection --> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> @@ -77,10 +77,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/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-19 11:35:38 UTC (rev 4804) @@ -24,11 +24,11 @@ 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}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> @@ -36,7 +36,7 @@ <!-- Remove jbossws/native from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> <macro-undeploy-native50/> - <macro-undeploy-framework jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> <!-- Deploy jbossws/native to jboss42 --> @@ -46,11 +46,11 @@ 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}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> @@ -58,10 +58,10 @@ <!-- Remove jbossws/native from jboss42 --> <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/native from jboss42"> <macro-undeploy-native42/> - <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> <!-- Deploy jbossws/native to jboss40 --> @@ -74,10 +74,10 @@ <macro-deploy-framework thirdpartylibs="${lib.dir}" - jbosshome="${jboss40.home}"/> + jbosshome="${jboss405.home}"/> </target> - <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> + <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss405.ejb3.available"> <macro-setup-native40-no-ejb3/> <echo> *********************************** @@ -90,7 +90,7 @@ <!-- Remove jbossws/native from jboss40 --> <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40"> <macro-undeploy-native40/> - <macro-undeploy-framework jbosshome="${jboss40.home}"/> + <macro-undeploy-framework jbosshome="${jboss405.home}"/> </target> </project> Deleted: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -1,65 +0,0 @@ -# JBossAS-4.0 excludes -org/jboss/test/ws/jaxrpc/jbws723/** - -# EJB3 compilation excludes -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* -org/jboss/test/ws/jaxws/samples/context/EndpointEJB* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/swaref/** -org/jboss/test/ws/jaxws/samples/eardeployment/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/samples/serviceref/*EJB* -org/jboss/test/ws/jaxws/samples/webservice/*EJB3* -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1446/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1556/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/jbws1611/** -org/jboss/test/ws/jaxws/jbws1665/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1809/** -org/jboss/test/ws/jaxws/jbws1813/** -org/jboss/test/ws/jaxws/jbws1815/** -org/jboss/test/ws/jaxws/jbws1840/** -org/jboss/test/ws/jaxws/jbws771/** -org/jboss/test/ws/jaxws/jbws944/** -org/jboss/test/ws/jaxws/jbws981/** -org/jboss/test/ws/jaxws/namespace/** -org/jboss/test/ws/jaxws/webserviceref/** -org/jboss/test/ws/jaxws/handlerlifecycle/** -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean* -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/context/** -org/jboss/test/ws/jaxws/binding/** - -# EJB3 runtime excludes -org/jboss/test/ws/interop/wsa/AddressingTestCase* -org/jboss/test/ws/interop/wsse/EncryptTestCase* -org/jboss/test/ws/interop/wsse/SignTestCase* -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase* -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase* -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase* -org/jboss/test/ws/jaxws/samples/wssecurity/*TestCase* -org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase* -org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase* -org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase* -org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase* -org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase* -org/jboss/test/ws/jaxws/wseventing/EventingTestCase* -org/jboss/test/ws/jaxws/wseventing/NotificationTestCase* -org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase* -org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase* -org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase* - -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** Deleted: stack/native/trunk/src/test/resources/test-excludes-jboss40.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -1,13 +0,0 @@ -# JBossAS-4.0 excludes -org/jboss/test/ws/jaxrpc/jbws723/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml -org/jboss/test/ws/jaxws/jbws1797/** - Copied: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt (from rev 4799, stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,65 @@ +# JBossAS-4.0 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + +# EJB3 compilation excludes +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxws/samples/context/EndpointEJB* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/swaref/** +org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/serviceref/*EJB* +org/jboss/test/ws/jaxws/samples/webservice/*EJB3* +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1422/** +org/jboss/test/ws/jaxws/jbws1446/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1556/** +org/jboss/test/ws/jaxws/jbws1566/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1611/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1733/** +org/jboss/test/ws/jaxws/jbws1799/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1813/** +org/jboss/test/ws/jaxws/jbws1815/** +org/jboss/test/ws/jaxws/jbws1840/** +org/jboss/test/ws/jaxws/jbws771/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/namespace/** +org/jboss/test/ws/jaxws/webserviceref/** +org/jboss/test/ws/jaxws/handlerlifecycle/** +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean* +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/context/** +org/jboss/test/ws/jaxws/binding/** + +# EJB3 runtime excludes +org/jboss/test/ws/interop/wsa/AddressingTestCase* +org/jboss/test/ws/interop/wsse/EncryptTestCase* +org/jboss/test/ws/interop/wsse/SignTestCase* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/*TestCase* +org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase* +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase* +org/jboss/test/ws/jaxws/wseventing/EventingTestCase* +org/jboss/test/ws/jaxws/wseventing/NotificationTestCase* +org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase* +org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase* +org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase* + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + +# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** Copied: stack/native/trunk/src/test/resources/test-excludes-jboss405.txt (from rev 4799, stack/native/trunk/src/test/resources/test-excludes-jboss40.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,13 @@ +# JBossAS-4.0 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + Deleted: stack/native/trunk/src/test/resources/test-excludes-jboss42.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -1,7 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml -org/jboss/test/ws/jaxws/jbws1797/** - Added: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss421.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,7 @@ +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + Property changes on: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt ___________________________________________________________________ Name: svn:executable + * Copied: stack/native/trunk/src/test/resources/test-excludes-jboss422.txt (from rev 4799, stack/native/trunk/src/test/resources/test-excludes-jboss42.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss422.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,7 @@ +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +org/jboss/test/ws/jaxws/jbws1797/** + Deleted: stack/native/trunk/src/test/resources/test-excludes-jboss50.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-19 11:34:04 UTC (rev 4803) +++ stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -1,7 +0,0 @@ -# Fix before JBoss50 goes final -org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* -org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* -org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* -org/jboss/test/ws/jaxrpc/wsdlpublish/** - Copied: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt (from rev 4799, stack/native/trunk/src/test/resources/test-excludes-jboss50.txt) =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt (rev 0) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-10-19 11:35:38 UTC (rev 4804) @@ -0,0 +1,7 @@ +# Fix before JBoss50 goes final +org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* +org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* +org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +org/jboss/test/ws/jaxrpc/wsdlpublish/** +