[jbossws-commits] JBossWS SVN: r4815 - in stack/cxf/trunk: ant-import and 3 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Oct 20 03:41:15 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-10-20 03:41:15 -0400 (Sat, 20 Oct 2007)
New Revision: 4815
Added:
stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
Removed:
stack/cxf/trunk/src/test/resources/test-excludes-jboss42.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss50.txt
Modified:
stack/cxf/trunk/ant-import/build-deploy.xml
stack/cxf/trunk/ant-import/build-setup.xml
stack/cxf/trunk/ant-import/build-thirdparty.xml
stack/cxf/trunk/ant-import/macros-deploy-xfire.xml
stack/cxf/trunk/ant.properties.example
stack/cxf/trunk/build.xml
stack/cxf/trunk/src/main/distro/bin-dist-build.xml
stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml
stack/cxf/trunk/src/main/etc/bin-dist-build.xml
stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml
stack/cxf/trunk/version.properties
Log:
Use explicit container deploy targets
Modified: stack/cxf/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/ant-import/build-deploy.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -21,37 +21,37 @@
<!-- ================================================================== -->
<!-- Deploy to jboss50 -->
- <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50">
- <macro-deploy-xfire50
+ <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/xfire to jboss50">
+ <macro-deploy-xfire500
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
<macro-deploy-framework
thirdpartylibs="${int.xfire.dir}/thirdparty"
- jbosshome="${jboss50.home}"/>
+ jbosshome="${jboss500.home}"/>
</target>
<!-- Remove from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
- <macro-undeploy-xfire50/>
- <macro-undeploy-framework jbosshome="${jboss50.home}"/>
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/xfire from jboss50">
+ <macro-undeploy-xfire500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
<!-- Deploy to jboss42 -->
- <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/xfire to jboss42">
- <macro-deploy-xfire42
+ <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/xfire to jboss42">
+ <macro-deploy-xfire422
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
<macro-deploy-framework
thirdpartylibs="${int.xfire.dir}/thirdparty"
- jbosshome="${jboss42.home}"/>
+ jbosshome="${jboss422.home}"/>
</target>
<!-- Remove from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
- <macro-undeploy-xfire42/>
- <macro-undeploy-framework jbosshome="${jboss42.home}"/>
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/xfire from jboss42">
+ <macro-undeploy-xfire422/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
</project>
Modified: stack/cxf/trunk/ant-import/build-setup.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-setup.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/ant-import/build-setup.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -24,37 +24,34 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
- <property name="jboss40.lib" value="${jboss40.home}/lib"/>
- <property name="jboss40.client" value="${jboss40.home}/client"/>
- <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
- <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
- <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
- <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
- <available property="jboss40.available" file="${jboss40.available.file}"/>
- <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <condition property="jbossws.integration.jboss42" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </condition>
+ <condition property="jbossws.integration.jboss50" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ </condition>
+
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
<!-- JDK Detection -->
Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -50,6 +50,7 @@
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" 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-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
Modified: stack/cxf/trunk/ant-import/macros-deploy-xfire.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-xfire.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/ant-import/macros-deploy-xfire.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -18,14 +18,14 @@
<!-- ================================================================== -->
<!-- Deploy to jboss50 -->
- <macrodef name="macro-deploy-xfire50">
+ <macrodef name="macro-deploy-xfire500">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss50.home}/client" overwrite="true">
+ <copy todir="${jboss500.home}/client" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -34,7 +34,7 @@
</copy>
<!-- BOOTSTRAP JARS -->
- <copy todir="${jboss50.home}/lib" overwrite="true">
+ <copy todir="${jboss500.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -42,57 +42,57 @@
</copy>
<!--SERVER JARS -->
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxws-api-${cxf.jaxws.api}.jar"/>
<include name="saaj-api-${cxf.saaj}.jar"/>
</fileset>
</copy>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire50.sar"/>
- <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="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
+ <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire50.sar"/>
+ <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="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
<!-- Undeploy from jboss50 -->
- <macrodef name="macro-undeploy-xfire50">
+ <macrodef name="macro-undeploy-xfire500">
<sequential>
<delete>
<!-- CLIENT JARS -->
- <fileset dir="${jboss50.home}/client">
+ <fileset dir="${jboss500.home}/client">
<include name="jbossws-framework.jar"/>
<include name="jbossws-spi.jar"/>
</fileset>
<!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss50.home}/lib">
+ <fileset dir="${jboss500.home}/lib">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
<!--SERVER JARS -->
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
<include name="jaxws-api-${cxf.jaxws.api}.jar"/>
<include name="saaj-api-${cxf.saaj}.jar"/>
</fileset>
</delete>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
- <macrodef name="macro-deploy-xfire42">
+ <macrodef name="macro-deploy-xfire422">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<!-- CLIENT JARS -->
- <copy todir="${jboss42.home}/client" overwrite="true">
+ <copy todir="${jboss422.home}/client" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -101,7 +101,7 @@
</copy>
<!-- BOOTSTRAP JARS -->
- <copy todir="${jboss42.home}/lib" overwrite="true">
+ <copy todir="${jboss422.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -109,25 +109,25 @@
</copy>
<!--SERVER JARS -->
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire42.sar"/>
- <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="@{thirdpartylibs}/juddi-service.sar"/>
+ <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
+ <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire42.sar"/>
+ <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="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
<!-- Remove jbossws/xfire from jboss42 -->
- <macrodef name="macro-undeploy-xfire42">
+ <macrodef name="macro-undeploy-xfire422">
<sequential>
<delete>
<!-- CLIENT JARS -->
- <fileset dir="${jboss42.home}/client">
+ <fileset dir="${jboss422.home}/client">
<include name="jbossws-spi.jar"/>
</fileset>
</delete>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
Modified: stack/cxf/trunk/ant.properties.example
===================================================================
--- stack/cxf/trunk/ant.properties.example 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/ant.properties.example 2007-10-20 07:41:15 UTC (rev 4815)
@@ -7,12 +7,11 @@
#java.home.jdk16=/usr/java/jdk1.6
# Optional JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
-#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
-#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
+#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
+#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
-# The JBoss server under test. This can be [jboss50|jboss42]
-jbossws.integration.target=jboss50
+# The JBoss server under test. This can be [jboss422|jboss500]
+jbossws.integration.target=jboss422
# The JBoss settings
jboss.server.instance=default
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/build.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -127,7 +127,7 @@
</zip>
</target>
- <target name="jars-jboss50" depends="jars-common" if="jboss50.home">
+ <target name="jars-jboss50" depends="jars-common" if="jboss500.home">
<!-- Concat jbossws-beans.xml -->
<concat destfile="${xfire.output.lib.dir}/jbossws-xfire50/jbossws-beans.xml">
@@ -179,7 +179,7 @@
</target>
- <target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+ <target name="jars-jboss42" depends="jars-common" if="jboss422.home">
<unzip dest="${xfire.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -28,26 +28,26 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
<property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
<!-- JDK Detection -->
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
@@ -67,10 +67,10 @@
<target name="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
+ <condition property="jboss.home" value="${jboss500.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
</condition>
- <condition property="jboss.home" value="${jboss42.home}">
+ <condition property="jboss.home" value="${jboss422.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
Modified: stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -18,48 +18,48 @@
<!-- ================================================================== -->
<!-- Deploy jbossws/xfire to jboss50 -->
- <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/xfire to jboss50">
- <macro-deploy-xfire50
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/xfire to jboss50">
+ <macro-deploy-xfire500
stacklibs="${lib.dir}"
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">
+ <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-deploy-endorsed
- jbosshome="${jboss50.home}"
+ jbosshome="${jboss500.home}"
thirdpartylibs="${lib.dir}"/>
</target>
<!-- Remove jbossws/xfire from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
- <macro-undeploy-xfire50/>
- <macro-undeploy-framework jbosshome="${jboss50.home}"/>
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/xfire from jboss50">
+ <macro-undeploy-xfire500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
<!-- Deploy jbossws/xfire to jboss42 -->
- <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/xfire to jboss42">
- <macro-deploy-xfire42
+ <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/xfire to jboss42">
+ <macro-deploy-xfire422
stacklibs="${lib.dir}"
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">
+ <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-deploy-endorsed
- jbosshome="${jboss42.home}"
+ jbosshome="${jboss422.home}"
thirdpartylibs="${lib.dir}"/>
</target>
<!-- Remove jbossws/xfire from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/xfire from jboss42">
- <macro-undeploy-xfire42/>
- <macro-undeploy-framework jbosshome="${jboss42.home}"/>
+ <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/xfire from jboss42">
+ <macro-undeploy-xfire422/>
+ <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}"/>
+ <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
</target>
</project>
Modified: stack/cxf/trunk/src/main/etc/bin-dist-build.xml
===================================================================
--- stack/cxf/trunk/src/main/etc/bin-dist-build.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/src/main/etc/bin-dist-build.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -29,26 +29,26 @@
<property file="${basedir}/version.properties"/>
<property file="${build.dir}/version.properties"/>
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
<property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
<import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-testsuite.xml"/>
@@ -64,10 +64,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/cxf/trunk/src/main/etc/bin-dist-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml 2007-10-20 07:41:15 UTC (rev 4815)
@@ -18,10 +18,10 @@
<!-- ================================================================== -->
<!-- Deploy jbossws/xfire to jboss50 -->
- <target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/xfire to jboss50">
+ <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws/xfire to jboss50">
<macro-undeploy-native50/>
<macro-undeploy-sunri50/>
- <macro-deploy-xfire50
+ <macro-deploy-xfire500
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
@@ -30,20 +30,20 @@
<macro-deploy-spi
spilibs="${lib.dir}"
thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
+ jbosshome="${jboss500.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 name="undeploy-jboss500" depends="prepare" description="Remove jbossws/xfire from jboss50">
+ <macro-undeploy-xfire500/>
+ <macro-undeploy-spi jbosshome="${jboss500.home}"/>
</target>
<!-- Deploy jbossws/xfire to jboss42 -->
- <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/xfire to jboss42">
+ <target name="deploy-jboss422" depends="undeploy-jboss422" description="Deploy jbossws/xfire to jboss42">
<macro-undeploy-native42/>
<macro-undeploy-sunri42/>
- <macro-deploy-xfire42
+ <macro-deploy-xfire422
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
@@ -52,13 +52,13 @@
<macro-deploy-spi
spilibs="${lib.dir}"
thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
+ jbosshome="${jboss422.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 name="undeploy-jboss422" depends="prepare" description="Remove jbossws/xfire from jboss42">
+ <macro-undeploy-xfire422/>
+ <macro-undeploy-spi jbosshome="${jboss422.home}"/>
</target>
</project>
Deleted: stack/cxf/trunk/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-20 07:41:15 UTC (rev 4815)
@@ -1,59 +0,0 @@
-#
-# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun at jboss.com $
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-1746] Add support for configurable invoker in cxf.xml
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
-org/jboss/test/ws/jaxws/samples/swaref/**
-
-# [JBWS-1750] Investigate CXF exception handling
-org/jboss/test/ws/jaxws/samples/exception/**
-
-# [JBWS-1751] Investigate CXF samples handlerchain
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-
-# [JBWS-1752] Investigate CXF samples httpbinding
-org/jboss/test/ws/jaxws/samples/httpbinding/**
-
-# [JBWS-1683] Fix JAXR samples for XFire
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1753] Investigate CXF samples logicalhandler
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
-
-# [JBWS-1754] Investigate CXF samples oneway
-org/jboss/test/ws/jaxws/samples/oneway/**
-
-# [JBWS-1755] Investigate CXF samples provider
-org/jboss/test/ws/jaxws/samples/provider/**
-
-# [JBWS-1756] Fix @WebServiceRef with CXF
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/serviceref/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# [JBWS-1757] Investigate CXF samples soapbinding
-org/jboss/test/ws/jaxws/samples/soapbinding/**
-
-# [JBWS-1758] Investigate CXF samples webmethod
-org/jboss/test/ws/jaxws/samples/webmethod/**
-
-# [JBWS-1759] Investigate CXF samples webservice
-org/jboss/test/ws/jaxws/samples/webservice/**
-
-# [JBWS-1760] Investigate CXF samples xop
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
-org/jboss/test/ws/jaxws/smoke/tools/**
-
Copied: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt (from rev 4814, stack/cxf/trunk/src/test/resources/test-excludes-jboss42.txt)
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt (rev 0)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2007-10-20 07:41:15 UTC (rev 4815)
@@ -0,0 +1,59 @@
+#
+# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun at jboss.com $
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-1746] Add support for configurable invoker in cxf.xml
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/swaref/**
+
+# [JBWS-1750] Investigate CXF exception handling
+org/jboss/test/ws/jaxws/samples/exception/**
+
+# [JBWS-1751] Investigate CXF samples handlerchain
+org/jboss/test/ws/jaxws/samples/handlerchain/**
+
+# [JBWS-1752] Investigate CXF samples httpbinding
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+
+# [JBWS-1683] Fix JAXR samples for XFire
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1753] Investigate CXF samples logicalhandler
+org/jboss/test/ws/jaxws/samples/logicalhandler/**
+
+# [JBWS-1754] Investigate CXF samples oneway
+org/jboss/test/ws/jaxws/samples/oneway/**
+
+# [JBWS-1755] Investigate CXF samples provider
+org/jboss/test/ws/jaxws/samples/provider/**
+
+# [JBWS-1756] Fix @WebServiceRef with CXF
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/serviceref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# [JBWS-1757] Investigate CXF samples soapbinding
+org/jboss/test/ws/jaxws/samples/soapbinding/**
+
+# [JBWS-1758] Investigate CXF samples webmethod
+org/jboss/test/ws/jaxws/samples/webmethod/**
+
+# [JBWS-1759] Investigate CXF samples webservice
+org/jboss/test/ws/jaxws/samples/webservice/**
+
+# [JBWS-1760] Investigate CXF samples xop
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
+org/jboss/test/ws/jaxws/smoke/tools/**
+
Deleted: stack/cxf/trunk/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-20 07:41:15 UTC (rev 4815)
@@ -1,59 +0,0 @@
-#
-# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun at jboss.com $
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-1746] Add support for configurable invoker in cxf.xml
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
-org/jboss/test/ws/jaxws/samples/swaref/**
-
-# [JBWS-1750] Investigate CXF exception handling
-org/jboss/test/ws/jaxws/samples/exception/**
-
-# [JBWS-1751] Investigate CXF samples handlerchain
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-
-# [JBWS-1752] Investigate CXF samples httpbinding
-org/jboss/test/ws/jaxws/samples/httpbinding/**
-
-# [JBWS-1683] Fix JAXR samples for XFire
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1753] Investigate CXF samples logicalhandler
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
-
-# [JBWS-1754] Investigate CXF samples oneway
-org/jboss/test/ws/jaxws/samples/oneway/**
-
-# [JBWS-1755] Investigate CXF samples provider
-org/jboss/test/ws/jaxws/samples/provider/**
-
-# [JBWS-1756] Fix @WebServiceRef with CXF
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/serviceref/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# [JBWS-1757] Investigate CXF samples soapbinding
-org/jboss/test/ws/jaxws/samples/soapbinding/**
-
-# [JBWS-1758] Investigate CXF samples webmethod
-org/jboss/test/ws/jaxws/samples/webmethod/**
-
-# [JBWS-1759] Investigate CXF samples webservice
-org/jboss/test/ws/jaxws/samples/webservice/**
-
-# [JBWS-1760] Investigate CXF samples xop
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
-org/jboss/test/ws/jaxws/smoke/tools/**
-
Copied: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt (from rev 4814, stack/cxf/trunk/src/test/resources/test-excludes-jboss50.txt)
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt (rev 0)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-10-20 07:41:15 UTC (rev 4815)
@@ -0,0 +1,59 @@
+#
+# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun at jboss.com $
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-1746] Add support for configurable invoker in cxf.xml
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/swaref/**
+
+# [JBWS-1750] Investigate CXF exception handling
+org/jboss/test/ws/jaxws/samples/exception/**
+
+# [JBWS-1751] Investigate CXF samples handlerchain
+org/jboss/test/ws/jaxws/samples/handlerchain/**
+
+# [JBWS-1752] Investigate CXF samples httpbinding
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+
+# [JBWS-1683] Fix JAXR samples for XFire
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1753] Investigate CXF samples logicalhandler
+org/jboss/test/ws/jaxws/samples/logicalhandler/**
+
+# [JBWS-1754] Investigate CXF samples oneway
+org/jboss/test/ws/jaxws/samples/oneway/**
+
+# [JBWS-1755] Investigate CXF samples provider
+org/jboss/test/ws/jaxws/samples/provider/**
+
+# [JBWS-1756] Fix @WebServiceRef with CXF
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/serviceref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# [JBWS-1757] Investigate CXF samples soapbinding
+org/jboss/test/ws/jaxws/samples/soapbinding/**
+
+# [JBWS-1758] Investigate CXF samples webmethod
+org/jboss/test/ws/jaxws/samples/webmethod/**
+
+# [JBWS-1759] Investigate CXF samples webservice
+org/jboss/test/ws/jaxws/samples/webservice/**
+
+# [JBWS-1760] Investigate CXF samples xop
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
+org/jboss/test/ws/jaxws/smoke/tools/**
+
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2007-10-20 07:04:14 UTC (rev 4814)
+++ stack/cxf/trunk/version.properties 2007-10-20 07:41:15 UTC (rev 4815)
@@ -28,12 +28,13 @@
cxf.spring=2.0.6
cxf.xbean=2.2.0
cxf.xml.resolver=1.2
-cxf.xmlschema=1.2
+cxf.xmlschema=1.3.2
# Thirdparty library versions
-jbossws-framework=2.0.1.GA
-jbossws-common=1.0.0.GA
+jbossws-framework=snapshot
+jbossws-common=snapshot
jbossws-spi=1.0.0.GA
+jbossws-jboss42=2.0.1.GA
apache-xml-commons=1.2
ibm-wsdl4j=1.6.2
More information about the jbossws-commits
mailing list