[jboss-cvs] JBossAS SVN: r70743 - trunk/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 11 11:37:16 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-03-11 11:37:16 -0400 (Tue, 11 Mar 2008)
New Revision: 70743
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
Log:
Delegate jbossws deployment to stack repository
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-03-11 15:36:32 UTC (rev 70742)
+++ trunk/build/build-distr.xml 2008-03-11 15:37:16 UTC (rev 70743)
@@ -1285,27 +1285,12 @@
<!-- Webservice -->
<!-- ========== -->
- <target name="_module-webservice-most" depends="module-webservice15">
+ <target name="_module-webservice-most">
<property name="_module.name" value="webservice" override="true"/>
<property name="_module.output" value="${project.root}/${_module.name}/output" override="true"/>
- <!-- copy common client stuff -->
- <mkdir dir="${install.client}"/>
-
- <copy todir="${install.all.lib}" filtering="no">
- </copy>
-
</target>
- <target name="module-webservice15" if="HAVE_JDK_1.5">
-
- <!-- copy the client stuff -->
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- </copy>
-
- </target>
-
<target name="_module-webservice-all" depends="_module-webservice-most">
</target>
@@ -1572,20 +1557,6 @@
<property name="_module.name" value="webservices" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
- <!-- Install jbossws tools shell scripts -->
- <copy todir="${install.bin}">
- <fileset dir="${jboss.jbossws.root}/bin">
- <include name="wstools.*"/>
- <include name="wsrunclient.*"/>
- </fileset>
- </copy>
- <unzip dest="${install.bin}" src="${jboss.jbossws.framework.lib}/jbossws-framework-scripts.zip">
- <patternset>
- <include name="wsprovide.*"/>
- <include name="wsconsume.*"/>
- </patternset>
- </unzip>
-
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1594,14 +1565,15 @@
</fileset>
</copy>
- <!-- Install jbossws.deployer -->
+ <!-- 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"/>
- <!-- Install jbossws.sar -->
- <mkdir dir="${install.all.deploy}/jbossws.sar/jbossws-context.war"/>
- <unjar dest="${install.all.deploy}/jbossws.sar" src="${_module.output}/lib/jbossws.sar"/>
- <unjar dest="${install.all.deploy}/jbossws.sar/jbossws-context.war" src="${jboss.jbossws.lib}/jbossws-context.war"/>
+ <!-- Delegate to the jbossws deploy macros for stack specific deployments -->
+ <ant antfile="${jboss.jbossws.resources}/jbossws-deploy-macros.xml" target="deploy-jbossws-native50" inheritall="false">
+ <property name="installserver" value="${install.all}"/>
+ <property name="thirdpartydir" value="${project.thirdparty}"/>
+ </ant>
</target>
@@ -1859,25 +1831,9 @@
<fileset dir="${jboss.jboss.security.spi.lib}">
<include name="jboss-security-spi.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.common.lib}">
- <include name="jbossws-common.jar"/>
- </fileset>
<fileset dir="${jboss.jnp.client.lib}">
<include name="jnp-client.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.framework.lib}">
- <include name="jbossws-framework.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossws.spi.lib}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossws.lib}">
- <include name="jbossws-client.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
<fileset dir="${jboss.jbossxb.lib}">
<include name="jboss-xml-binding.jar"/>
</fileset>
@@ -1948,9 +1904,6 @@
<include name="xalan.jar"/>
<include name="serializer.jar"/>
</fileset>
- <fileset dir="${sun.jaxb.lib}">
- <include name="jaxb-api.jar"/>
- </fileset>
</copy>
<!-- Copy thirdparty code to server/all/lib -->
@@ -1979,15 +1932,6 @@
<fileset dir="${jboss.jboss.javaee.lib}">
<include name="jboss-javaee.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.spi.lib}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <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>
<fileset dir="${jboss.jnpserver.lib}">
<include name="jnpserver.jar"/>
</fileset>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-03-11 15:36:32 UTC (rev 70742)
+++ trunk/build/build.xml 2008-03-11 15:37:16 UTC (rev 70743)
@@ -29,7 +29,6 @@
&buildmagic;
-
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
@@ -79,7 +78,7 @@
<!-- Sets up the module configuration. -->
<moduleconfig property="modules" selected="${groups}">
-
+
<!-- Modules -->
<module name="aspects"/>
<module name="bootstrap"/>
@@ -111,29 +110,30 @@
<module name="tomcat"/>
<module name="varia"/>
<module name="webservices"/>
-
+
<!-- Module groups -->
-
+
<!--this lets you recompile a single module using a command line like
-./build.sh -emacs -Dgroups=single -Dsingle-module=server
+ ./build.sh -emacs -Dgroups=single -Dsingle-module=server
-->
<group name="single">
<include modules="${single-module}"/>
</group>
-
+
<group name="core">
<include modules="main, bootstrap, j2se, mbeans, jmx, system, system-jmx"/>
</group>
-
+
<group name="basic">
<include modules="security,
server,
- deployment" />
-
+ deployment"/>
+
</group>
-
+
<group name="standard">
- <include modules="jbossas/remoting,
+ <include
+ modules="jbossas/remoting,
jmx-remoting,
jbossas/jmx-remoting,
messaging,
@@ -153,26 +153,26 @@
spring-int
"/>
</group>
-
+
<group name="optional">
- <include modules="embedded
+ <include modules="embedded
"/>
</group>
-
+
<!-- Module group sets -->
-
+
<group name="default">
<include groups="core, basic, standard"/>
</group>
-
+
<group name="most">
<include groups="core, basic, standard"/>
</group>
-
+
<group name="all">
<include groups="core, basic, standard, optional"/>
</group>
-
+
</moduleconfig>
<!-- Show the module configuration -->
@@ -678,11 +678,10 @@
<ant antfile="build-distr.xml" target="_module-spring-int-all"/>
</target>
- <target name="thirdparty">
+ <target name="thirdparty" depends="init">
<ant antfile="build-distr.xml" target="thirdparty"/>
</target>
-
<!-- ================================================================== -->
<!-- Install & Release -->
<!-- ================================================================== -->
More information about the jboss-cvs-commits
mailing list