[jboss-cvs] JBossAS SVN: r82442 - 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 09:55:20 EST 2008
Author: richard.opalka at jboss.com
Date: 2008-12-19 09:55:20 -0500 (Fri, 19 Dec 2008)
New Revision: 82442
Removed:
branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml
Modified:
branches/ropalka-jbossws305-jboss501/build/build-distr.xml
Log:
[JBAS-6195] final fix
Modified: branches/ropalka-jbossws305-jboss501/build/build-distr.xml
===================================================================
--- branches/ropalka-jbossws305-jboss501/build/build-distr.xml 2008-12-19 14:08:47 UTC (rev 82441)
+++ branches/ropalka-jbossws305-jboss501/build/build-distr.xml 2008-12-19 14:55:20 UTC (rev 82442)
@@ -1579,35 +1579,23 @@
<property name="_module.name" value="webservices" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated client libraries -->
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <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"/>
-
- <delete dir="${_module.output}/jbossws-native-resources"/> <!-- TODO: move to install-jbossws-to-bin ant target -->
- <mkdir dir="${_module.output}/jbossws-native-resources"/>
- <unzip dest="${_module.output}/jbossws-native-resources" src="${org.jboss.ws.native.lib}/jbossws-native-resources.jar"/>
-
<available classname="java.io.Console" property="BUILT_ON_JDK6_AND_ABOVE"/>
+ <antcall target="extract-jbossws-resources"/>
<antcall target="install-jbossws-to-bin"/>
+ <antcall target="install-jbossws-to-client"/>
<antcall target="install-jbossws-to-endorsed"/>
<antcall target="install-jbossws-to-common-lib"/>
<antcall target="install-jbossws-to-deploy"/>
+ <antcall target="install-jbossws-to-deployers"/>
+ </target>
- <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 name="extract-jbossws-resources">
+ <delete dir="${_module.output}/jbossws-native-resources"/>
+ <mkdir dir="${_module.output}/jbossws-native-resources"/>
+ <unzip
+ src="${org.jboss.ws.native.lib}/jbossws-native-resources.jar"
+ dest="${_module.output}/jbossws-native-resources"
+ />
</target>
<target name="install-jbossws-to-bin">
@@ -1626,10 +1614,44 @@
</copy>
</target>
+ <target name="install-jbossws-to-client">
+ <!-- Install JBossWS jars to client directory -->
+ <copy todir="${install.client}" flatten="true" overwrite="true">
+ <fileset dir="${_module.output}/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.ws.native.lib}">
+ <include name="jbossws-native-client.jar"/>
+ <include name="jbossws-native-core.jar"/>
+ <include name="jbossws-native-jaxrpc.jar"/>
+ <include name="jbossws-native-jaxws-ext.jar"/>
+ <include name="jbossws-native-jaxws.jar"/>
+ <include name="jbossws-native-saaj.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.ws.lib}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${sun.fi.lib}">
+ <include name="FastInfoset.jar"/>
+ </fileset>
+ <fileset dir="${org.codehaus.jettison.lib}">
+ <include name="jettison.jar"/>
+ </fileset>
+ <fileset dir="${sun.jaxb.lib}">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="${stax.api.lib}">
+ <include name="stax-api.jar"/>
+ </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/">
+ <fileset dir="${org.jboss.ws.native.lib}">
<include name="jbossws-native-jaxrpc.jar"/>
<include name="jbossws-native-jaxws.jar"/>
<include name="jbossws-native-jaxws-ext.jar"/>
@@ -1641,13 +1663,13 @@
<target name="install-jbossws-to-common-lib">
<!-- Install JBossWS jars to common/lib directory -->
<copy todir="${install.common.lib}" flatten="true" overwrite="true">
- <fileset dir="${project.root}/thirdparty/org/jboss/ws/native/lib/">
+ <fileset dir="${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>
- <fileset dir="${project.root}/thirdparty/org/jboss/ws/lib/">
+ <fileset dir="${org.jboss.ws.lib}">
<include name="jbossws-common.jar"/>
<include name="jbossws-framework.jar"/>
<include name="jbossws-spi.jar"/>
@@ -1659,10 +1681,56 @@
<!-- Install JBossWS web console to deploy directory -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
<unzip
- src="${project.root}/thirdparty/org/jboss/ws/native/lib/jbossws-native-management.war"
- dest="${install.all.deploy}/jbossws.sar/jbossws-management.war"/>
+ src="${org.jboss.ws.native.lib}/jbossws-native-management.war"
+ dest="${install.all.deploy}/jbossws.sar/jbossws-management.war"
+ />
</target>
+ <target name="install-jbossws-to-deployers">
+ <!-- Install JBossWS deployers, runtime jars and configs -->
+ <mkdir dir="${install.all.deployers}/jbossws.deployer"/>
+ <unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
+ <copy todir="${install.all.deployers}/jbossws.deployer" flatten="true" overwrite="true">
+ <fileset dir="${sun.fi.lib}">
+ <include name="FastInfoset.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jaxbintros.lib}">
+ <include name="jboss-jaxb-intros.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.ws.native.lib}">
+ <include name="jbossws-native-core.jar"/>
+ </fileset>
+ <fileset dir="${org.codehaus.jettison.lib}">
+ <include name="jettison.jar"/>
+ </fileset>
+ <fileset dir="${wscommons.policy.lib}">
+ <include name="policy.jar"/>
+ </fileset>
+ <fileset dir="${ibm.wsdl4j.lib}">
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ <fileset dir="${xml.security.lib}">
+ <include name="xmlsec.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.all.deployers}/jbossws.deployer">
+ <fileset dir="${_module.output}/jbossws-native-resources/resources/jbossws-jboss501/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.all.deployers}/jbossws.deployer/META-INF">
+ <fileset dir="${_module.output}/jbossws-native-resources/resources">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.all.deployers}/jbossws.deployer" flatten="true" overwrite="true">
+ <fileset dir="${org.jboss.ws.lib}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="_module-webservices-all" depends="_module-webservices-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
Deleted: 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 14:08:47 UTC (rev 82441)
+++ branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml 2008-12-19 14:55:20 UTC (rev 82442)
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project>
-
- <patternset id="jbossws.client.patternset">
- <include name="**/sun-fi/lib/FastInfoset.jar"/>
- <include name="**/sun-jaxb/lib/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/jaxb-xjc.jar"/>
- <include name="**/jaxws-tools.jar"/>
- <include name="**/jaxws-rt.jar"/>
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-native-client.jar"/>
- <include name="**/jbossws-native-core.jar"/>
- <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="**/jbossws-spi.jar"/>
- <include name="**/jettison.jar"/>
- <include name="**/policy.jar"/>
- <include name="**/stax-api/lib/stax-api.jar"/>
- <include name="**/stax-ex.jar"/>
- <include name="**/streambuffer.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/wstx.jar"/>
- </patternset>
-
- <patternset id="jbossws.service.lib.patternset">
- <include name="**/sun-fi/lib/FastInfoset.jar"/>
- <include name="**/jboss-jaxb-intros.jar"/>
- <include name="**/jbossws-native-core.jar"/>
- <include name="**/jettison.jar"/>
- <include name="**/policy.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/xmlsec.jar"/>
- </patternset>
-
- <!-- ================================================================== -->
- <!-- Deploy Client -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-client50">
- <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"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deployers -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployers50">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy JBossWS -->
- <!-- ================================================================== -->
-
- <target name="deploy-jbossws-native50">
- <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- </target>
-
-</project>
More information about the jboss-cvs-commits
mailing list