[jboss-cvs] JBossAS SVN: r82676 - branches/Branch_4_2/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 7 13:53:09 EST 2009
Author: alessio.soldano at jboss.com
Date: 2009-01-07 13:53:09 -0500 (Wed, 07 Jan 2009)
New Revision: 82676
Modified:
branches/Branch_4_2/build/build-distr.xml
Log:
- Modifying webservice build in order not to use the jbossws macros
- [JBWS-2377] Do not include jbossws-deploy.conf in default AS
Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml 2009-01-07 18:31:28 UTC (rev 82675)
+++ branches/Branch_4_2/build/build-distr.xml 2009-01-07 18:53:09 UTC (rev 82676)
@@ -1282,31 +1282,145 @@
<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">
+ <available classname="java.io.Console" property="BUILT_ON_JDK6_AND_ABOVE"/>
+ <antcall target="install-jbossws-to-bin"/>
+ <antcall target="install-jbossws-to-client"/>
+ <antcall target="install-jbossws-to-endorsed"/>
+ <antcall target="install-jbossws-to-lib"/>
+ <antcall target="install-jbossws-to-server-lib"/>
+ <antcall target="install-jbossws-to-deploy"/>
+ </target>
+
+ <target name="install-jbossws-to-bin">
+ <!-- Install JBossWS batch scripts -->
+ <copy todir="${install.bin}" flatten="true" overwrite="true">
+ <fileset dir="${project.thirdparty}">
+ <include name="jboss/jbossws-framework/bin/wsconsume.bat"/>
+ <include name="jboss/jbossws-framework/bin/wsconsume.sh"/>
+ <include name="jboss/jbossws-framework/bin/wsprovide.bat"/>
+ <include name="jboss/jbossws-framework/bin/wsprovide.sh"/>
+ <include name="jboss/jbossws/bin/wsrunclient.bat"/>
+ <include name="jboss/jbossws/bin/wsrunclient.sh"/>
+ <include name="jboss/jbossws/bin/wstools.bat"/>
+ <include name="jboss/jbossws/bin/wstools.sh"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="install-jbossws-to-lib">
+ <!-- TODO: check if these are actually required -->
+ <copy todir="${install.lib}" flatten="true" overwrite="true">
+ <fileset dir="${project.thirdparty}">
+ <include name="sun-jaxb/lib/jaxb-api.jar"/>
+ <include name="sun-jaxb/lib/jaxb-impl.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="${jboss.jbossws.lib}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </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-jboss42.jar"/>
</fileset>
+ <fileset dir="${jboss.jbossws.lib}">
+ <include name="jbossws-client.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ <fileset dir="${project.thirdparty}">
+ <include name="sun-jaxws/lib/FastInfoset.jar"/>
+ <include name="jboss/jbossws-common/lib/jbossws-common.jar"/>
+ <include name="jboss/jbossws-framework/lib/jbossws-framework.jar"/>
+ <include name="jboss/jbossws-spi/lib/jbossws-spi.jar"/>
+ <include name="sun-jaxb/lib/jaxb-api.jar"/>
+ <include name="sun-jaxb/lib/jaxb-impl.jar"/>
+ <include name="sun-jaxb/lib/jaxb-xjc.jar"/>
+ <include name="sun-jaxws/lib/jaxws-tools.jar"/>
+ <include name="sun-jaxws/lib/jaxws-rt.jar"/>
+ <include name="sun-jaxws/lib/stax-ex.jar"/>
+ <include name="sun-jaxws/lib/streambuffer.jar"/>
+ <include name="ibm-wsdl4j/lib/wsdl4j.jar"/>
+ <include name="woodstox/lib/wstx.jar"/>
+ <include name="codehaus-jettison/lib/jettison.jar"/>
+ <include name="wscommons-policy/lib/policy.jar"/>
+ <include name="stax-api/lib/stax-api.jar"/>
+ </fileset>
</copy>
+ </target>
- <!-- Copy the generated libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
+ <target name="install-jbossws-to-server-lib">
+ <!-- Install JBossWS jars to server lib directory -->
+ <copy todir="${install.all.lib}" flatten="true" overwrite="true">
<fileset dir="${_module.output}/lib">
<include name="jbossws-jboss42.jar"/>
</fileset>
+ <fileset dir="${project.thirdparty}">
+ <include name="jboss/jbossws-common/lib/jbossws-common.jar"/>
+ <include name="jboss/jbossws-framework/lib/jbossws-framework.jar"/>
+ <include name="jboss/jbossws-spi/lib/jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossws.lib}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
</copy>
-
- <!-- Delegate to the jbossws deploy macros for stack specific deployments -->
- <ant antfile="${jboss.jbossws.resources}/jbossws-deploy-macros.xml" target="deploy-jbossws-native42" inheritall="false">
- <property name="resourcesdir" value="${_module.output}/resources/jbossws-jboss42.sar"/>
- <property name="thirdpartydir" value="${project.thirdparty}"/>
- <property name="installserver" value="${install.all}"/>
- </ant>
-
</target>
+ <target name="install-jbossws-to-deploy">
+ <!-- Install JBossWS web console to deploy directory -->
+ <mkdir dir="${install.all.deploy}/jbossws.sar"/>
+ <copy todir="${install.all.deploy}/jbossws.sar" flatten="true" overwrite="true">
+ <fileset dir="${project.thirdparty}">
+ <include name="sun-jaxws/lib/FastInfoset.jar"/>
+ <include name="jboss/jaxbintros/lib/jboss-jaxb-intros.jar"/>
+ <include name="jboss/jbossws/lib/jbossws-core.jar"/>
+ <include name="codehaus-jettison/lib/jettison.jar"/>
+ <include name="wscommons-policy/lib/policy.jar"/>
+ <include name="ibm-wsdl4j/lib/wsdl4j.jar"/>
+ <include name="apache-xmlsec/lib/xmlsec.jar"/>
+ <include name="sun-jaxb/lib/jaxb-api.jar"/>
+ <include name="sun-jaxb/lib/jaxb-impl.jar"/>
+ <include name="stax-api/lib/stax-api.jar"/>
+ <include name="woodstox/lib/wstx.jar"/>
+ </fileset>
+ </copy>
+ <unzip dest="${install.all.deploy}/jbossws.sar/jbossws-context.war" overwrite="true">
+ <fileset dir="${project.thirdparty}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="${install.all.deploy}/jbossws.sar/jbossws.beans/META-INF" flatten="true" overwrite="true">
+ <fileset dir="${project.thirdparty}">
+ <include name="**/jbossws-native42-beans.xml"/>
+ </fileset>
+ </copy>
+ <move file="${install.all.deploy}/jbossws.sar/jbossws.beans/META-INF/jbossws-native42-beans.xml" tofile="${install.all.deploy}/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <copy todir="${install.all.deploy}/jbossws.sar/META-INF" flatten="true" overwrite="true">
+ <fileset dir="${project.thirdparty}">
+ <include name="**/standard-jaxrpc-*-config.xml"/>
+ <include name="**/standard-jaxws-*-config.xml"/>
+ </fileset>
+ <fileset dir="${_module.output}/resources/jbossws-jboss42.sar/META-INF"/>
+ </copy>
+ </target>
+
<target name="_module-webservices-all" depends="_module-webservices-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
More information about the jboss-cvs-commits
mailing list