[jbossws-commits] JBossWS SVN: r3409 - in trunk: build/ant-import and 14 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sun Jun 3 14:25:10 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-03 14:25:10 -0400 (Sun, 03 Jun 2007)
New Revision: 3409
Added:
trunk/integration/native/src/main/etc/bin-dist-deploy.xml
trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml
trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml
trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml
trunk/jbossws-core/src/main/etc/default.mf
Modified:
trunk/build/ant-import/build-setup.xml
trunk/build/ant.properties.example
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/native/build.xml
trunk/integration/native/src/main/etc/bin-dist-build.xml
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/sunri/src/main/etc/bin-dist-build.xml
trunk/integration/xfire/ant-import/build-bin-dist.xml
trunk/integration/xfire/src/main/etc/bin-dist-build.xml
trunk/jbossws-core/build.xml
Log:
Add support for no-ejb3
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/build/ant-import/build-setup.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -41,21 +41,18 @@
<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="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/>
<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="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/>
<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="jboss40.thirdparty" value="${jboss40.home}/../../../thirdparty"/>
<property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
@@ -67,6 +64,8 @@
<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="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
<!-- ================================================================== -->
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/build/ant.properties.example 2007-06-03 18:25:10 UTC (rev 3409)
@@ -37,7 +37,7 @@
hudson.jboss42.rev=HEAD
hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
-hudson.jboss40.build=jboss-4.0.5.SP1-ejb3
+hudson.jboss40.build=jboss-4.0.5.SP1
hudson.jboss40.rev=HEAD
hudson.mail.recipients=thomas.diesler at jboss.com, heiko.braun at jboss.com
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build at -ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -13,7 +13,7 @@
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
-JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build at -ejb3
JBOSS_INSTANCE=$JBOSS40_INSTANCE
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -11,7 +11,7 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build at -ejb3
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
Modified: trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -39,6 +39,7 @@
</filterset>
</copy>
<copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${native.etc.dir}/bin-dist-deploy.xml"/>
<copy todir="${bindist.dir}" file="${native.dir}/version.properties"/>
<!-- build -->
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -69,7 +69,9 @@
</target>
<!-- Deploy jbossws to jboss40 -->
- <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40" description="Deploy jbossws to jboss40">
+ <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-no-ejb3" description="Deploy jbossws to jboss40"/>
+
+ <target name="deploy-jboss40-ejb3">
<macro-deploy-native40
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss40.dir}/output/lib"
@@ -83,7 +85,17 @@
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss40.home}"/>
</target>
-
+
+ <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available">
+ <macro-setup-native40-no-ejb3/>
+ <echo>
+ ***********************************
+ * JBossWS EJB3 support disabled *
+ * All EJB3 tests will fail. *
+ ***********************************
+ </echo>
+ </target>
+
<!-- Remove jbossws from jboss40 -->
<target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40">
<macro-undeploy-native40/>
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -96,7 +96,7 @@
<include name="jbossws-jboss50.jar"/>
<include name="policy.jar"/>
<include name="wsdl4j.jar"/>
- <!-- remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
@@ -186,13 +186,13 @@
<include name="jbossws-jboss42.jar"/>
<include name="policy.jar"/>
<include name="wsdl4j.jar"/>
- <!-- remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
<!-- SERVER JARS -->
<fileset dir="${jboss42.home}/lib">
- <!-- remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-integration.jar"/>
</fileset>
<fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
@@ -259,6 +259,22 @@
<unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
+
+ <macrodef name="macro-setup-native40-no-ejb3">
+ <sequential>
+
+ <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
+ <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+
+ <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
+ file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
+
+ </sequential>
+ </macrodef>
<macrodef name="macro-undeploy-native40">
<sequential>
@@ -280,13 +296,14 @@
<include name="policy.jar"/>
<include name="stax-api.jar"/>
<include name="wsdl4j.jar"/>
- <!-- remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
+ <include name="jbossws14-client.jar"/>
</fileset>
<!-- SERVER JARS -->
<fileset dir="${jboss40.home}/lib">
- <!-- remove only, do not deploy -->
+ <!-- Remove only, do not deploy -->
<include name="jbossws-integration.jar"/>
</fileset>
<fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
@@ -299,6 +316,8 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<!-- Undeploy juddi-service.sar -->
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <!-- Remove only, do not deploy -->
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
</sequential>
</macrodef>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/native/build.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -114,9 +114,7 @@
<include name="index.html"/>
<include name="styles.css"/>
</fileset>
- <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
+ <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"/>
</war>
<!-- Build jbossws-native-src.zip -->
@@ -137,9 +135,7 @@
<include name="index.html"/>
<include name="styles.css"/>
</fileset>
- <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
+ <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"/>
</war>
<!-- Build jbossws-native50.sar -->
@@ -161,9 +157,7 @@
<metainf dir="${core.dir}/src/main/resources/standard-config">
<include name="standard-*-config.xml"/>
</metainf>
- <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF">
- <include name="jbossws-beans.xml"/>
- </metainf>
+ <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF"/>
</jar>
<!-- Build jbossws-native50.deployer -->
@@ -207,10 +201,7 @@
<metainf dir="${core.dir}/src/main/resources/standard-config">
<include name="standard-*-config.xml"/>
</metainf>
- <metainf dir="${native.resources.dir}/jbossws-native42.sar/META-INF">
- <include name="jboss-service.xml"/>
- <include name="jboss-beans.xml"/>
- </metainf>
+ <metainf dir="${native.resources.dir}/jbossws-native42.sar/META-INF"/>
</jar>
</target>
@@ -244,10 +235,7 @@
<metainf dir="${core.dir}/src/main/resources/standard-config">
<include name="standard-*-config.xml"/>
</metainf>
- <metainf dir="${native.resources.dir}/jbossws-native40.sar/META-INF">
- <include name="jboss-service.xml"/>
- <include name="jboss-beans.xml"/>
- </metainf>
+ <metainf dir="${native.resources.dir}/jbossws-native40.sar/META-INF"/>
</jar>
</target>
Modified: trunk/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -11,7 +11,7 @@
<!-- $Id$ -->
-<project default="main" basedir="." name="JBossWS/XFire">
+<project default="main" basedir="." name="JBossWS-Native">
<!-- ================================================================== -->
<!-- Setup -->
@@ -57,7 +57,10 @@
<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"/>
+ <import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-testsuite.xml"/>
<import file="${basedir}/build/macros-deploy-spi.xml"/>
<import file="${basedir}/build/macros-deploy-native.xml"/>
@@ -127,80 +130,6 @@
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
<!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50">
- <macro-undeploy-sunri50/>
- <macro-undeploy-xfire50/>
- <macro-deploy-native50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Deploy jbossws/native to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42">
- <macro-undeploy-sunri42/>
- <macro-undeploy-xfire42/>
- <macro-deploy-native42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Deploy jbossws/native to jboss40 -->
- <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws/native to jboss40">
- <macro-deploy-native40
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- corelibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss40.home}"/>
- </target>
-
- <!-- Remove jbossws/native from jboss40 -->
- <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
- <macro-undeploy-native40/>
- <macro-undeploy-spi jbosshome="${jboss40.home}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Added: trunk/integration/native/src/main/etc/bin-dist-deploy.xml
===================================================================
--- trunk/integration/native/src/main/etc/bin-dist-deploy.xml (rev 0)
+++ trunk/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- 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}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss42 -->
+ <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/native to jboss42">
+ <macro-undeploy-sunri42/>
+ <macro-undeploy-xfire42/>
+ <macro-deploy-native42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Remove jbossws/native from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/native to jboss40 -->
+ <target name="deploy-jboss40" depends="deploy-jboss40-no-ejb3" description="Deploy jbossws/native to jboss40"/>
+
+ <target name="deploy-jboss40-ejb3" depends="undeploy-jboss40">
+ <macro-deploy-native40
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ corelibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss40.home}"/>
+ </target>
+
+ <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available">
+ <macro-setup-native40-no-ejb3/>
+ <echo>
+ ***********************************
+ * JBossWS EJB3 support disabled *
+ * All EJB3 tests will fail. *
+ ***********************************
+ </echo>
+ </target>
+
+ <!-- Remove jbossws/native from jboss40 -->
+ <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
+ <macro-undeploy-native40/>
+ <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ </target>
+
+</project>
Property changes on: trunk/integration/native/src/main/etc/bin-dist-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml (rev 0)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<server>
+
+ <!--
+ Bind JAXRPC ServiceRefs
+ -->
+ <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.wsf.container.jboss40.WebServiceClientDeployer">
+ <depends>jboss:service=Naming</depends>
+ </mbean>
+
+ <!--
+ A deployer service for JSE endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.web:service=WebServer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB2.1 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+</server>
Property changes on: trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml (rev 0)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.jbws.ManagedEndpointRegistry"/>
+
+ <!-- A subscription manager for WS-Eventing -->
+ <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+ <property name="bindAddress">${jboss.bind.address}</property>
+ </bean>
+
+ <!-- Bind Service objects in client environment context -->
+ <!-- The bean name is compiled into the server. Changeit with the next release. -->
+ <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!--
+ *********************************************************************************************************************
+ Web Service deployment
+
+ There are three deployer interceptors registered with the JBoss Deployers.
+
+ 1) DeployerInterceptorJSE
+ 2) DeployerInterceptorEJB21
+ 3) DeployerInterceptorEJB3
+
+ Each interceptor has a number of DeployerHooks registerd with it
+
+ Conceptually, each of these hooks implements the following pattern:
+
+ DployerHook.deploy(unit)
+ if(isWebServiceDeployment)
+ Deployment dep = createDeployment(unit)
+ DeployerManager.deploy(dep)
+
+ DeployerHook.undeploy(unit)
+ Deployment dep = getDeployment(unit)
+ DeployerManager.undeploy(dep)
+
+ Each deployer hook has a web service DeployerManager injected into it.
+ A web service DeployerManager maintains a list of Deployers, each of which
+ handles a single aspect of web service deployment.
+
+ Finally, each Endpoint is registered with the EndpointRegistry.
+
+ *********************************************************************************************************************
+ -->
+
+ <!--
+ Each DeploymentManger maintains a list of Deployers
+ Each Deployer handles a single aspect of web service deployment.
+ -->
+ <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSUnifiedDeploymentInfoDeployer"/>
+ <inject bean="WSContextRootDeployer"/>
+ <inject bean="WSURLPatternDeployer"/>
+ <inject bean="WSUnifiedMetaDataDeployer"/>
+ <inject bean="WSUnifiedMetaDataAssociationDeployer"/>
+ <inject bean="WSModifyWebMetaDataDeployer"/>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSUnifiedDeploymentInfoDeployer"/>
+ <inject bean="WSContextRootDeployer"/>
+ <inject bean="WSURLPatternDeployer"/>
+ <inject bean="WSUnifiedMetaDataDeployer"/>
+ <inject bean="WSUnifiedMetaDataAssociationDeployer"/>
+ <inject bean="WSWebAppGeneratorDeployer"/>
+ <inject bean="WSWebAppDeployerDeployer"/>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager">
+ <property name="deployers">
+ <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer">
+ <inject bean="WSEndpointNameDeployer"/>
+ <inject bean="WSEndpointHandlerDeployer"/>
+ <inject bean="WSPublishContractDeployer"/>
+ <inject bean="WSClassLoaderInjectionDeployer"/>
+ <inject bean="WSServiceEndpointInvokerDeployer"/>
+ <inject bean="WSEagerInitializeDeployer"/>
+ <inject bean="WSEventingDeployer"/>
+ <inject bean="WSEndpointRegistryDeployer"/>
+ <inject bean="WSEndpointLifecycleDeployer"/>
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ The Deployers
+ Each handles a single aspect of web service deployment
+ -->
+ <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeployer"/>
+ <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
+ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
+ <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
+ <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
+ <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
+ <property name="invocationHandler">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
+ <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry>
+ <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
+ </map>
+ </property>
+ </bean>
+ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
+ <bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
+ <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+ <bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/>
+ <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer">
+ <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property>
+ </bean>
+ <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
+ <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
+ <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
+ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
+ </bean>
+ <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss42.WebAppDeployerDeployer">
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+
+ <!-- Deployer helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
+ <bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/>
+ <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
+ <property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property>
+ </bean>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
+ <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
+ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
+ </bean>
+
+ <!--
+ Register DeployerHooks with JBoss deployers
+ -->
+ <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE">
+ <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
+ <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE">
+ <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
+ <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
+ <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook">
+ <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ </list>
+ </property>
+ </bean>
+
+</deployment>
Property changes on: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -42,6 +42,7 @@
</filterset>
</copy>
<copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.etc.dir}/bin-dist-deploy.xml"/>
<copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>
<!-- build -->
Modified: trunk/integration/sunri/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -11,7 +11,7 @@
<!-- $Id$ -->
-<project default="main" basedir="." name="JBossWS/SunRI">
+<project default="main" basedir="." name="JBossWS-SunRI">
<!-- ================================================================== -->
<!-- Setup -->
@@ -49,6 +49,7 @@
<available property="jboss50.available" file="${jboss50.available.file}"/>
<available property="jboss42.available" file="${jboss42.available.file}"/>
+ <import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-testsuite.xml"/>
<import file="${basedir}/build/macros-deploy-spi.xml"/>
<import file="${basedir}/build/macros-deploy-native.xml"/>
@@ -124,56 +125,6 @@
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
<!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/sunri to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-xfire50/>
- <macro-deploy-sunri50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Remove jbossws/sunri from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Deploy jbossws/sunri to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-xfire42/>
- <macro-deploy-sunri42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Remove jbossws/sunri from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Added: trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml (rev 0)
+++ trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/sunri to jboss50 -->
+ <target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/sunri to jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-xfire50/>
+ <macro-deploy-sunri50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${build.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/sunri to jboss42 -->
+ <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/sunri to jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-xfire42/>
+ <macro-deploy-sunri42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${build.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Remove jbossws/sunri from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+
+</project>
Property changes on: trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -44,6 +44,7 @@
</filterset>
</copy>
<copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${xfire.etc.dir}/bin-dist-deploy.xml"/>
<copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
<!-- build -->
Modified: trunk/integration/xfire/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -11,7 +11,7 @@
<!-- $Id$ -->
-<project default="main" basedir="." name="JBossWS/XFire">
+<project default="main" basedir="." name="JBossWS-XFire">
<!-- ================================================================== -->
<!-- Setup -->
@@ -50,6 +50,7 @@
<available property="jboss50.available" file="${jboss50.available.file}"/>
<available property="jboss42.available" file="${jboss42.available.file}"/>
+ <import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-testsuite.xml"/>
<import file="${basedir}/build/macros-deploy-spi.xml"/>
<import file="${basedir}/build/macros-deploy-native.xml"/>
@@ -143,56 +144,6 @@
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
<!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/xfire to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-sunri50/>
- <macro-deploy-xfire50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Remove jbossws/xfire from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
- <macro-undeploy-xfire50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
- </target>
-
- <!-- Deploy jbossws/xfire to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-sunri42/>
- <macro-deploy-xfire42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
-
- <macro-deploy-spi
- spilibs="${lib.dir}"
- spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"
- jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- Remove jbossws/xfire from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
- <macro-undeploy-xfire42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Added: trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml (rev 0)
+++ trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/xfire to jboss50 -->
+ <target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/xfire to jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-sunri50/>
+ <macro-deploy-xfire50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Remove jbossws/xfire from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
+ <macro-undeploy-xfire50/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ </target>
+
+ <!-- Deploy jbossws/xfire to jboss42 -->
+ <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/xfire to jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-sunri42/>
+ <macro-deploy-xfire42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
+ </target>
+
+ <!-- Remove jbossws/xfire from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
+ <macro-undeploy-xfire42/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ </target>
+
+</project>
Property changes on: trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-06-03 16:15:04 UTC (rev 3408)
+++ trunk/jbossws-core/build.xml 2007-06-03 18:25:10 UTC (rev 3409)
@@ -82,14 +82,11 @@
<mkdir dir="${core.output.etc.dir}"/>
<copy todir="${core.output.etc.dir}" filtering="yes">
<fileset dir="${core.etc.dir}"/>
- <fileset dir="${build.dir}/etc">
- <include name="default.mf"/>
- </fileset>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
<filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
+ <filter token="implementation.version" value="jbossws-native-${version.id}"/>
<filtersfile file="${build.dir}/version.properties"/>
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
Added: trunk/jbossws-core/src/main/etc/default.mf
===================================================================
--- trunk/jbossws-core/src/main/etc/default.mf (rev 0)
+++ trunk/jbossws-core/src/main/etc/default.mf 2007-06-03 18:25:10 UTC (rev 3409)
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@ (build=@build.id@)
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
+Class-Path: jbossws-spi.jar jboss-jaxrpc.jar jboss-jaxws.jar
+ jboss-saaj.jar
\ No newline at end of file
More information about the jbossws-commits
mailing list