[jbossws-commits] JBossWS SVN: r3402 - in trunk: build/hudson/hudson-home and 12 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sun Jun 3 07:01:39 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-03 07:01:36 -0400 (Sun, 03 Jun 2007)
New Revision: 3402
Added:
trunk/integration/native/src/main/etc/bin-dist-build.xml
trunk/integration/native/src/test/resources/test-excludes-jboss40.txt
trunk/integration/native/src/test/resources/test-excludes.txt
trunk/integration/sunri/src/main/etc/bin-dist-build.xml
trunk/integration/sunri/src/test/resources/test-excludes.txt
trunk/integration/xfire/src/main/etc/bin-dist-build.xml
trunk/integration/xfire/src/test/resources/test-excludes.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
Removed:
trunk/integration/native/src/main/etc/bindist-build.xml
trunk/integration/native/src/test/resources/excludes-jboss40.txt
trunk/integration/native/src/test/resources/excludes-none.txt
trunk/integration/sunri/src/main/etc/bindist-build.xml
trunk/integration/sunri/src/test/resources/excludes-jboss42.txt
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/integration/xfire/src/main/etc/bindist-build.xml
trunk/integration/xfire/src/test/resources/excludes-jboss42.txt
trunk/integration/xfire/src/test/resources/excludes-jboss50.txt
trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt
trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt
Modified:
trunk/build/dist/ant.properties.example
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
Log:
Fix jboss40 distro
Modified: trunk/build/dist/ant.properties.example
===================================================================
--- trunk/build/dist/ant.properties.example 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/build/dist/ant.properties.example 2007-06-03 11:01:36 UTC (rev 3402)
@@ -21,6 +21,6 @@
# Java Compiler options
javac.debug=yes
-javac.deprecation=yes
+javac.deprecation=no
javac.fail.onerror=yes
javac.verbose=no
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -31,6 +31,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>AS-Tests-All</string>
<string>AS-Tests-AS-5.0</string>
<string>AS-Tests-AS-4.2</string>
<string>AS-Tests-AS-4.0</string>
@@ -50,6 +51,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>Core-Tests-All</string>
<string>Core-Tests-AS-5.0</string>
<string>Core-Tests-AS-4.2</string>
<string>Core-Tests-AS-4.0</string>
@@ -69,6 +71,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>Distro-All</string>
<string>Distro-Native-AS-5.0</string>
<string>Distro-Native-AS-4.2</string>
<string>Distro-Native-AS-4.0</string>
@@ -92,6 +95,7 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>Integration-All</string>
<string>Integration-Native-AS-5.0</string>
<string>Integration-Native-AS-4.2</string>
<string>Integration-Native-AS-4.0</string>
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -91,8 +91,8 @@
</hudson.triggers.SCMTrigger>
</triggers>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
+ <daysToKeep>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
Modified: trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -38,7 +38,7 @@
<filtersfile file="${build.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bin-dist-build.xml"/>
<copy todir="${bindist.dir}" file="${native.dir}/version.properties"/>
<!-- build -->
@@ -120,6 +120,7 @@
<include name="jaxws-rt.jar"/>
<include name="juddi-service.sar"/>
<include name="policy.jar"/>
+ <include name="stax-api.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
</copy>
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -18,10 +18,10 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excludesfile -->
- <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss40.txt">
+ <condition property="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-jboss40.txt">
<equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
</condition>
- <property name="excludesfile" value="${int.native.dir}/src/test/resources/excludes-none.txt"/>
+ <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
Copied: trunk/integration/native/src/main/etc/bin-dist-build.xml (from rev 3399, trunk/integration/native/src/main/etc/bindist-build.xml)
===================================================================
--- trunk/integration/native/src/main/etc/bin-dist-build.xml (rev 0)
+++ trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS/XFire">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <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="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="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="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"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss40.available" file="${jboss40.available.file}"/>
+
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <condition property="excludesfile" value="${tests.dir}/resources/test-excludes-jboss40.txt">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
+ </condition>
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${lib.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${lib.dir}/jbossws-core.jar"/>
+ <pathelement location="${lib.dir}/jbossws-client.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/native to jboss50 -->
+ <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50">
+ <macro-undeploy-sunri50/>
+ <macro-undeploy-xfire50/>
+ <macro-deploy-native50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss42 -->
+ <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42">
+ <macro-undeploy-sunri42/>
+ <macro-undeploy-xfire42/>
+ <macro-deploy-native42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss40 -->
+ <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws/native to jboss40">
+ <macro-deploy-native40
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss40.home}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss40 -->
+ <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
+ <macro-undeploy-native40/>
+ <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Deleted: trunk/integration/native/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" basedir="." name="JBossWS/XFire">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${tests.dir}/output"/>
-
- <property file="${basedir}/ant.properties"/>
- <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="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="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="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"/>
-
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
- <available property="jboss40.available" file="${jboss40.available.file}"/>
-
- <import file="${basedir}/build/build-testsuite.xml"/>
- <import file="${basedir}/build/macros-deploy-spi.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-xfire.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- <!-- Define excludesfile -->
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${lib.dir}/jboss-jaxws.jar"/>
- <pathelement location="${lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${lib.dir}/jbossws-core.jar"/>
- <pathelement location="${lib.dir}/jbossws-client.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/policy.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50">
- <macro-undeploy-sunri50/>
- <macro-undeploy-xfire50/>
- <macro-deploy-native50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Deploy jbossws/native to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42">
- <macro-undeploy-sunri42/>
- <macro-undeploy-xfire42/>
- <macro-deploy-native42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Deploy jbossws/native to jboss40 -->
- <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws/native to jboss40">
- <macro-undeploy-sunri40/>
- <macro-undeploy-xfire40/>
- <macro-deploy-native40
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss40.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss40 -->
- <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
- <macro-undeploy-native40/>
- <macro-undeploy-spi jbosshome="${jboss40.home}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
Deleted: trunk/integration/native/src/test/resources/excludes-jboss40.txt
===================================================================
--- trunk/integration/native/src/test/resources/excludes-jboss40.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/src/test/resources/excludes-jboss40.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Deleted: trunk/integration/native/src/test/resources/excludes-none.txt
===================================================================
--- trunk/integration/native/src/test/resources/excludes-none.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/native/src/test/resources/excludes-none.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-# Nothing to exclude
Copied: trunk/integration/native/src/test/resources/test-excludes-jboss40.txt (from rev 3399, trunk/integration/native/src/test/resources/excludes-jboss40.txt)
===================================================================
--- trunk/integration/native/src/test/resources/test-excludes-jboss40.txt (rev 0)
+++ trunk/integration/native/src/test/resources/test-excludes-jboss40.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,9 @@
+#
+# $Id$
+#
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Copied: trunk/integration/native/src/test/resources/test-excludes.txt (from rev 3399, trunk/integration/native/src/test/resources/excludes-none.txt)
===================================================================
--- trunk/integration/native/src/test/resources/test-excludes.txt (rev 0)
+++ trunk/integration/native/src/test/resources/test-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+# Nothing to exclude
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -41,7 +41,7 @@
<filtersfile file="${build.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bin-dist-build.xml"/>
<copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>
<!-- build -->
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -18,12 +18,7 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excludesfile -->
- <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
+ <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
Copied: trunk/integration/sunri/src/main/etc/bin-dist-build.xml (from rev 3399, trunk/integration/sunri/src/main/etc/bindist-build.xml)
===================================================================
--- trunk/integration/sunri/src/main/etc/bin-dist-build.xml (rev 0)
+++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS/SunRI">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <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="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="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"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
+ <pathelement location="${thirdparty.dir}/http.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
+ <pathelement location="${thirdparty.dir}/resolver.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
+ <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/sunri to jboss50 -->
+ <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-xfire50/>
+ <macro-deploy-sunri50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${build.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.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}"/>
+ </target>
+
+ <!-- Deploy jbossws/sunri to jboss42 -->
+ <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-xfire42/>
+ <macro-deploy-sunri42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${build.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.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}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Deleted: trunk/integration/sunri/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" basedir="." name="JBossWS/SunRI">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${tests.dir}/output"/>
-
- <property file="${basedir}/ant.properties"/>
- <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="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="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"/>
-
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
-
- <import file="${basedir}/build/build-testsuite.xml"/>
- <import file="${basedir}/build/macros-deploy-spi.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-xfire.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- <!-- Define excludesfile -->
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/http.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/resolver.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/sunri to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-xfire50/>
- <macro-deploy-sunri50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.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}"/>
- </target>
-
- <!-- Deploy jbossws/sunri to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-xfire42/>
- <macro-deploy-sunri42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.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}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
Deleted: trunk/integration/sunri/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,22 +0,0 @@
-#
-# $Id$
-#
-
-###################################################################
-# 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-1669] Fix WebServiceContext.getMessageContext()
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
-
-# [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: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,22 +0,0 @@
-#
-# $Id$
-#
-
-###################################################################
-# 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-1669] Fix WebServiceContext.getMessageContext()
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
-
-# [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: trunk/integration/sunri/src/test/resources/test-excludes.txt (from rev 3399, trunk/integration/sunri/src/test/resources/excludes-jboss50.txt)
===================================================================
--- trunk/integration/sunri/src/test/resources/test-excludes.txt (rev 0)
+++ trunk/integration/sunri/src/test/resources/test-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,22 @@
+#
+# $Id$
+#
+
+###################################################################
+# 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-1669] Fix WebServiceContext.getMessageContext()
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
+
+# [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/**
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -43,7 +43,7 @@
<filtersfile file="${build.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bin-dist-build.xml"/>
<copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
<!-- build -->
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -18,12 +18,7 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excludesfile -->
- <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
+ <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
Copied: trunk/integration/xfire/src/main/etc/bin-dist-build.xml (from rev 3399, trunk/integration/xfire/src/main/etc/bindist-build.xml)
===================================================================
--- trunk/integration/xfire/src/main/etc/bin-dist-build.xml (rev 0)
+++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS/XFire">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <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="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="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"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes.txt"/>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <!--
+ Cannot use XFire client
+ [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
+ -->
+ <path id="sunri.classpath">
+ <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/>
+ <pathelement location="${thirdparty.dir}/client/http.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/resolver.jar"/>
+ <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/>
+ <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/>
+ <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/>
+ <pathelement location="${thirdparty.dir}/client/wstx.jar"/>
+ </path>
+
+ <path id="xfire.classpath">
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jdom.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/xfire-all.jar"/>
+ <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/>
+ </path>
+
+ <path id="ws.stack.classpath">
+ <path refid="sunri.classpath"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/xfire to jboss50 -->
+ <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-sunri50/>
+ <macro-deploy-xfire50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Remove jbossws/xfire from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
+ <macro-undeploy-xfire50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/xfire to jboss42 -->
+ <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-sunri42/>
+ <macro-deploy-xfire42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Remove jbossws/xfire from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
+ <macro-undeploy-xfire42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
+</project>
Deleted: trunk/integration/xfire/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" basedir="." name="JBossWS/XFire">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${tests.dir}/output"/>
-
- <property file="${basedir}/ant.properties"/>
- <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="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="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"/>
-
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
-
- <import file="${basedir}/build/build-testsuite.xml"/>
- <import file="${basedir}/build/macros-deploy-spi.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-xfire.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- <!-- Define excludesfile -->
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <!--
- Cannot use XFire client
- [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
- -->
- <path id="sunri.classpath">
- <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/client/http.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/resolver.jar"/>
- <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/>
- <pathelement location="${thirdparty.dir}/client/wstx.jar"/>
- </path>
-
- <path id="xfire.classpath">
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jdom.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/xfire-all.jar"/>
- <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/>
- </path>
-
- <path id="ws.stack.classpath">
- <path refid="sunri.classpath"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/xfire to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-sunri50/>
- <macro-deploy-xfire50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Remove jbossws/xfire from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
- <macro-undeploy-xfire50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Deploy jbossws/xfire to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-sunri42/>
- <macro-deploy-xfire42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Remove jbossws/xfire from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
- <macro-undeploy-xfire42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
Deleted: trunk/integration/xfire/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-
-###################################################################
-# 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-1682] XFire does not generate proper service name
-org/jboss/test/ws/jaxws/samples/asynchronous/**
-org/jboss/test/ws/jaxws/samples/exception/**
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-org/jboss/test/ws/jaxws/samples/oneway/**
-org/jboss/test/ws/jaxws/samples/soapbinding/**
-org/jboss/test/ws/jaxws/samples/webmethod/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-1685] Add support for WebServiceContext propagation
-org/jboss/test/ws/jaxws/samples/context/**
-
-# [JBWS-1686] Add support for @Provider
-org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/provider/**
-
-# [JBWS-1683] Fix JAXR samples for XFire
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1687] Add support for @HandlerChain
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
-
-# [JBWS-1684] Fix @WebServiceRef with XFire
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# [JBWS-1689] Add support for SwaRef
-org/jboss/test/ws/jaxws/samples/swaref/**
-
-# [JBWS-1688] Fix @WebParam, @WebResult handling
-org/jboss/test/ws/jaxws/samples/webparam/**
-org/jboss/test/ws/jaxws/samples/webresult/**
Deleted: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-
-###################################################################
-# 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-1682] XFire does not generate proper service name
-org/jboss/test/ws/jaxws/samples/asynchronous/**
-org/jboss/test/ws/jaxws/samples/exception/**
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-org/jboss/test/ws/jaxws/samples/oneway/**
-org/jboss/test/ws/jaxws/samples/soapbinding/**
-org/jboss/test/ws/jaxws/samples/webmethod/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-1685] Add support for WebServiceContext propagation
-org/jboss/test/ws/jaxws/samples/context/**
-
-# [JBWS-1686] Add support for @Provider
-org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/provider/**
-
-# [JBWS-1683] Fix JAXR samples for XFire
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1687] Add support for @HandlerChain
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
-
-# [JBWS-1684] Fix @WebServiceRef with XFire
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# [JBWS-1689] Add support for SwaRef
-org/jboss/test/ws/jaxws/samples/swaref/**
-
-# [JBWS-1688] Fix @WebParam, @WebResult handling
-org/jboss/test/ws/jaxws/samples/webparam/**
-org/jboss/test/ws/jaxws/samples/webresult/**
Copied: trunk/integration/xfire/src/test/resources/test-excludes.txt (from rev 3399, trunk/integration/xfire/src/test/resources/excludes-jboss42.txt)
===================================================================
--- trunk/integration/xfire/src/test/resources/test-excludes.txt (rev 0)
+++ trunk/integration/xfire/src/test/resources/test-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,46 @@
+#
+# $Id$
+#
+
+###################################################################
+# 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-1682] XFire does not generate proper service name
+org/jboss/test/ws/jaxws/samples/asynchronous/**
+org/jboss/test/ws/jaxws/samples/exception/**
+org/jboss/test/ws/jaxws/samples/handlerchain/**
+org/jboss/test/ws/jaxws/samples/oneway/**
+org/jboss/test/ws/jaxws/samples/soapbinding/**
+org/jboss/test/ws/jaxws/samples/webmethod/**
+org/jboss/test/ws/jaxws/samples/webservice/**
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-1685] Add support for WebServiceContext propagation
+org/jboss/test/ws/jaxws/samples/context/**
+
+# [JBWS-1686] Add support for @Provider
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+org/jboss/test/ws/jaxws/samples/provider/**
+
+# [JBWS-1683] Fix JAXR samples for XFire
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1687] Add support for @HandlerChain
+org/jboss/test/ws/jaxws/samples/logicalhandler/**
+
+# [JBWS-1684] Fix @WebServiceRef with XFire
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# [JBWS-1689] Add support for SwaRef
+org/jboss/test/ws/jaxws/samples/swaref/**
+
+# [JBWS-1688] Fix @WebParam, @WebResult handling
+org/jboss/test/ws/jaxws/samples/webparam/**
+org/jboss/test/ws/jaxws/samples/webresult/**
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-03 11:01:36 UTC (rev 3402)
@@ -18,7 +18,7 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excluded tests -->
- <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/>
+ <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
<property name="excludesfile" value="${core.dir}/src/test/resources/${excludes-short-name}"/>
<!--
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,18 @@
+# Always exclude
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# JBossAS-4.0 excludes
+org/jboss/test/ws/jaxrpc/jbws723/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/serviceref/**
+
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,15 @@
+# Always exclude
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/serviceref/**
+
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -0,0 +1,20 @@
+# Always exclude
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# Fix before JBoss50 goes final
+org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
+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/jbws165/JBWS165TestCase.*
+org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.*
+org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
+org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
+org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+org/jboss/test/ws/jaxrpc/wsdlpublish/**
+
Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,18 +0,0 @@
-# Always exclude
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# JBossAS-4.0 excludes
-org/jboss/test/ws/jaxrpc/jbws723/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/serviceref/**
-
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Deleted: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,15 +0,0 @@
-# Always exclude
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/serviceref/**
-
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Deleted: trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt 2007-06-03 10:28:30 UTC (rev 3401)
+++ trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt 2007-06-03 11:01:36 UTC (rev 3402)
@@ -1,20 +0,0 @@
-# Always exclude
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# Fix before JBoss50 goes final
-org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
-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/jbws165/JBWS165TestCase.*
-org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.*
-org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
-org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
-org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-org/jboss/test/ws/jaxrpc/wsdlpublish/**
-
More information about the jbossws-commits
mailing list