[jbossws-commits] JBossWS SVN: r3424 - in branches/tdiesler/trunk: build/ant-import and 7 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Jun 4 06:03:56 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-04 06:03:55 -0400 (Mon, 04 Jun 2007)
New Revision: 3424
Removed:
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/
branches/tdiesler/trunk/integration/sunri/
branches/tdiesler/trunk/integration/xfire/
Modified:
branches/tdiesler/trunk/build/ant-import/build-setup.xml
branches/tdiesler/trunk/build/build.xml
branches/tdiesler/trunk/build/hudson/hudson-home/config.xml
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Distro-ALL/config.xml
branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Integration-ALL/config.xml
branches/tdiesler/trunk/build/version.properties
branches/tdiesler/trunk/integration/native/ant-import/build-bin-dist.xml
branches/tdiesler/trunk/integration/native/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-build.xml
branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-deploy.xml
Log:
Remove sunri, xfire integration
Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -25,8 +25,6 @@
<property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/>
<property name="int.jboss40.dir" value="${basedir}/integration/jboss40"/>
<property name="int.native.dir" value="${basedir}/integration/native"/>
- <property name="int.sunri.dir" value="${basedir}/integration/sunri"/>
- <property name="int.xfire.dir" value="${basedir}/integration/xfire"/>
<!-- Check if ant.properties is available -->
<available property="ant.properties.available" file="${build.dir}/ant.properties"/>
@@ -78,4 +76,4 @@
</tstamp>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: branches/tdiesler/trunk/build/build.xml
===================================================================
--- branches/tdiesler/trunk/build/build.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/build/build.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -23,19 +23,19 @@
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
WS SPI: | jbossws-spi | | |
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS Stack Integration: | jbossws-native | | jbossws-sunri | | jbossws-xfire | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS Stack: | jbossws-core | | Sun JAXWS | | Codehaus XFire | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- +~+ +~+ +~+ +~+ +~+ +~+ +~~~~+
+ +~~~~~~~~~~~~~~~~~+ | |
+ WS Stack Integration: | jbossws-native | | |
+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ | |
+ WS Stack: | jbossws-core | | |
+ +~~~~~~~~~~~~~~~~~+ | |
+ WS-* Extensions: +~+ +~+ | |
+ | | | | | |
+ | | | | | |
+ | | | | | |
+ | | | | | |
+ | | | | | |
+ +~+ +~+ +~~~~+
JAXWS Testsuite
@@ -129,8 +129,6 @@
<ant antfile="${int.jboss40.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/>
</target>
<target name="clobber" depends="prepare" description="Cleans up all generated files.">
@@ -141,8 +139,6 @@
<ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.jboss40.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="clobber" inheritall="false"/>
- <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/>
</target>
<target name="main" description="Executes the default target (most)." depends="jars">
@@ -155,15 +151,11 @@
<target name="most" description="Builds almost everything." depends="prepare">
<ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="most" inheritall="false"/>
- <ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="most" inheritall="false"/>
</target>
<target name="all" description="Create a distribution zip file" depends="prepare">
<ant antfile="${core.dir}/build.xml" target="all" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="all" inheritall="false"/>
- <ant antfile="${int.sunri.dir}/build.xml" target="all" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="all" inheritall="false"/>
</target>
</project>
Modified: branches/tdiesler/trunk/build/hudson/hudson-home/config.xml
===================================================================
--- branches/tdiesler/trunk/build/hudson/hudson-home/config.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/build/hudson/hudson-home/config.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -75,10 +75,6 @@
<string>Distro-Native-AS-5.0</string>
<string>Distro-Native-AS-4.2</string>
<string>Distro-Native-AS-4.0</string>
- <string>Distro-SunRI-AS-5.0</string>
- <string>Distro-SunRI-AS-4.2</string>
- <string>Distro-XFire-AS-5.0</string>
- <string>Distro-XFire-AS-4.2</string>
</jobNames>
<name>Distribution Tests</name>
<description>
@@ -99,10 +95,6 @@
<string>Integration-Native-AS-5.0</string>
<string>Integration-Native-AS-4.2</string>
<string>Integration-Native-AS-4.0</string>
- <string>Integration-SunRI-AS-5.0</string>
- <string>Integration-SunRI-AS-4.2</string>
- <string>Integration-XFire-AS-5.0</string>
- <string>Integration-XFire-AS-4.2</string>
</jobNames>
<name>Integration Tests</name>
<description>
@@ -129,10 +121,9 @@
<p/>
<table border=1>
<tr align=center><th>Target</th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th> <th colspan=3>Integration Tests</th></tr>
-<tr align=center><th> </th> <th> </th> <th>Native</th><th>SunRI</th><th>XFire</th> <th>Native</th><th>SunRI</th><th>XFire</th></tr>
-<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
+<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>ok</td></tr>
</table>
]]>
</description>
@@ -156,4 +147,4 @@
</view>
</views>
-</hudson>
\ No newline at end of file
+</hudson>
Modified: branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Distro-ALL/config.xml
===================================================================
--- branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Distro-ALL/config.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Distro-ALL/config.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-Native-AS-4.0, Distro-SunRI-AS-5.0, Distro-SunRI-AS-4.2, Distro-XFire-AS-5.0, Distro-XFire-AS-4.2</childProjects>
+ <childProjects>Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-Native-AS-4.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
@@ -20,4 +20,4 @@
<properties/>
<description>Run all distribution tests</description>
<actions class="vector"/>
-</project>
\ No newline at end of file
+</project>
Modified: branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Integration-ALL/config.xml
===================================================================
--- branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Integration-ALL/config.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/build/hudson/hudson-home/jobs/Integration-ALL/config.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-Native-AS-4.0, Integration-SunRI-AS-5.0, Integration-SunRI-AS-4.2, Integration-XFire-AS-5.0, Integration-XFire-AS-4.2</childProjects>
+ <childProjects>Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-Native-AS-4.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
@@ -20,4 +20,4 @@
<properties/>
<description>Run all integration tests</description>
<actions class="vector"/>
-</project>
\ No newline at end of file
+</project>
Modified: branches/tdiesler/trunk/build/version.properties
===================================================================
--- branches/tdiesler/trunk/build/version.properties 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/build/version.properties 2007-06-04 10:03:55 UTC (rev 3424)
@@ -3,10 +3,10 @@
specification.title=JBossWS
specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-2.1
+specification.version=jbossws-2.0
-version.id=2.1.0.Beta1
-repository.id=2.1.0.Beta1
+version.id=2.0.0.GA
+repository.id=2.0.0.GA
implementation.title=JBoss Web Services - JBossWS
implementation.url=http://www.jboss.org/products/jbossws
Modified: branches/tdiesler/trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -53,15 +53,9 @@
<fileset dir="${int.native.dir}/ant-import">
<include name="macros-deploy-native.xml"/>
</fileset>
- <fileset dir="${int.sunri.dir}/ant-import">
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
<fileset dir="${spi.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
- <fileset dir="${int.xfire.dir}/ant-import">
- <include name="macros-deploy-xfire.xml"/>
- </fileset>
<fileset dir="${testsuite.dir}/ant-import">
<include name="build-jars-jaxws.xml"/>
</fileset>
Modified: branches/tdiesler/trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/ant-import/build-deploy.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/integration/native/ant-import/build-deploy.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -22,8 +22,6 @@
<!-- Deploy jbossws to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50">
- <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-native50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
@@ -46,8 +44,6 @@
<!-- Deploy jbossws to jboss42 -->
<target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to jboss42">
- <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
Modified: branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -64,8 +64,6 @@
<import file="${basedir}/build/build-testsuite.xml"/>
<import file="${basedir}/build/macros-deploy-spi.xml"/>
<import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-xfire.xml"/>
<!-- ================================================================== -->
<!-- Initialization -->
Modified: branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-04 09:38:07 UTC (rev 3423)
+++ branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-04 10:03:55 UTC (rev 3424)
@@ -19,8 +19,6 @@
<!-- Deploy jbossws/native to jboss50 -->
<target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/native to jboss50">
- <macro-undeploy-sunri50/>
- <macro-undeploy-xfire50/>
<macro-deploy-native50
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
@@ -43,8 +41,6 @@
<!-- Deploy jbossws/native to jboss42 -->
<target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/native to jboss42">
- <macro-undeploy-sunri42/>
- <macro-undeploy-xfire42/>
<macro-deploy-native42
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
More information about the jbossws-commits
mailing list