[jboss-cvs] JBossAS SVN: r82438 - in branches/ropalka-jbossws305-jboss501: webservices/src/scripts and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 19 05:02:18 EST 2008
Author: richard.opalka at jboss.com
Date: 2008-12-19 05:02:18 -0500 (Fri, 19 Dec 2008)
New Revision: 82438
Modified:
branches/ropalka-jbossws305-jboss501/build/build-distr.xml
branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml
Log:
[JBAS-6195] fixed bin and endorsed directory (WIP)
Modified: branches/ropalka-jbossws305-jboss501/build/build-distr.xml
===================================================================
--- branches/ropalka-jbossws305-jboss501/build/build-distr.xml 2008-12-19 07:08:42 UTC (rev 82437)
+++ branches/ropalka-jbossws305-jboss501/build/build-distr.xml 2008-12-19 10:02:18 UTC (rev 82438)
@@ -1586,7 +1586,7 @@
<include name="jbossws-jboss50.jar"/>
</fileset>
</copy>
-
+
<!-- Install jbossws.deployer, which is stack agnostic but container dependent -->
<mkdir dir="${install.all.deployers}/jbossws.deployer"/>
<unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
@@ -1595,17 +1595,47 @@
<mkdir dir="${_module.output}/jbossws-native-resources"/>
<unzip dest="${_module.output}/jbossws-native-resources" src="${org.jboss.ws.native.lib}/jbossws-native-resources.jar"/>
- <!-- Delegate to the jbossws deploy macros for stack specific deployments -->
- <!--ant antfile="${_module.output}/jbossws-native-resources/resources/jbossws-deploy-macros.xml" target="deploy-jbossws-native50" inheritall="false"-->
+ <available classname="java.io.Console" property="BUILT_ON_JDK6_AND_ABOVE"/>
+ <antcall target="install-jbossws-to-bin"/>
+ <antcall target="install-jbossws-to-endorsed"/>
+
<ant antfile="${project.root}/${_module.name}/src/scripts/jbossws-deploy-macros.xml" target="deploy-jbossws-native50" inheritall="false">
<property name="installserver" value="${install.all}"/>
<property name="artifactsdir" value="${_module.output}/jbossws-native-resources"/>
<property name="thirdpartydir" value="${project.root}/thirdparty"/>
<property name="jbossid" value="jboss501"/>
</ant>
-
+
</target>
+ <target name="install-jbossws-to-bin">
+ <!-- Install JBossWS batch scripts -->
+ <copy todir="${install.bin}" flatten="true" overwrite="true">
+ <fileset dir="${_module.output}/jbossws-native-resources/bin">
+ <include name="wsconsume.bat"/>
+ <include name="wsconsume.sh"/>
+ <include name="wsprovide.bat"/>
+ <include name="wsprovide.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="install-jbossws-to-endorsed" if="BUILT_ON_JDK6_AND_ABOVE">
+ <!-- Endorse JBossWS jars on JDK1.6 and above -->
+ <copy todir="${install.lib}/endorsed" flatten="true" overwrite="true">
+ <fileset dir="${project.root}/thirdparty/org/jboss/ws/native/lib/">
+ <include name="jbossws-native-jaxrpc.jar"/>
+ <include name="jbossws-native-jaxws.jar"/>
+ <include name="jbossws-native-jaxws-ext.jar"/>
+ <include name="jbossws-native-saaj.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="_module-webservices-all" depends="_module-webservices-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
Modified: branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml
===================================================================
--- branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml 2008-12-19 07:08:42 UTC (rev 82437)
+++ branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml 2008-12-19 10:02:18 UTC (rev 82438)
@@ -1,32 +1,7 @@
<?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. -->
-<!-- -->
-<!-- ====================================================================== -->
-
<project>
- <!--
- These patterns should be common for all supported containers.
- All jars must also be declared in component-info.xml to ensure
- that the AS build uses the same version.
- -->
- <patternset id="jbossws.bin.patternset">
- <include name="**/wsconsume.bat"/>
- <include name="**/wsconsume.sh"/>
- <include name="**/wsprovide.bat"/>
- <include name="**/wsprovide.sh"/>
- <include name="**/wsrunclient.bat"/>
- <include name="**/wsrunclient.sh"/>
- <include name="**/wstools.bat"/>
- <include name="**/wstools.sh"/>
- </patternset>
-
<patternset id="jbossws.client.patternset">
<include name="**/sun-fi/lib/FastInfoset.jar"/>
<include name="**/sun-jaxb/lib/jaxb-api.jar"/>
@@ -52,18 +27,6 @@
<include name="**/wstx.jar"/>
</patternset>
- <patternset id="jbossws.lib.patternset">
- <include name="**/nothing-to-deploy"/>
- </patternset>
-
- <patternset id="jbossws.lib.endorsed.patternset">
- <include name="**/jbossws-native-jaxrpc.jar"/>
- <include name="**/jbossws-native-jaxws.jar"/>
- <include name="**/jbossws-native-jaxws-ext.jar"/>
- <include name="**/jbossws-native-saaj.jar"/>
- <include name="**/sun-jaxb/lib/jaxb-api.jar"/>
- </patternset>
-
<patternset id="jbossws.server.lib.patternset">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
@@ -85,39 +48,9 @@
</patternset>
<!-- ================================================================== -->
- <!-- Deploy Bin -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-bin">
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/bin">
- <patternset refid="jbossws.bin.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Deploy Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -125,7 +58,6 @@
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
<include name="**/sun-jaxb/lib/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
<include name="**/stax-api/lib/stax-api.jar"/>
@@ -136,41 +68,9 @@
</macrodef>
<!-- ================================================================== -->
- <!-- Deploy Lib Endorsed -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-endorsed">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- <include name="**/jbossws-@{jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-client50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -189,21 +89,6 @@
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- <include name="**/jbossws-@{jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-server-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -219,61 +104,9 @@
</macrodef>
<!-- ================================================================== -->
- <!-- Deploy JUDDI Service -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-juddi-sar">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}">
- <fileset dir="@{thirdpartydir}">
- <include name="**/juddi-service.sar"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-sar42">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="**/sun-jaxb/lib/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api/lib/stax-api.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native-management.war"/>
- </fileset>
- </unzip>
- <copy todir="@{targetdir}/jbossws.beans">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws-jboss42.sar/META-INF"/>
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-sar50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -328,102 +161,12 @@
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
- <!-- JDK Detection -->
- <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
-
- <target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
- <target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <target name="deploy-jbossws-native50">
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
<macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
- <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- </target>
-
- <target name="check-parameters">
- <fail message="artifactsdir must be specified" unless="artifactsdir"/>
- <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <fail message="installserver must be specified" unless="installserver"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Undeploy JBossWS -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-undeploy-jbossws42">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- delete stale container integration jars -->
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-jbossws50">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
</project>
More information about the jboss-cvs-commits
mailing list