JBossWS SVN: r4818 - framework/branches.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-20 05:23:35 -0400 (Sat, 20 Oct 2007)
New Revision: 4818
Added:
framework/branches/jbossws-framework-2.0.2.GA/
Removed:
framework/branches/jbossws-framework-2.0.2/
Log:
Move to jbossws-framework-2.0.2.GA
Copied: framework/branches/jbossws-framework-2.0.2.GA (from rev 4817, framework/branches/jbossws-framework-2.0.2)
17 years, 2 months
JBossWS SVN: r4817 - framework/branches.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-20 05:18:57 -0400 (Sat, 20 Oct 2007)
New Revision: 4817
Added:
framework/branches/jbossws-framework-2.0.2/
Log:
Create branch jbossws-framework-2.0.1
Copied: framework/branches/jbossws-framework-2.0.2 (from rev 4816, framework/trunk)
17 years, 2 months
JBossWS SVN: r4816 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-20 05:14:34 -0400 (Sat, 20 Oct 2007)
New Revision: 4816
Added:
stack/native/branches/jbossws-native-2.0.2/
Log:
Create branch jbossws-native-2.0.2
Copied: stack/native/branches/jbossws-native-2.0.2 (from rev 4815, stack/native/trunk)
17 years, 2 months
JBossWS SVN: r4815 - in stack/cxf/trunk: ant-import and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)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(a)jboss.com $
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-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(a)jboss.com $
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-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(a)jboss.com $
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-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(a)jboss.com $
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-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
17 years, 2 months
JBossWS SVN: r4814 - in stack/metro/trunk: ant-import and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-20 03:04:14 -0400 (Sat, 20 Oct 2007)
New Revision: 4814
Added:
stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
Removed:
stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt
Modified:
stack/metro/trunk/ant-import/build-deploy.xml
stack/metro/trunk/ant-import/build-setup.xml
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/ant-import/macros-deploy-sunri.xml
stack/metro/trunk/ant.properties.example
stack/metro/trunk/build.xml
stack/metro/trunk/src/
stack/metro/trunk/src/main/distro/bin-dist-build.xml
stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
stack/metro/trunk/src/main/etc/bin-dist-build.xml
stack/metro/trunk/src/main/etc/bin-dist-deploy.xml
stack/metro/trunk/version.properties
Log:
Use explicit container deploy targets
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -21,37 +21,37 @@
<!-- ================================================================== -->
<!-- Deploy to jboss50 -->
- <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50">
- <macro-deploy-sunri50
+ <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50">
+ <macro-deploy-sunri500
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
<macro-deploy-framework
thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss50.home}"/>
+ jbosshome="${jboss500.home}"/>
</target>
<!-- Remove from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri50/>
- <macro-undeploy-framework jbosshome="${jboss50.home}"/>
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
<!-- Deploy to jboss42 -->
- <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42">
- <macro-deploy-sunri42
+ <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
+ <macro-deploy-sunri422
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
<macro-deploy-framework
thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss42.home}"/>
+ jbosshome="${jboss422.home}"/>
</target>
<!-- Remove from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri42/>
- <macro-undeploy-framework jbosshome="${jboss42.home}"/>
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri422/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
</project>
Modified: stack/metro/trunk/ant-import/build-setup.xml
===================================================================
--- stack/metro/trunk/ant-import/build-setup.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/ant-import/build-setup.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -24,37 +24,34 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
- <property name="jboss40.lib" value="${jboss40.home}/lib"/>
- <property name="jboss40.client" value="${jboss40.home}/client"/>
- <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
- <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
- <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
<property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
- <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
- <available property="jboss40.available" file="${jboss40.available.file}"/>
- <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <condition property="jbossws.integration.jboss42" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </condition>
+ <condition property="jbossws.integration.jboss50" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ </condition>
+
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
<!-- JDK Detection -->
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -103,7 +103,7 @@
<!-- The compile classpath for jboss50 integration -->
<path id="sunri50.integration.classpath">
<path refid="sunri.integration.classpath"/>
- <pathelement location="${jboss50.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss500.server.lib}/jboss.jar"/>
</path>
</target>
Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -14,17 +14,15 @@
<project>
<!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
+ <!-- Deployment JBoss422 -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-sunri50">
+ <macrodef name="macro-deploy-sunri422">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss50.home}/client" overwrite="true">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <copy todir="${jboss422.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jbossws-sunri-client.jar"/>
</fileset>
@@ -42,38 +40,24 @@
<include name="saaj-impl.jar"/>
</fileset>
</copy>
-
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss50.home}/lib" overwrite="true">
+ <copy todir="${jboss422.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
</copy>
-
- <!--SERVER JARS -->
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxws-api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="saaj-api.jar"/>
- </fileset>
- </copy>
-
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.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="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.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/sunri from jboss50 -->
- <macrodef name="macro-undeploy-sunri50">
+ <!-- Remove jbossws/sunri from jboss42 -->
+ <macrodef name="macro-undeploy-sunri422">
<sequential>
<delete>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss50.home}/client">
+ <fileset dir="${jboss422.home}/client">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -87,26 +71,24 @@
<include name="saaj-impl.jar"/>
<include name="jbossws-sunri-client.jar"/>
</fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <include name="jaxws-api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="saaj-api.jar"/>
- </fileset>
</delete>
-
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
- <macrodef name="macro-deploy-sunri42">
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri500">
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
<sequential>
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <copy todir="${jboss42.home}/client" overwrite="true">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss500.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<include name="jbossws-sunri-client.jar"/>
</fileset>
@@ -124,24 +106,38 @@
<include name="saaj-impl.jar"/>
</fileset>
</copy>
- <copy todir="${jboss42.home}/lib" overwrite="true">
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss500.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
</copy>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.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"/>
+
+ <!--SERVER JARS -->
+ <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.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>
- <!-- Remove jbossws/sunri from jboss42 -->
- <macrodef name="macro-undeploy-sunri42">
+ <!-- Remove jbossws/sunri from jboss500 -->
+ <macrodef name="macro-undeploy-sunri500">
<sequential>
<delete>
- <fileset dir="${jboss42.home}/client">
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss500.home}/client">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -155,9 +151,17 @@
<include name="saaj-impl.jar"/>
<include name="jbossws-sunri-client.jar"/>
</fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ </fileset>
</delete>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
Modified: stack/metro/trunk/ant.properties.example
===================================================================
--- stack/metro/trunk/ant.properties.example 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/ant.properties.example 2007-10-20 07:04:14 UTC (rev 4814)
@@ -7,12 +7,11 @@
#java.home.jdk16=/usr/java/jdk1.6
# Optional JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
-#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
-#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
+#jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
+#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
-# The JBoss server under test. This can be [jboss50|jboss42]
-jbossws.integration.target=jboss50
+# The JBoss server under test. This can be [jboss422|jboss500]
+jbossws.integration.target=jboss422
# The JBoss settings
jboss.server.instance=default
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/build.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -141,7 +141,7 @@
</zip>
</target>
- <target name="jars-jboss50" depends="jars-common" if="jboss50.home">
+ <target name="jars-jboss50" depends="jars-common" if="jboss500.home">
<!-- Concat jbossws-beans.xml -->
<concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml">
@@ -187,7 +187,7 @@
</jar>
</target>
- <target name="jars-jboss42" depends="jars-common" if="jboss42.home">
+ <target name="jars-jboss42" depends="jars-common" if="jboss422.home">
<unzip dest="${sunri.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
Property changes on: stack/metro/trunk/src
___________________________________________________________________
Name: svn:externals
- test-framework https://svn.jboss.org/repos/jbossws/framework/trunk/src/test
+ test-framework http://anonsvn.jboss.org/repos/jbossws/framework/trunk/src/test
Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -28,26 +28,26 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
<property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
<!-- JDK Detection -->
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
@@ -67,10 +67,10 @@
<target name="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
+ <condition property="jboss.home" value="${jboss500.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
</condition>
- <condition property="jboss.home" value="${jboss42.home}">
+ <condition property="jboss.home" value="${jboss422.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -24,18 +24,18 @@
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework
thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
+ jbosshome="${jboss500.home}"/>
</target>
<target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-deploy-endorsed
- jbosshome="${jboss50.home}"
+ jbosshome="${jboss500.home}"
thirdpartylibs="${lib.dir}"/>
</target>
<!-- Remove jbossws/sunri from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
<macro-undeploy-sunri50/>
- <macro-undeploy-framework jbosshome="${jboss50.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
<!-- Deploy jbossws/sunri to jboss42 -->
@@ -45,21 +45,21 @@
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework
thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
+ jbosshome="${jboss422.home}"/>
</target>
<target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-deploy-endorsed
- jbosshome="${jboss42.home}"
+ jbosshome="${jboss422.home}"
thirdpartylibs="${lib.dir}"/>
</target>
<!-- Remove jbossws/sunri from jboss42 -->
<target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/sunri from jboss42">
<macro-undeploy-sunri42/>
- <macro-undeploy-framework jbosshome="${jboss42.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
<target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-undeploy-endorsed jbosshome="${jboss42.home}"/>
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
</target>
</project>
Modified: stack/metro/trunk/src/main/etc/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/etc/bin-dist-build.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/src/main/etc/bin-dist-build.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -28,26 +28,26 @@
<property file="${basedir}/version.properties"/>
<property file="${build.dir}/version.properties"/>
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+ <property name="jboss500.lib" value="${jboss500.home}/lib"/>
+ <property name="jboss500.client" value="${jboss500.home}/client"/>
+ <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+ <property name="jboss422.lib" value="${jboss422.home}/lib"/>
+ <property name="jboss422.client" value="${jboss422.home}/client"/>
+ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
+ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
+ <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
<property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss422.available" file="${jboss422.available.file}"/>
<import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-testsuite.xml"/>
@@ -63,10 +63,10 @@
<target name="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
+ <condition property="jboss.home" value="${jboss500.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
</condition>
- <condition property="jboss.home" value="${jboss42.home}">
+ <condition property="jboss.home" value="${jboss422.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
Modified: stack/metro/trunk/src/main/etc/bin-dist-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2007-10-20 07:04:14 UTC (rev 4814)
@@ -30,13 +30,13 @@
<macro-deploy-spi
spilibs="${lib.dir}"
thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
+ jbosshome="${jboss500.home}"/>
</target>
<!-- Remove jbossws/sunri from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
<macro-undeploy-sunri50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-spi jbosshome="${jboss500.home}"/>
</target>
<!-- Deploy jbossws/sunri to jboss42 -->
@@ -52,13 +52,13 @@
<macro-deploy-spi
spilibs="${lib.dir}"
thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
+ jbosshome="${jboss422.home}"/>
</target>
<!-- Remove jbossws/sunri from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
<macro-undeploy-sunri42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-spi jbosshome="${jboss422.home}"/>
</target>
</project>
Deleted: stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-20 07:04:14 UTC (rev 4814)
@@ -1,19 +0,0 @@
-#
-# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-1673] Fix JAXR samples for SunRI
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1674] Fix @WebServiceRef with SunRI
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Copied: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt (from rev 4812, stack/metro/trunk/src/test/resources/test-excludes-jboss42.txt)
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt (rev 0)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2007-10-20 07:04:14 UTC (rev 4814)
@@ -0,0 +1,19 @@
+#
+# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-1673] Fix JAXR samples for SunRI
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1674] Fix @WebServiceRef with SunRI
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Deleted: stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-20 07:04:14 UTC (rev 4814)
@@ -1,18 +0,0 @@
-#
-# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
-#
-
-###################################################################
-# Exclude JBossWS-Native stuff
-#
-org/jboss/test/ws/jaxws/samples/wsaddressing/**
-org/jboss/test/ws/jaxws/samples/wseventing/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
-#
-###################################################################
-
-# [JBWS-1673] Fix JAXR samples for SunRI
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# [JBWS-1674] Fix @WebServiceRef with SunRI
-org/jboss/test/ws/jaxws/samples/retail/**
Copied: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt (from rev 4812, stack/metro/trunk/src/test/resources/test-excludes-jboss50.txt)
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt (rev 0)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2007-10-20 07:04:14 UTC (rev 4814)
@@ -0,0 +1,18 @@
+#
+# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
+#
+
+###################################################################
+# Exclude JBossWS-Native stuff
+#
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wseventing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+#
+###################################################################
+
+# [JBWS-1673] Fix JAXR samples for SunRI
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1674] Fix @WebServiceRef with SunRI
+org/jboss/test/ws/jaxws/samples/retail/**
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2007-10-20 06:53:19 UTC (rev 4813)
+++ stack/metro/trunk/version.properties 2007-10-20 07:04:14 UTC (rev 4814)
@@ -14,10 +14,9 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
-jbossws-framework=2.0.1.GA
-jbossws-common=1.0.0.GA
+jbossws-framework=snapshot
+jbossws-common=snapshot
jbossws-spi=1.0.0.GA
-jbossws-jboss50=2.0.1.GA
jbossws-jboss42=2.0.1.GA
jboss-common-core=2.0.2.GA
17 years, 2 months
JBossWS SVN: r4813 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-5.0.0 and 16 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-20 02:53:19 -0400 (Sat, 20 Oct 2007)
New Revision: 4813
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml
Log:
Fix undeploy targets for cxf, metro
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -37,14 +37,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -36,7 +36,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -36,7 +36,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -36,7 +36,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -36,7 +36,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -30,14 +30,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -40,14 +40,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -30,14 +30,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -34,7 +34,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -34,7 +34,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -34,7 +34,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -34,7 +34,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss42
+./build.sh $ENVIRONMENT undeploy-jboss422
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml 2007-10-19 21:26:39 UTC (rev 4812)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml 2007-10-20 06:53:19 UTC (rev 4813)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss50
+./build.sh $ENVIRONMENT undeploy-jboss500
#
# build and deploy
17 years, 2 months
JBossWS SVN: r4812 - in stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml: ws and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-19 17:26:39 -0400 (Fri, 19 Oct 2007)
New Revision: 4812
Modified:
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/ProtocolException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/WebServiceException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/ActionNotSupportedException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/AddressingException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/DestinationUnreachableException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/EndpointUnavailableException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/InvalidMapException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/MapRequiredException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/http/HTTPException.java
stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/soap/SOAPFaultException.java
Log:
Add serialVersionUID to Exceptions
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -48,6 +48,8 @@
*/
public class SOAPFaultException extends RuntimeException
{
+ private static final long serialVersionUID = 2231461982722876067L;
+
// provide logging
private static Logger log = Logger.getLogger(SOAPFaultException.class.getName());
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/ProtocolException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/ProtocolException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/ProtocolException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -32,6 +32,8 @@
**/
public class ProtocolException extends WebServiceException
{
+ private static final long serialVersionUID = 6688436881502883481L;
+
/**
* Constructs a new protocol exception with null as its detail message. The
* cause is not initialized, and may subsequently be initialized by a call
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/WebServiceException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/WebServiceException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/WebServiceException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -31,6 +31,7 @@
public class WebServiceException extends java.lang.RuntimeException
{
+ private static final long serialVersionUID = 9050257594613372011L;
/** Constructs a new exception with <code>null</code> as its
* detail message. The cause is not initialized.
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/ActionNotSupportedException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/ActionNotSupportedException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/ActionNotSupportedException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -27,6 +27,7 @@
public class ActionNotSupportedException extends AddressingException
{
+ private static final long serialVersionUID = -2281268200778671820L;
static
{
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/AddressingException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/AddressingException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/AddressingException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -28,6 +28,7 @@
public class AddressingException extends WebServiceException
{
+ private static final long serialVersionUID = -4470655951999027171L;
protected QName code;
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/DestinationUnreachableException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/DestinationUnreachableException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/DestinationUnreachableException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -27,6 +27,7 @@
public class DestinationUnreachableException extends AddressingException
{
+ private static final long serialVersionUID = 7420697131368408456L;
static
{
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/EndpointUnavailableException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/EndpointUnavailableException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/EndpointUnavailableException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -27,6 +27,7 @@
public class EndpointUnavailableException extends AddressingException
{
+ private static final long serialVersionUID = 4098776568071868541L;
static
{
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/InvalidMapException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/InvalidMapException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/InvalidMapException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -27,6 +27,7 @@
public class InvalidMapException extends AddressingException
{
+ private static final long serialVersionUID = 1760077070006214469L;
static
{
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/MapRequiredException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/MapRequiredException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/addressing/MapRequiredException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -27,6 +27,7 @@
public class MapRequiredException extends AddressingException
{
+ private static final long serialVersionUID = 7593796661805754938L;
static
{
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/http/HTTPException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/http/HTTPException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/http/HTTPException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -23,7 +23,6 @@
// $Id$
-
/** The <code>HTTPException</code> exception represents a
* XML/HTTP fault.
*
@@ -31,24 +30,28 @@
* in XML/HTTP messaging, only the HTTP status code is captured.
*
* @since JAX-WS 2.0
-**/
-public class HTTPException extends javax.xml.ws.ProtocolException {
-
- private int statusCode;
+ **/
+public class HTTPException extends javax.xml.ws.ProtocolException
+{
+ private static final long serialVersionUID = -7126704204037460302L;
+
+ private int statusCode;
- /** Constructor for the HTTPException
- * @param statusCode <code>int</code> for the HTTP status code
- **/
- public HTTPException(int statusCode) {
- super();
- this.statusCode = statusCode;
- }
+ /** Constructor for the HTTPException
+ * @param statusCode <code>int</code> for the HTTP status code
+ **/
+ public HTTPException(int statusCode)
+ {
+ super();
+ this.statusCode = statusCode;
+ }
- /** Gets the HTTP status code.
- *
- * @return HTTP status code
- **/
- public int getStatusCode() {
- return statusCode;
- }
+ /** Gets the HTTP status code.
+ *
+ * @return HTTP status code
+ **/
+ public int getStatusCode()
+ {
+ return statusCode;
+ }
}
Modified: stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/soap/SOAPFaultException.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/soap/SOAPFaultException.java 2007-10-19 20:55:14 UTC (rev 4811)
+++ stack/native/tags/jbossws-native-2.0.1.SP2/src/main/java/javax/xml/ws/soap/SOAPFaultException.java 2007-10-19 21:26:39 UTC (rev 4812)
@@ -50,7 +50,8 @@
**/
public class SOAPFaultException extends javax.xml.ws.ProtocolException
{
-
+ private static final long serialVersionUID = 3948617580148536298L;
+
private SOAPFault fault;
/** Constructor for SOAPFaultException
17 years, 2 months
JBossWS SVN: r4811 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-19 16:55:14 -0400 (Fri, 19 Oct 2007)
New Revision: 4811
Modified:
stack/native/trunk/build.xml
Log:
build all jars
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2007-10-19 20:41:01 UTC (rev 4810)
+++ stack/native/trunk/build.xml 2007-10-19 20:55:14 UTC (rev 4811)
@@ -262,7 +262,7 @@
</target>
- <target name="jars-jboss50" depends="jars-common" if="jboss500.home">
+ <target name="jars-jboss50" depends="jars-common">
<!-- Concat jbossws-beans.xml -->
<concat destfile="${core.output.lib.dir}/jbossws-native50/jbossws-beans.xml">
@@ -301,7 +301,7 @@
</target>
- <target name="jars-jboss42" depends="jars-common" if="jboss422.home">
+ <target name="jars-jboss42" depends="jars-common">
<unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
@@ -352,7 +352,7 @@
</jar>
</target>
- <target name="jars-jboss40" depends="jars-common" if="jboss405.home">
+ <target name="jars-jboss40" depends="jars-common">
<unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss40-resources.zip"/>
17 years, 2 months
JBossWS SVN: r4810 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-4.2.2 and 20 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-19 16:41:01 -0400 (Fri, 19 Oct 2007)
New Revision: 4810
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml
Log:
Fix undeploy targets for cxf, metro
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss421
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss421
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -103,14 +87,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.1/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss421
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss421
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -90,14 +74,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2.2-JDK6/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -37,14 +37,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0.0/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-4.2.2/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -36,7 +36,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-CXF-AS-5.0.0/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -36,7 +36,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-4.2.2/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -36,7 +36,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Metro-AS-5.0.0/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -36,7 +36,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.1/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
JBOSS421_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@
@@ -26,20 +24,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss421
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss421
-
-#
# Build distro
#
cd $STACKNATIVE
@@ -99,14 +83,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -30,14 +30,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2.2-JDK6/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -40,14 +40,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0.0/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -30,14 +30,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# Build distro
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-4.2.2/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -34,7 +34,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-CXF-AS-5.0.0/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -34,7 +34,7 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-4.2.2/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -34,7 +34,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Metro-AS-5.0.0/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -34,7 +34,7 @@
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.1/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -11,8 +11,6 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
STACKNATIVE=$WORKSPACE/stack-native
-STACKMETRO=$WORKSPACE/stack-metro
-STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@
ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE"
@@ -23,20 +21,6 @@
$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# undeploy stack-metro
-#
-cd $STACKMETRO
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss421
-
-#
-# undeploy stack-cxf
-#
-cd $STACKCXF
-cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss421
-
-#
# build and deploy
#
cd $STACKNATIVE
@@ -90,14 +74,6 @@
<remote>@hudson.native.url@</remote>
<local>stack-native</local>
</hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.cxf.url@</remote>
- <local>stack-cxf</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2.2/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss422
+./build.sh $ENVIRONMENT undeploy-jboss42
#
# build and deploy
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml 2007-10-19 15:31:40 UTC (rev 4809)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0.0/config.xml 2007-10-19 20:41:01 UTC (rev 4810)
@@ -27,14 +27,14 @@
#
cd $STACKMETRO
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# undeploy stack-cxf
#
cd $STACKCXF
cp ant.properties.example ant.properties
-./build.sh $ENVIRONMENT undeploy-jboss500
+./build.sh $ENVIRONMENT undeploy-jboss50
#
# build and deploy
17 years, 2 months
JBossWS SVN: r4809 - stack/native/trunk/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-10-19 11:31:40 -0400 (Fri, 19 Oct 2007)
New Revision: 4809
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt
Log:
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2007-10-19 15:28:50 UTC (rev 4808)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2007-10-19 15:31:40 UTC (rev 4809)
@@ -21,6 +21,7 @@
org/jboss/test/ws/jaxws/jbws1665/**
org/jboss/test/ws/jaxws/jbws1694/**
org/jboss/test/ws/jaxws/jbws1733/**
+org/jboss/test/ws/jaxws/jbws1762/**
org/jboss/test/ws/jaxws/jbws1799/**
org/jboss/test/ws/jaxws/jbws1809/**
org/jboss/test/ws/jaxws/jbws1813/**
@@ -61,5 +62,3 @@
# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
-org/jboss/test/ws/jaxws/jbws1762/**
17 years, 2 months