Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 10:36:18 -0400 (Tue, 11 Mar 2008)
New Revision: 5917
Added:
stack/native/trunk/ant-import/jbossws-default-deploy.conf
Removed:
stack/native/trunk/ant-import/jbossws.default.undeploy.files
Modified:
stack/native/trunk/ant-import/build-deploy42.xml
stack/native/trunk/ant-import/build-deploy50.xml
stack/native/trunk/ant-import/build-release.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
stack/native/trunk/src/main/etc/component-info.xml
Log:
Use jbossws-deploy.conf
Modified: stack/native/trunk/ant-import/build-deploy42.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -15,7 +15,7 @@
<import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.undeploy.files"
value="${core.dir}/ant-import/jbossws.default.undeploy.files"/>
+ <property name="jbossws.default.undeploy.files"
value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
<!-- ================================================================== -->
<!-- Deployment JBoss421 -->
@@ -24,7 +24,7 @@
<target name="deploy-jboss421"
depends="undeploy-jboss421,prepare-deploy42" description="Deploy jbossws to
jboss421">
<fail message="Not available: ${jboss421.available.file}"
unless="jboss421.available"/>
<copy todir="${jboss421.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}"
excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}"
excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss421.home}/bin" perm="+x"
includes="*.sh"/>
@@ -53,7 +53,7 @@
<target name="deploy-jboss422"
depends="undeploy-jboss422,prepare-deploy42" description="Deploy jbossws to
jboss422">
<fail message="Not available: ${jboss422.available.file}"
unless="jboss422.available"/>
<copy todir="${jboss422.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}"
excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}"
excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss422.home}/bin" perm="+x"
includes="*.sh"/>
</target>
@@ -70,7 +70,7 @@
<target name="deploy-jboss423"
depends="undeploy-jboss423,prepare-deploy42" description="Deploy jbossws to
jboss423">
<fail message="Not available: ${jboss423.available.file}"
unless="jboss423.available"/>
<copy todir="${jboss423.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}"
excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}"
excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss423.home}/bin" perm="+x"
includes="*.sh"/>
</target>
@@ -122,12 +122,12 @@
<param name="thirdpartylibs"
value="${core.output.deploy.dir}-src"/>
</antcall>
- <!-- Create jbossws.deployed.files -->
- <fileset id="jbossws.deploy.fileset"
dir="${core.output.deploy.dir}"
excludes="**/jbossws.deployed.files,**/jbossws.sar/**"/>
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset"
dir="${core.output.deploy.dir}"
excludes="**/jbossws-deploy.conf,**/jbossws.sar/**"/>
<property name="jbossws.deploy.fileset"
refid="jbossws.deploy.fileset"/>
<property name="jbossws.sar.dir"
value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws.deployed.files"
message="${jbossws.deploy.fileset}
server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws.deployed.files"
token=";" value=" "/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf"
message="${jbossws.deploy.fileset}
server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf"
token=";" value=" "/>
</target>
</project>
Modified: stack/native/trunk/ant-import/build-deploy50.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -15,7 +15,7 @@
<import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.undeploy.files"
value="${core.dir}/ant-import/jbossws.default.undeploy.files"/>
+ <property name="jbossws.default.undeploy.files"
value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
<!-- ================================================================== -->
<!-- Deployment JBoss500 -->
@@ -24,7 +24,7 @@
<target name="deploy-jboss500"
depends="undeploy-jboss500,prepare-deploy50" description="Deploy jbossws to
jboss500">
<fail message="Not available: ${jboss500.available.file}"
unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}"
excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}"
excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss500.home}/bin" perm="+x"
includes="*.sh"/>
</target>
@@ -41,7 +41,7 @@
<target name="deploy-jboss501"
depends="undeploy-jboss501,prepare-deploy50" description="Deploy jbossws to
jboss501">
<fail message="Not available: ${jboss501.available.file}"
unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}"
excludes="jbossws.deployed.files"/>
+ <fileset dir="${core.output.deploy.dir}"
excludes="jbossws-deploy.conf"/>
</copy>
<chmod dir="${jboss501.home}/bin" perm="+x"
includes="*.sh"/>
</target>
@@ -93,12 +93,12 @@
<param name="thirdpartylibs"
value="${core.output.deploy.dir}-src"/>
</antcall>
- <!-- Create jbossws.deployed.files -->
- <fileset id="jbossws.deploy.fileset"
dir="${core.output.deploy.dir}"
excludes="**/jbossws.deployed.files,**/jbossws.sar/**"/>
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset"
dir="${core.output.deploy.dir}"
excludes="**/jbossws-deploy.conf,**/jbossws.sar/**"/>
<property name="jbossws.deploy.fileset"
refid="jbossws.deploy.fileset"/>
<property name="jbossws.sar.dir"
value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws.deployed.files"
message="${jbossws.deploy.fileset}
server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws.deployed.files"
token=";" value=" "/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf"
message="${jbossws.deploy.fileset}
server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf"
token=";" value=" "/>
</target>
</project>
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/ant-import/build-release.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -50,6 +50,9 @@
<include name="wstools.bat"/>
<include name="wstools.sh"/>
</fileset>
+ <fileset
dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar">
+ <include name="jbossws-deploy.conf"/>
+ </fileset>
</copy>
<copy todir="${jboss.repository.dir}/jbossws/${repository.id}/lib"
overwrite="true">
<fileset dir="${core.output.lib.dir}">
@@ -74,9 +77,6 @@
<fileset dir="${basedir}/ant-import">
<include name="jbossws-deploy-macros.xml"/>
</fileset>
- <fileset
dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar">
- <include name="jbossws.deployed.files"/>
- </fileset>
</copy>
<copy
tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml"
file="${core.output.etc.dir}/component-info.xml" filtering="true"
overwrite="true">
<filterset>
Copied: stack/native/trunk/ant-import/jbossws-default-deploy.conf (from rev 5915,
stack/native/trunk/ant-import/jbossws.default.undeploy.files)
===================================================================
--- stack/native/trunk/ant-import/jbossws-default-deploy.conf (rev
0)
+++ stack/native/trunk/ant-import/jbossws-default-deploy.conf 2008-03-11 14:36:18 UTC (rev
5917)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar
client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar
client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar
client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar
client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar
client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar
server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar
server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar
server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar
server/default/deploy/jbossws.sar
\ No newline at end of file
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 14:21:23 UTC (rev
5916)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 14:36:18 UTC (rev
5917)
@@ -176,6 +176,7 @@
<copy todir="@{targetdir}" flatten="true"
overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
</fileset>
</copy>
<unzip dest="(a){targetdir}/jbossws-context.war"
overwrite="true">
@@ -205,6 +206,7 @@
<copy todir="@{targetdir}" flatten="true"
overwrite="true">
<fileset dir="@{thirdpartylibs}">
<patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
</fileset>
</copy>
<unzip dest="(a){targetdir}/jbossws-context.war"
overwrite="true">
@@ -256,7 +258,7 @@
<macrodef name="macro-undeploy-jbossws">
<attribute name="targetdir"/>
<sequential>
- <loadfile property="jbossws.undeploy.files"
srcfile="(a){targetdir}/jbossws.deployed.files"
failonerror="false"/>
+ <loadfile property="jbossws.undeploy.files"
srcfile="(a){targetdir}/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.undeploy.files"
srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
<delete>
<fileset dir="@{targetdir}/../../../.."
includes="${jbossws.undeploy.files}"/>
Deleted: stack/native/trunk/ant-import/jbossws.default.undeploy.files
===================================================================
--- stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:21:23 UTC
(rev 5916)
+++ stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:36:18 UTC
(rev 5917)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar
client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar
client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar
client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar
client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar
client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar
server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar
server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar
server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar
server/default/deploy/jbossws.sar
\ No newline at end of file
Modified: stack/native/trunk/src/main/etc/component-info.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info.xml 2008-03-11 14:21:23 UTC (rev 5916)
+++ stack/native/trunk/src/main/etc/component-info.xml 2008-03-11 14:36:18 UTC (rev 5917)
@@ -17,8 +17,10 @@
<artifact id="standard-jaxrpc-endpoint-config.xml"/>
<artifact id="standard-jaxws-client-config.xml"/>
<artifact id="standard-jaxws-endpoint-config.xml"/>
+ <artifact id="jbossws-native42-beans.xml"/>
<artifact id="jbossws-native50-beans.xml"/>
<artifact id="jbossws-deploy-macros.xml"/>
+ <artifact id="jbossws-deploy.conf"/>
<artifact id="wsrunclient.bat"/>
<artifact id="wsrunclient.sh"/>
<artifact id="wstools.bat"/>