[jboss-cvs] JBossAS SVN: r89218 - in trunk: component-matrix and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 20 17:56:29 EDT 2009
Author: pgier
Date: 2009-05-20 17:56:29 -0400 (Wed, 20 May 2009)
New Revision: 89218
Modified:
trunk/build/build.xml
trunk/build/pom.xml
trunk/component-matrix/pom.xml
trunk/thirdparty/pom.xml
trunk/tools/maven/ant-tasks/maven-ant-tasks-2.0.10-SNAPSHOT.jar
Log:
[JBBUILD-519] [JBBUILD-528] Merge build.xml with build-distr.xml. Remove dependencies on libraries.ent and buildmagic.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-05-20 21:34:32 UTC (rev 89217)
+++ trunk/build/build.xml 2009-05-20 21:56:29 UTC (rev 89218)
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
-]>
<!-- ====================================================================== -->
<!-- -->
@@ -14,31 +11,27 @@
<!-- $Id$ -->
-<project default="main" name="JBoss Distribution Build">
+<project default="main" name="JBoss Distribution Build" xmlns:maven="antlib:org.apache.maven.artifact.ant">
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
- <!--
- | Include the common Buildmagic elements.
- |
- | This defines several different targets, properties and paths.
- | It also sets up the basic extention tasks amoung other things.
- -->
-
- &buildmagic;
-
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
- <!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
+ <target name="init">
+
+ <!-- ================================================================== -->
+ <!-- Init the maven ant tasks -->
+ <!-- ================================================================== -->
- <target name="init" unless="init.disable" depends="_buildmagic:init">
+ <path id="maven-ant-tasks.classpath" path="../tools/maven/ant-tasks/maven-ant-tasks-2.0.10-SNAPSHOT.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
</target>
@@ -46,179 +39,39 @@
<!-- Configuration -->
<!-- ================================================================== -->
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
+ <target name="configure" depends="init">
- <target name="configure" unless="configure.disable">
-
<!-- =================== -->
<!-- Basic Configuration -->
<!-- =================== -->
- <!-- Module name(s) & version -->
- <property name="module.name" value="jboss"/>
- <property name="module.Name" value="JBoss Build"/>
- <property name="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <dirname property="project.root" file="${basedir}"/>
+ <property name="project.build" value="${project.root}/build"/>
+ <property name="project.tools" value="${project.root}/tools"/>
+ <property name="project.thirdparty" value="${project.root}/thirdparty"/>
+
+ <!-- Setup the build timestamp & build identifer properties -->
+ <tstamp>
+ <format property="build.number" pattern="yyyyMMddHHmm"/>
+ <format property="YEAR" pattern="yyyy"/>
+ </tstamp>
+ <property name="build.id" value="${build.number}"/>
- <!-- The combined library classpath -->
- <path id="library.classpath">
- </path>
+ <!-- Version identifiers for the server. -->
+ <property file="${project.tools}/etc/buildmagic/version.properties"/>
- <!-- ============== -->
- <!-- Modules/Groups -->
- <!-- ============== -->
+
+ <!-- Module name(s) & version -->
+ <property name="dist.module.name" value="jboss"/>
+ <property name="dist.module.Name" value="JBoss Build"/>
+ <property name="dist.module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="dist.module.output" value="${basedir}/output"/>
- <!-- The group to use by default -->
- <property name="groups" value="default"/>
-
-
- <!-- Sets up the module configuration. -->
- <moduleconfig property="modules" selected="${groups}">
-
- <!-- Modules -->
- <module name="aspects" externalBuild="true"/>
- <module name="cluster" externalBuild="true"/>
- <module name="connector" externalBuild="true"/>
- <module name="console" externalBuild="true"/>
- <module name="deployment" externalBuild="true"/>
- <module name="ejb3" externalBuild="true"/>
- <module name="embedded"/>
- <module name="hibernate-int" externalBuild="true"/>
- <module name="iiop" externalBuild="true"/>
- <module name="main" externalBuild="true"/>
- <module name="management" externalBuild="true"/>
- <module name="messaging" externalBuild="true"/>
- <module name="jbossas-remoting" externalBuild="true"/>
- <module name="jmx-remoting" externalBuild="true"/>
- <module name="jbossas-jmx-remoting" externalBuild="true"/>
- <module name="profileservice" externalBuild="true"/>
- <module name="security" externalBuild="true"/>
- <module name="server" externalBuild="true"/>
- <module name="spring-int" externalBuild="true"/>
- <module name="system" externalBuild="true"/>
- <module name="system-jmx" externalBuild="true"/>
- <module name="testsuite"/>
- <module name="tomcat" externalBuild="true"/>
- <module name="varia" externalBuild="true"/>
- <module name="webservices" externalBuild="true"/>
-
- <!-- Module groups -->
-
- <!--this lets you recompile a single module using a command line like
-./build.sh -emacs -Dgroups=single -Dsingle-module=server
- -->
- <group name="single">
- <include modules="${single-module}"/>
- </group>
-
- <group name="core">
- <include modules="main, system, system-jmx"/>
- </group>
-
- <group name="basic">
- <include modules="security,
- server,
- deployment" />
-
- </group>
-
- <group name="standard">
- <include modules="jbossas-remoting,
- jmx-remoting,
- jbossas-jmx-remoting,
- messaging,
- cluster,
- varia,
- iiop,
- aspects,
- profileservice,
- connector,
- management,
- ejb3,
- tomcat,
- webservices,
- hibernate-int,
- console,
- spring-int
- "/>
- </group>
-
- <group name="optional">
- <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 -->
- <echo>groups: ${groups}</echo>
- <echo>modules: ${modules}</echo>
-
- <!-- The combined dependent module classpath -->
- <path id="dependentmodule.classpath">
- </path>
-
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
-
- <!-- Skip any missing modules and issue a warning -->
- <property name="executemodules.skipmissing" value="true"/>
-
- <!-- The header and footer displayed during each module execution -->
- <property name="executemodules.header"><![CDATA[
- ======================================================================
- == Executing '${target}' in module '${module}'...
- ==]]></property>
-
- <property name="executemodules.footer"><![CDATA[
- ==
- == Finished with '${target}' in module '${module}'.
- ======================================================================
- ]]></property>
-
- <property name="executemodules.exportproperties">
- version.major,
- version.minor,
- version.revision,
- version.tag,
- version.name,
- version.cvstag,
-
- specification.title,
- specification.version,
- specification.vendor,
-
- implementation.title,
- implementation.version,
- implementation.vendor,
- implementation.vendor.id,
- implementation.url
- </property>
-
<!-- Install/Release structure -->
- <property name="install.id" value="${module.name}-${module.version}"/>
+ <property name="install.id" value="${dist.module.name}-${dist.module.version}"/>
<property name="release.id" value="${install.id}"/>
- <property name="install.root" value="${module.output}/${install.id}"/>
+ <property name="install.root" value="${dist.module.output}/${install.id}"/>
<property name="install.docs" value="${install.root}/docs"/>
<property name="install.api" value="${install.docs}/api"/>
@@ -270,17 +123,18 @@
<property name="install.standard.deploy" value="${install.standard}/deploy"/>
<property name="install.standard.deployers" value="${install.standard}/deployers"/>
<property name="install.standard.conf" value="${install.standard}/conf"/>
-
+
<!-- libs shared by the server configurations -->
<property name="install.common" value="${install.root}/common"/>
<property name="install.common.lib" value="${install.common}/lib"/>
-
+
<!-- Configuration for the nightly build and test job -->
- <property name="run.nightly.sleep" value="1"/> <!-- 1 minute -->
+ <property name="run.nightly.sleep" value="1"/>
+ <!-- 1 minute -->
<property name="run.nightly.email.tolist" value="jboss-development at lists.sourceforge.net"/>
<property name="run.nightly.email.from" value="noreply at jboss.org"/>
<property name="run.nightly.email.mailhost" value="localhost"/>
- <property name="run.home.dir" value="${module.output}/${release.id}" />
+ <property name="run.home.dir" value="${dist.module.output}/${release.id}" />
<property name="run.bin.dir" value="${run.home.dir}/bin" />
<!-- Bits for building source archives -->
@@ -297,350 +151,43 @@
<include name="tools/**"/>
<include name="thirdparty/**"/>
</patternset>
-</target>
-
- <!-- ================================================================== -->
- <!-- Module Pass-through Targets -->
- <!-- ================================================================== -->
-
- <!--
- | These targets will execute all configured modules with the specified
- | target.
- -->
-
- <target name="modules-all" depends="_buildmagic:modules:all">
- <antcall target="thirdparty"/>
</target>
- <target name="modules-most" depends="_buildmagic:modules:most">
- <antcall target="thirdparty"/>
- </target>
- <target name="modules-main" depends="_buildmagic:modules:main"/>
- <target name="modules-release" depends="_buildmagic:modules:release"/>
- <target name="modules-tests" depends="_buildmagic:modules:tests"/>
- <target name="modules-clean" depends="_buildmagic:modules:clean"/>
- <target name="modules-clobber" depends="_buildmagic:modules:clobber"/>
- <target name="modules-docs" depends="_buildmagic:modules:docs"/>
<!-- ================================================================== -->
- <!-- Module Pass-through Hooks -->
+ <!-- Install & Release -->
<!-- ================================================================== -->
- <!--
- | These hooks are executed after the above pass-through targets have
- | finished with a given module.
- -->
-
- <!-- ======== -->
- <!-- Remoting -->
- <!-- ======== -->
-
- <target name="_module-jbossas-remoting-most">
- <ant antfile="build-distr.xml" target="_module-jbossas-remoting-most"/>
+ <target name="install-modules" description="Install each app server module to the distribution"
+ depends="init-thirdparty-dependencies,
+ module-main,
+ module-system,
+ module-system-jmx,
+ module-security,
+ module-server,
+ module-deployment,
+ module-jbossas-remoting,
+ module-jmx-remoting,
+ module-jbossas-jmx-remoting,
+ module-messaging,
+ module-cluster,
+ module-varia,
+ module-iiop,
+ module-aspects,
+ module-profileservice,
+ module-connector,
+ module-management,
+ module-ejb3,
+ module-tomcat,
+ module-webservices,
+ module-hibernate-int,
+ module-console,
+ module-spring-int">
</target>
-
- <target name="_module-remoting-all" depends="_module-jbossas-remoting-most">
- <ant antfile="build-distr.xml" target="_module-jbossas-remoting-all"/>
+
+ <target name="install" depends="partition-build"
+ description="Install the structure for a release.">
</target>
- <!-- ============ -->
- <!-- JMX Remoting -->
- <!-- ============ -->
-
- <target name="_module-jmx-remoting-most">
- <ant antfile="build-distr.xml" target="_module-jmx-remoting-most"/>
- </target>
-
- <target name="_module-jmx-remoting-all" depends="_module-jmx-remoting-most">
- <ant antfile="build-distr.xml" target="_module-jmx-remoting-all"/>
- </target>
-
- <target name="_module-jbossas-jmx-remoting-all" depends="_module-jbossas-jmx-remoting-most">
- <ant antfile="build-distr.xml" target="_module-jbossas-jmx-remoting-all"/>
- </target>
-
- <target name="_module-jbossas-jmx-remoting-most">
- <ant antfile="build-distr.xml" target="_module-jbossas-jmx-remoting-most"/>
- </target>
-
- <!-- ======== -->
- <!-- EJB 3.0 -->
- <!-- ======== -->
-
- <target name="_module-ejb3-most">
- <ant antfile="build-distr.xml" target="_module-ejb3-most"/>
- </target>
-
- <target name="_module-ejb3-all" depends="_module-ejb3-most">
- <ant antfile="build-distr.xml" target="_module-ejb3-all"/>
- </target>
-
- <!-- ======== -->
- <!-- EJB3X -->
- <!-- ======== -->
-
-<!--
- <target name="_module-ejb3x-most">
- <ant antfile="build-distr.xml" target="_module-ejb3x-most"/>
- </target>
--->
-
- <!-- ======== -->
- <!-- ASPECTS -->
- <!-- ======== -->
-
- <target name="_module-aspects-most">
- <ant antfile="build-distr.xml" target="_module-aspects-most"/>
- </target>
-
- <target name="_module-aspects-all" depends="_module-aspects-most">
- <ant antfile="build-distr.xml" target="_module-aspects-all"/>
- </target>
-
- <!-- ==== -->
- <!-- J2EE -->
- <!-- ==== -->
-
-<!--
- <target name="_module-j2ee-most">
- <ant antfile="build-distr.xml" target="_module-j2ee-most"/>
- </target>
-
- <target name="_module-j2ee-all" depends="_module-j2ee-most">
- <ant antfile="build-distr.xml" target="_module-j2ee-all"/>
- </target>
--->
-
- <!-- ==== -->
- <!-- Main -->
- <!-- ==== -->
-
- <target name="_module-main-most">
- <ant antfile="build-distr.xml" target="_module-main-most"/>
- </target>
-
- <target name="_module-main-all" depends="_module-main-most">
- <ant antfile="build-distr.xml" target="_module-main-all"/>
- </target>
-
- <!-- ====== -->
- <!-- System -->
- <!-- ====== -->
-
- <target name="_module-system-most">
- <ant antfile="build-distr.xml" target="_module-system-most"/>
- </target>
-
- <target name="_module-system-all" depends="_module-system-most">
- <ant antfile="build-distr.xml" target="_module-system-all"/>
- </target>
- <target name="_module-system-jmx-most">
- <ant antfile="build-distr.xml" target="_module-system-jmx-most"/>
- </target>
-
- <target name="_module-system-jmx-all" depends="_module-system-jmx-most">
- <ant antfile="build-distr.xml" target="_module-system-jmx-all"/>
- </target>
-
- <!-- ====== -->
- <!-- Server -->
- <!-- ====== -->
-
- <target name="_module-server-most">
- <ant antfile="build-distr.xml" target="_module-server-most"/>
- </target>
-
- <target name="_module-server-all" depends="_module-server-most">
- <ant antfile="build-distr.xml" target="_module-server-all"/>
- </target>
-
- <!-- ========= -->
- <!-- Connector -->
- <!-- ========= -->
-
- <target name="_module-connector-most">
- <ant antfile="build-distr.xml" target="_module-connector-most"/>
- </target>
-
- <target name="_module-connector-all" depends="_module-connector-most">
- <ant antfile="build-distr.xml" target="_module-connector-all"/>
- </target>
-
- <!-- ========= -->
- <!-- Messaging -->
- <!-- ========= -->
-
- <target name="_module-messaging-most">
- <ant antfile="build-distr.xml" target="_module-messaging-most"/>
- </target>
-
- <target name="_module-messaging-all" depends="_module-messaging-most">
- <ant antfile="build-distr.xml" target="_module-messaging-all"/>
- </target>
-
-
- <!-- ======== -->
- <!-- Security -->
- <!-- ======== -->
-
- <target name="_module-security-most">
- <ant antfile="build-distr.xml" target="_module-security-most"/>
- </target>
-
- <target name="_module-security-all" depends="_module-security-most">
- <ant antfile="build-distr.xml" target="_module-security-all"/>
- </target>
-
- <!-- ======= -->
- <!-- Cluster -->
- <!-- ======= -->
-
- <target name="_module-cluster-most">
- <ant antfile="build-distr.xml" target="_module-cluster-most"/>
- </target>
-
- <target name="_module-cluster-all" depends="_module-cluster-most">
- <ant antfile="build-distr.xml" target="_module-cluster-all"/>
- </target>
-
- <!-- ===== -->
- <!-- Varia -->
- <!-- ===== -->
-
- <target name="_module-varia-most">
- <ant antfile="build-distr.xml" target="_module-varia-most"/>
- </target>
-
- <target name="_module-varia-all" depends="_module-varia-most">
- <ant antfile="build-distr.xml" target="_module-varia-all"/>
- </target>
-
- <!-- ===== -->
- <!-- Tomcat5.5.x -->
- <!-- ===== -->
-
- <target name="_module-tomcat-most">
- <ant antfile="build-distr.xml" target="_module-tomcat-most"/>
- </target>
-
- <target name="_module-tomcat-all" depends="_module-tomcat-most">
- <ant antfile="build-distr.xml" target="_module-tomcat-all"/>
- </target>
-
-
- <!-- ==== -->
- <!-- IIOP -->
- <!-- ==== -->
-
- <target name="_module-iiop-most">
- <ant antfile="build-distr.xml" target="_module-iiop-most"/>
- </target>
-
- <target name="_module-iiop-all" depends="_module-iiop-most">
- <ant antfile="build-distr.xml" target="_module-iiop-all"/>
- </target>
-
- <!-- ========== -->
- <!-- Management -->
- <!-- ========== -->
-
- <target name="_module-management-most">
- <ant antfile="build-distr.xml" target="_module-management-most"/>
- </target>
-
- <target name="_module-management-all" depends="_module-management-most">
- <ant antfile="build-distr.xml" target="_module-management-all"/>
- </target>
-
- <!-- ======= -->
- <!-- Console -->
- <!-- ======= -->
-
- <target name="_module-console-most">
- <ant antfile="build-distr.xml" target="_module-console-most"/>
- </target>
-
- <target name="_module-console-all" depends="_module-console-most">
- <ant antfile="build-distr.xml" target="_module-console-all"/>
- </target>
-
-
-
-
-
- <!-- ========== -->
- <!-- Deployment -->
- <!-- ========== -->
-
- <target name="_module-deployment-most">
- <ant antfile="build-distr.xml" target="_module-deployment-most"/>
- </target>
-
- <target name="_module-deployment-all" depends="_module-deployment-most">
- <ant antfile="build-distr.xml" target="_module-deployment-all"/>
- </target>
-
- <!-- =========== -->
- <!-- Webservices -->
- <!-- =========== -->
-
- <target name="_module-webservices-most">
- <ant antfile="build-distr.xml" target="_module-webservices-most"/>
- </target>
-
- <target name="_module-webservices-all" depends="_module-webservices-most">
- <ant antfile="build-distr.xml" target="_module-webservices-all"/>
- </target>
-
- <!-- ============ -->
- <!-- Hibernate -->
- <!-- ============ -->
-
- <target name="_module-hibernate-int-most">
- <ant antfile="build-distr.xml" target="_module-hibernate-int-most"/>
- </target>
-
- <target name="_module-hibernate-int-all" depends="_module-hibernate-int-most">
- <ant antfile="build-distr.xml" target="_module-hibernate-int-all"/>
- </target>
-
- <!-- ============ -->
- <!-- ProfileService -->
- <!-- ============ -->
-
- <target name="_module-profileservice-most">
- <ant antfile="build-distr.xml" target="_module-profileservice-most"/>
- </target>
-
- <target name="_module-profileservice-all">
- <ant antfile="build-distr.xml" target="_module-profileservice-most"/>
- </target>
-
- <!-- ============ -->
- <!-- Spring -->
- <!-- ============ -->
-
- <target name="_module-spring-int-most">
- <ant antfile="build-distr.xml" target="_module-spring-int-most"/>
- </target>
-
- <target name="_module-spring-int-all" depends="_module-spring-int-most">
- <ant antfile="build-distr.xml" target="_module-spring-int-all"/>
- </target>
-
- <target name="thirdparty">
- <ant antfile="build-distr.xml" target="thirdparty"/>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Install & Release -->
- <!-- ================================================================== -->
-
- <target name="install"
- description="Install the structure for a release."
- depends="partition-build"
- />
-
<!-- Partition the default single configuration build into a minimal,
default and all configs with a minimal set of jars in the root lib dir.
-->
@@ -660,7 +207,7 @@
<exclude name="jcip-annotations.jar"/>
</fileset>
</move>
-
+
<!-- Copy server/all to server/default and then remove the services
outside of the scope of the default config
-->
@@ -681,19 +228,19 @@
<exclude name="deploy/snmp-adaptor.sar/**"/>
<exclude name="deploy/juddi-service.sar/**"/>
<exclude name="deploy/messaging/**"/>
- <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
+ <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- <!-- leave the empty default/lib directory there -->
+ <!-- leave the empty default/lib directory there -->
<mkdir dir="${install.default.lib}"/>
-
+
<copy todir="${install.default.conf}" overwrite="true">
<fileset dir="${project.root}/server/target/etc/conf/default"/>
</copy>
-
+
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
file="${project.root}/cluster/target/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
-
+
<unjar src="${project.root}/varia/target/http-invoker.sar"
dest="${install.default}/deploy/http-invoker.sar"/>
@@ -712,7 +259,7 @@
<include name="xmdesc/NamingBean-xmbean.xml"/>
<include name="xmdesc/NamingService-xmbean.xml"/>
<include name="xmdesc/NamingProviderURLWriter-xmbean.xml"/>
- <include name="xmdesc/Log4jService-xmbean.xml"/>
+ <include name="xmdesc/Log4jService-xmbean.xml"/>
</fileset>
</copy>
<copy todir="${install.minimal.deployers}" overwrite="true">
@@ -729,6 +276,8 @@
<copy todir="${install.minimal.conf}" overwrite="true">
<fileset dir="${project.root}/server/target/etc/conf/minimal" />
</copy>
+ <copy file="${project.root}/profileservice/target/resources/hdscanner-jboss-beans.xml"
+ todir="${install.minimal.deploy}" overwrite="true"/>
<copy todir="${install.minimal.lib}" overwrite="true">
<fileset dir="${install.common.lib}">
<include name="jnpserver.jar" />
@@ -741,7 +290,8 @@
<!-- Build server/web manually -->
<mkdir dir="${install.web}"/>
- <mkdir dir="${install.web.lib}"/> <!-- empty -->
+ <mkdir dir="${install.web.lib}"/>
+ <!-- empty -->
<copy todir="${install.web.conf}">
<fileset dir="${install.default.conf}">
<include name="**"/>
@@ -753,31 +303,31 @@
</copy>
<copy todir="${install.web.deployers}">
<fileset dir="${install.default.deployers}">
- <include name="alias-deployers-jboss-beans.xml"/>
- <include name="ejb3.deployer/**"/>
- <include name="jboss-jca.deployer/**"/>
- <include name="jboss-aop-jboss5.deployer/**"/>
- <include name="jbossweb.deployer/**"/>
- <include name="metadata-deployer-jboss-beans.xml"/>
- <include name="security-deployer-jboss-beans.xml"/>
- <include name="jboss-threads.deployer/**"/>
+ <include name="alias-deployers-jboss-beans.xml"/>
+ <include name="ejb3.deployer/**"/>
+ <include name="jboss-jca.deployer/**"/>
+ <include name="jboss-aop-jboss5.deployer/**"/>
+ <include name="jbossweb.deployer/**"/>
+ <include name="metadata-deployer-jboss-beans.xml"/>
+ <include name="security-deployer-jboss-beans.xml"/>
+ <include name="jboss-threads.deployer/**"/>
</fileset>
</copy>
<copy todir="${install.web.deploy}">
<fileset dir="${install.default.deploy}">
- <include name="hsqldb-ds.xml"/>
- <include name="jca-jboss-beans.xml"/>
- <include name="jboss-local-jdbc.rar"/>
- <include name="jbossweb.sar/**"/>
- <include name="jboss-xa-jdbc.rar"/>
- <include name="jmx-console.war/**"/>
- <include name="http-invoker.sar/**"/>
- <include name="ROOT.war/**"/>
- <include name="security/**"/>
- <include name="transaction-jboss-beans.xml"/>
- <include name="thread-pool-jboss-beans.xml"/>
- <!-- FIXME serlvets shouldn't be using the ejb3 user transaction -->
- <include name="ejb3-container-jboss-beans.xml"/>
+ <include name="hsqldb-ds.xml"/>
+ <include name="jca-jboss-beans.xml"/>
+ <include name="jboss-local-jdbc.rar"/>
+ <include name="jbossweb.sar/**"/>
+ <include name="jboss-xa-jdbc.rar"/>
+ <include name="jmx-console.war/**"/>
+ <include name="http-invoker.sar/**"/>
+ <include name="ROOT.war/**"/>
+ <include name="security/**"/>
+ <include name="transaction-jboss-beans.xml"/>
+ <include name="thread-pool-jboss-beans.xml"/>
+ <!-- FIXME serlvets shouldn't be using the ejb3 user transaction -->
+ <include name="ejb3-container-jboss-beans.xml"/>
</fileset>
<fileset dir="${project.root}/server/target/etc/conf/web">
<include name="jmx-invoker-service.xml"/>
@@ -791,8 +341,10 @@
<copy todir="${install.standard}">
<fileset dir="${install.default}">
<include name="conf/**"/>
- <exclude name="conf/jboss-service.xml"/> <!-- call-by-value for jndi -->
- <exclude name="conf/jndi.properties"/> <!-- ORBInitialContextFactory -->
+ <exclude name="conf/jboss-service.xml"/>
+ <!-- call-by-value for jndi -->
+ <exclude name="conf/jndi.properties"/>
+ <!-- ORBInitialContextFactory -->
<include name="deploy/**"/>
<exclude name="deploy/http-invoker.sar/**"/>
<exclude name="deploy/jmx-remoting.sar/**"/>
@@ -806,7 +358,8 @@
<exclude name="deploy/scheduler-service.xml"/>
<exclude name="deploy/sqlexception-service.xml"/>
<exclude name="deploy/vfs-jboss-beans.xml"/>
- <include name="deployers/**"/> <!-- call-by-value & isolation -->
+ <include name="deployers/**"/>
+ <!-- call-by-value & isolation -->
<exclude name="deployers/ear-deployer-jboss-beans.xml"/>
</fileset>
<fileset dir="${install.all}">
@@ -821,7 +374,7 @@
<copy todir="${install.standard.conf}">
<fileset dir="${project.root}/server/target/etc/conf/standard">
<include name="jboss-service.xml"/>
- <include name="jndi.properties"/>
+ <include name="jndi.properties"/>
</fileset>
</copy>
<copy todir="${install.standard.deployers}">
@@ -829,18 +382,18 @@
<include name="ear-deployer-jboss-beans.xml"/>
</fileset>
</copy>
-
- <call target="jboss-all-client"/>
+
+ <antcall target="jboss-all-client"/>
</target>
-
+
<target name="jboss-all-client" depends="init"
description="Create jar containing client classpath">
- <!--Create a jbossall-client.jar containing the classpath for everything a client app needs-->
-
+ <!--Create a jbossall-client.jar containing the classpath for everything a client app needs-->
+
<property name="client.jar.dir" location="${install.client}" />
<property name="jbossall.client.filename" value="jbossall-client.jar"/>
-
+
<fileset id="client.jar.fileset" dir="${client.jar.dir}">
<include name="*-client.jar"/>
<include name="asm.jar"/>
@@ -877,24 +430,24 @@
<!-- client excludes -->
<exclude name="jbossws-native-client.jar"/>
<exclude name="${jbossall.client.filename}"/>
- </fileset>
-
- <path id="client.jar.classpath">
- <fileset refid="client.jar.fileset" />
+ </fileset>
+
+ <path id="client.jar.classpath">
+ <fileset refid="client.jar.fileset" />
</path>
-
+
<pathconvert property="client.jar.manifest.classpath" refid="client.jar.classpath"
pathsep=" " dirsep="${file.separator}">
<map from="${client.jar.dir}${file.separator}" to="" />
</pathconvert>
-
+
<pathconvert property="client.jar.files" refid="client.jar.classpath"
pathsep="${line.separator}" dirsep="${file.separator}">
<map from="${client.jar.dir}${file.separator}" to="" />
</pathconvert>
-
- <mkdir dir="${module.output}/temp"/>
- <echo file="${module.output}/temp/readme.txt">
+
+ <mkdir dir="${dist.module.output}/temp"/>
+ <echo file="${dist.module.output}/temp/readme.txt">
This jar file contains a classpath reference to various client jar files used by jboss client applications.
Each of the jar files in the following list must available in the same directory as the jbossall-client.jar, Otherwise they will not be found by the classloader.
@@ -902,21 +455,21 @@
${client.jar.files}
</echo>
-
- <jar destfile="${install.client}/${jbossall.client.filename}" basedir="${module.output}/temp">
+
+ <jar destfile="${install.client}/${jbossall.client.filename}" basedir="${dist.module.output}/temp">
<manifest>
- <attribute name="Specification-Title" value="${specification.title}"/>
- <attribute name="Specification-Version" value="${specification.version}"/>
- <attribute name="Specification-Vendor" value="${specification.vendor}"/>
- <attribute name="Implementation-Title" value="${implementation.title}"/>
- <attribute name="Implementation-Version" value="${implementation.version}"/>
- <attribute name="Implementation-Vendor" value="${implementation.vendor}"/>
- <attribute name="Implementation-Vendor-Id" value="${implementation.vendor.id}"/>
- <attribute name="Class-Path" value="${client.jar.manifest.classpath}"/>
+ <attribute name="Specification-Title" value="${specification.title}"/>
+ <attribute name="Specification-Version" value="${specification.version}"/>
+ <attribute name="Specification-Vendor" value="${specification.vendor}"/>
+ <attribute name="Implementation-Title" value="${implementation.title}"/>
+ <attribute name="Implementation-Version" value="${implementation.version}"/>
+ <attribute name="Implementation-Vendor" value="${implementation.vendor}"/>
+ <attribute name="Implementation-Vendor-Id" value="${implementation.vendor.id}"/>
+ <attribute name="Class-Path" value="${client.jar.manifest.classpath}"/>
</manifest>
</jar>
- <delete dir="${module.output}/temp" />
+ <delete dir="${dist.module.output}/temp" />
</target>
@@ -926,13 +479,15 @@
<!-- Clean up all build output -->
<target name="clean" description="Cleans up most generated files."
- depends="maven-clean, _buildmagic:clean,
- modules-clean">
+ depends="maven-clean">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${dist.module.output}"/>
+ </delete>
</target>
<!-- Clean up all generated files -->
- <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber"
- description="Cleans up all generated files.">
+ <target name="clobber" depends="maven-clean"
+ description="Cleans up all generated files.">
<delete file="${module.root}/*_run.log"/>
</target>
@@ -941,19 +496,19 @@
<!-- Misc. -->
<!-- ================================================================== -->
- <target name="main" depends="most"
- description="Executes the default target (most)."/>
+ <target name="main" depends="maven-install, dist"
+ description="Executes the default target to build the full dist."/>
- <target name="all" depends="maven-install, modules-all, install"
- description="Executes all modules and builds everything."/>
+ <!--<target name="all" depends="maven-install, modules-all, install"
+ description="Executes all modules and builds everything."/>-->
- <target name="most" depends="maven-install, modules-most, install"
- description="Executes all modules and builds most everything."/>
+ <target name="dist" depends="init, configure, install-modules, thirdparty, install"
+ description="Executes all modules and builds most everything."/>
- <target name="release" depends="most" />
+ <target name="release" depends="dist" />
- <target name="help" depends="_buildmagic:help:build"
- description="Show this help message."/>
+ <!--<target name="help" depends="_buildmagic:help:build"
+ description="Show this help message."/>-->
<!-- Define a macro for calling maven -->
<macrodef name="maven">
@@ -980,97 +535,1808 @@
</java>
</sequential>
</macrodef>
-
+
<target name="maven-init">
<property name="maven.home" location="${basedir}/../tools/maven"/>
<echo message="Maven Home set to ${maven.home}"/>
</target>
-
+
<!-- Call maven to build the mavenized modules -->
<target name="maven-install" description="Run the install goal against the maven build"
depends="maven-init">
-
- <property name="maven.install.opts" value="-Pskip-dist"/>
- <maven basedir="${basedir}/.."
+ <property name="maven.install.opts" value="-Pskip-dist"/>
+
+ <maven basedir="${basedir}/.."
options="${maven.install.opts}"
goal="install"
resultproperty="maven.install.result"/>
-
- <fail message="Unable to build maven modules. See maven output for details.">
- <condition>
- <not>
- <equals arg1="${maven.install.result}" arg2="0"/>
- </not>
- </condition>
- </fail>
-
+
+ <fail message="Unable to build maven modules. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.install.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+
</target>
<!-- Call maven to clean the mavenized modules -->
<target name="maven-clean" description="Run the clean goal against the maven build."
depends="maven-init">
-
- <property name="maven.clean.opts" value=""/>
- <maven basedir="${basedir}/.."
+ <property name="maven.clean.opts" value=""/>
+
+ <maven basedir="${basedir}/.."
options="${maven.clean.opts}"
goal="clean"
resultproperty="maven.clean.result"/>
+
+ <fail message="Unable to clean maven modules. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.clean.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+
+ </target>
+
+ <target name="init-thirdparty-dependencies" depends="init"
+ description="Initialize thirdparty dependency configuration">
+ <!--
+ - Initialize properties for each dependency in the thirdparty pom
+ - The properties take the form "groupId:artifactId:packaging"
+ -->
+ <maven:dependencies filesetId="pom.dependencies"
+ versionsId="pom.dependencies.versions"
+ scopes="compile, runtime" type="pom, jar, zip, war"
+ addArtifactFileSetRefs="true">
+ <pom file="../thirdparty/pom.xml"/>
+ </maven:dependencies>
+
+ <!-- Due to MANTTASKS-148 files with jboss-sar packaging cannot be resolved directly in the pom -->
+ <xmlproperty file="../component-matrix/pom.xml" prefix="component-matrix"/>
+ <maven:dependencies addArtifactFileSetRefs="true">
+ <dependency groupId="jboss.jbossts" artifactId="jbossts-tools"
+ version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
+ <dependency groupId="org.jboss.jaxr" artifactId="juddi-service"
+ version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
+ </maven:dependencies>
+
+ </target>
+
+
+
+
+ <!-- ================================================================== -->
+ <!-- Module Pass-through Hooks -->
+ <!-- ================================================================== -->
+
+ <!--
+ | These hooks are executed after the above pass-through targets have
+ | finished with a given module.
+ -->
+
+ <!-- ======== -->
+ <!-- Remoting -->
+ <!-- ======== -->
+
+ <target name="module-jbossas-remoting">
+ <property name="jbossas-remoting.module.name" value="jbossas-remoting"/>
+ <property name="jbossas-remoting.module.output" value="${project.root}/${jbossas-remoting.module.name}/target"/>
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy file="${jbossas-remoting.module.output}/jboss-as-jbossas-remoting.jar"
+ tofile="${install.all.lib}/jbossas-remoting.jar" filtering="no"/>
+
+ </target>
+
+ <target name="module-remoting-all" depends="module-jbossas-remoting">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${jbossas-remoting.module.name}"/>
+ <copy todir="${install.api}/${jbossas-remoting.module.name}" filtering="no">
+ <fileset dir="${jbossas-remoting.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!-- ============ -->
+ <!-- JMX Remoting -->
+ <!-- ============ -->
+
+ <target name="module-jmx-remoting">
+ <property name="jmx-remoting.module.name" value="jmx-remoting"/>
+ <property name="jmx-remoting.module.output" value="${project.root}/${jmx-remoting.module.name}/target"/>
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy file="${jmx-remoting.module.output}/jboss-as-jmx-remoting.jar"
+ tofile="${install.all.lib}/jboss-jmx-remoting.jar" filtering="no" />
+ </target>
+
+ <target name="module-jmx-remoting-all" depends="module-jmx-remoting">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${jmx-remoting.module.name}"/>
+ <copy todir="${install.api}/${jmx-remoting.module.name}" filtering="no">
+ <fileset dir="${jmx-remoting.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!-- ===================== -->
+ <!-- JBoss AS JMX Remoting -->
+ <!-- ===================== -->
+
+ <target name="module-jbossas-jmx-remoting">
+ <property name="jbossas-jmx-remoting.module.name" value="jbossas-jmx-remoting"/>
+ <property name="jbossas-jmx-remoting.module.output"
+ value="${project.root}/${jbossas-jmx-remoting.module.name}/target"/>
+
+ <unjar src="${jbossas-jmx-remoting.module.output}/jmx-remoting.sar" dest="${install.default}/deploy/jmx-remoting.sar"/>
+ <unjar src="${jbossas-jmx-remoting.module.output}/jmx-remoting.sar" dest="${install.all}/deploy/jmx-remoting.sar"/>
+
+ </target>
+
+ <target name="module-jbossas-jmx-remoting-all" depends="module-jbossas-jmx-remoting">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${jbossas-jmx-remoting.module.name}"/>
+ <copy todir="${install.api}/${jbossas-jmx-remoting.module.name}" filtering="no">
+ <fileset dir="${jbossas-jmx-remoting.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!-- ======== -->
+ <!-- EJB 3.0 -->
+ <!-- ======== -->
+
+ <target name="module-ejb3">
+ <property name="ejb3.module.name" value="ejb3"/>
+ <property name="ejb3.module.output" value="${project.root}/${ejb3.module.name}/target"/>
+
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <fileset dir="${ejb3.module.output}/resources">
+ <include name="ejb3-container-jboss-beans.xml"/>
+ <include name="ejb3-interceptors-aop.xml"/>
+ <include name="ejb3-timerservice-jboss-beans.xml"/>
+ <include name="ejb3-connectors-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy across client jars -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${ejb3.module.output}/jboss-as-ejb3-client.jar"
+ tofile="${install.client}/jboss-appclient.jar" filtering="no" />
+
+ <copy todir="${install.server}/all/deployers" filtering="no">
+ <fileset dir="${ejb3.module.output}">
+ <include name="ejb3.deployer/**"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="module-ejb3-all" depends="module-ejb3">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${ejb3.module.name}"/>
+ <copy todir="${install.api}/${ejb3.module.name}" filtering="no">
+ <fileset dir="${ejb3.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!-- ======== -->
+ <!-- ASPECTS -->
+ <!-- ======== -->
+
+ <target name="module-aspects">
+ <property name="aspects.module.name" value="aspects"/>
+ <property name="aspects.module.output" value="${project.root}/${aspects.module.name}/target"/>
+
+ <property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>
+ <!-- Copy the generated libraries -->
+ <unjar src="${aspects.module.output}/jboss-as-aspects-jboss-aop-jboss5-deployer.jar" dest="${install.server}/all/deployers/${aop.deployer}"/>
+
+ <copy file="${aspects.module.output}/jboss-as-aspects-jboss-aop-jboss5.jar"
+ tofile="${install.lib}/jboss-aop-jboss5.jar" filtering="no" />
+
+ <!-- Copy across client jars -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${aspects.module.output}/jboss-as-aspects-jboss-aspect-jdk50-client.jar"
+ tofile="${install.client}/jboss-aspect-jdk50-client.jar" filtering="no" />
+
+ </target>
+
+ <target name="module-aspects-all" depends="module-aspects">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${aspects.module.name}"/>
+ <copy todir="${install.api}/${aspects.module.name}" filtering="no">
+ <fileset dir="${aspects.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!-- ==== -->
+ <!-- Main -->
+ <!-- ==== -->
+
+ <target name="module-main">
+ <property name="main.module.name" value="main"/>
+ <property name="main.module.output" value="${project.root}/${main.module.name}/target"/>
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy file="${main.module.output}/jboss-as-main.jar"
+ tofile="${install.lib}/jboss-main.jar" filtering="no"/>
+ <copy file="${main.module.output}/jboss-as-main-log4j-boot.jar"
+ tofile="${install.lib}/log4j-boot.jar" filtering="no"/>
+
+ <!-- Copy the generated client -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${main.module.output}/jboss-as-main-client.jar"
+ tofile="${install.client}/jboss-main-client.jar" filtering="no"/>
+
+ <!-- Copy the generated scripts & runnable jars -->
+ <mkdir dir="${install.bin}"/>
+ <copy todir="${install.bin}" filtering="no">
+ <fileset dir="${main.module.output}/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy file="${main.module.output}/jboss-as-main-run.jar" tofile="${install.bin}/run.jar"/>
+ <chmod perm="+x">
+ <fileset dir="${install.bin}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ </target>
+
+ <target name="module-main-all" depends="module-main">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${main.module.name}"/>
+ <copy todir="${install.api}/${main.module.name}" filtering="no">
+ <fileset dir="${main.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ====== -->
+ <!-- System -->
+ <!-- ====== -->
+
+ <target name="module-system">
+ <property name="system.module.name" value="system"/>
+ <property name="system.module.output" value="${project.root}/${system.module.name}/target"/>
+
+ <!-- Copy the generated server jar -->
+ <mkdir dir="${install.lib}"/>
+ <copy file="${system.module.output}/jboss-as-system.jar"
+ tofile="${install.lib}/jboss-system.jar" filtering="no"/>
+
+ <!-- Copy the generated client jar -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${system.module.output}/jboss-as-system-client.jar"
+ tofile="${install.client}/jboss-system-client.jar" filtering="no"/>
+
+ <!-- Copy the DTDs -->
+ <mkdir dir="${install.dtd}"/>
+ <copy todir="${install.dtd}" filtering="no">
+ <fileset dir="${project.root}/${system.module.name}/src/resources/dtd"/>
+ </copy>
+
+ </target>
+
+ <target name="module-system-all" depends="module-system">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${system.module.name}"/>
+ <copy todir="${install.api}/${system.module.name}" filtering="no">
+ <fileset dir="${system.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ========== -->
+ <!-- System JMX -->
+ <!-- ========== -->
+
+ <target name="module-system-jmx">
+ <property name="system-jmx.module.name" value="system-jmx"/>
+ <property name="system-jmx.module.output" value="${project.root}/${system-jmx.module.name}/target"/>
+
+ <!-- Copy the generated server jar -->
+ <mkdir dir="${install.lib}"/>
+ <copy file="${system-jmx.module.output}/jboss-as-system-jmx.jar"
+ tofile="${install.lib}/jboss-system-jmx.jar" filtering="no"/>
+
+ <!-- Copy the generated client jar -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${system-jmx.module.output}/jboss-as-system-jmx-client.jar"
+ tofile="${install.client}/jboss-system-jmx-client.jar" filtering="no"/>
+
+ </target>
+
+ <target name="module-system-jmx-all" depends="module-system-jmx">
+ </target>
+
+ <!-- ====== -->
+ <!-- Server -->
+ <!-- ====== -->
+
+ <target name="module-server">
+ <property name="server.module.name" value="server"/>
+ <property name="server.module.output" value="${project.root}/${server.module.name}/target"/>
+
+ <!-- Copy the security-policies-service.xml -->
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <fileset dir="${server.module.output}/resources">
+ <include name="security-jboss-beans.xml"/>
+ <include name="security-policies-service.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+
+ <copy file="${server.module.output}/jboss-as-server-jboss.jar"
+ tofile="${install.all.lib}/jboss.jar" filtering="no"/>
+
+ <copy file="${server.module.output}/jboss-as-server-jmx-adaptor-plugin.jar"
+ tofile="${install.all.lib}/jmx-adaptor-plugin.jar" filtering="no"/>
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+
+ <copy file="${server.module.output}/jboss-as-server-client.jar"
+ tofile="${install.client}/jboss-client.jar" filtering="no"/>
+
+ <copy file="${server.module.output}/jboss-as-server-jmx-invoker-adaptor-client.jar"
+ tofile="${install.client}/jmx-invoker-adaptor-client.jar" filtering="no"/>
+
+ <!-- Copy the generated scripts & runnable jars -->
+ <mkdir dir="${install.bin}"/>
+ <copy todir="${install.bin}" filtering="no">
+ <fileset dir="${server.module.output}/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <chmod perm="+x">
+ <fileset dir="${install.bin}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <copy file="${server.module.output}/jboss-as-server-shutdown.jar"
+ tofile="${install.bin}/shutdown.jar" filtering="no"/>
+
+ <!-- Default server config -->
+
+ <mkdir dir="${install.server}/all/deploy"/>
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <!-- Deployable xml snipets -->
+ <fileset dir="${server.module.output}/etc/deploy">
+ <include name="**"/>
+ </fileset>
+
+ <!-- Deployable archives -->
+ <fileset dir="${server.module.output}">
+ <include name="uuid-key-generator.sar/**"/>
+ <include name="sqlexception-service.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the deployers -->
+ <copy todir="${install.server}/all/deployers" filtering="no">
+ <fileset dir="${server.module.output}/etc/deployers">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <copy file="${server.module.output}/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml" tofile="${install.all.deploy}/jmx-invoker-service.xml"/>
+
+ <!-- Copy the "all" configuration files -->
+ <mkdir dir="${install.server}/all/conf"/>
+ <copy todir="${install.server}/all/conf" filtering="no">
+ <fileset dir="${server.module.output}/etc/conf/all"/>
+ </copy>
+
+ </target>
+
+ <target name="module-server-all" depends="module-server">
+
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${server.module.name}"/>
+ <copy todir="${install.api}/${server.module.name}" filtering="no">
+ <fileset dir="${server.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ========= -->
+ <!-- Connector -->
+ <!-- ========= -->
+
+ <target name="module-connector">
+ <property name="connector.module.name" value="connector"/>
+ <property name="connector.module.output" value="${project.root}/${connector.module.name}/target"/>
+
+ <mkdir dir="${install.server}/all/deployers"/>
+
+ <copy todir="${install.server}/all/deployers" filtering="no">
+ <fileset dir="${connector.module.output}">
+ <include name="jboss-jca.deployer/**"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated deployment libraries -->
+ <mkdir dir="${install.server}/all/deploy"/>
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <fileset dir="${connector.module.output}/">
+ <include name="jboss-local-jdbc.rar"/>
+ <include name="jboss-xa-jdbc.rar"/>
+ <include name="mail-ra.rar"/>
+ <include name="quartz-ra.rar"/>
+ </fileset>
+ <fileset dir="${connector.module.output}/resources/jca-sar">
+ <include name="jca-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${install.all.deploy}" filtering="no">
+ <fileset dir="${connector.module.output}">
+ <include name="jms-ra.rar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${install.server}/all/lib"/>
+ <copy file="${connector.module.output}/jboss-as-connector-jboss-common-jdbc-wrapper.jar"
+ tofile="${install.server}/all/lib/jboss-common-jdbc-wrapper.jar" filtering="no"/>
+ <copy file="${connector.module.output}/jboss-as-connector-jboss-jca.jar"
+ tofile="${install.server}/all/lib/jboss-jca.jar" filtering="no"/>
+
+ <!-- Copy the dtds -->
+ <mkdir dir="${install.dtd}"/>
+ <copy todir="${install.dtd}" filtering="no">
+ <fileset dir="${connector.module.output}/resources/dtd"/>
+ </copy>
+
+ <!-- Copy example db configs -->
+ <mkdir dir="${install.examples.jca}"/>
+ <copy todir="${install.examples.jca}" filtering="no">
+ <fileset dir="${connector.module.output}/etc/example-config">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <fileset dir="${connector.module.output}/etc/example-config">
+ <!--include name="firebird-service.xml"/-->
+ <include name="hsqldb-ds.xml"/>
+ <!--include name="mysql-service.xml"/-->
+ <!--include name="oracle-service.xml"/-->
+ <!--include name="postgres-service.xml"/-->
+ </fileset>
+ </copy>
+
+ <!--
+ <mkdir dir="${install.all.deploy}/jms"/>
+ <copy todir="${install.all.deploy}/jms" filtering="no">
+ <fileset dir="${_module.output}/etc/example-config">
+ <include name="hajndi-jms-ds.xml"/>
+ </fileset>
+ </copy>
+ -->
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${connector.module.output}/jboss-as-connector-jbosscx-client.jar"
+ tofile="${install.server}/all/lib/jbosscx-client.jar" filtering="no"/>
+
+ </target>
+
+ <target name="module-connector-all" depends="module-connector">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${connector.module.name}"/>
+ <copy todir="${install.api}/${connector.module.name}" filtering="no">
+ <fileset dir="${connector.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!--Copy generated jmx documentation -->
+ <mkdir dir="${install.jmx-api}"/>
+ <copy todir="${install.jmx-api}" filtering="no" failonerror="false">
+ <fileset dir="${connector.module.output}/jmx-api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ========= -->
+ <!-- Messaging -->
+ <!-- ========= -->
+
+ <target name="module-messaging">
+ <property name="messaging.module.name" value="messaging"/>
+ <property name="messaging.module.output" value="${project.root}/${messaging.module.name}/target"/>
+
+ <!--
+ jboss-messaging libraries, unscoped deployment, same for "all" and "default" configurations.
+ -->
+ <mkdir dir="${install.all.lib}"/>
- <fail message="Unable to clean maven modules. See maven output for details.">
- <condition>
- <not>
- <equals arg1="${maven.clean.result}" arg2="0"/>
- </not>
- </condition>
- </fail>
-
+ <copy file="${messaging.module.output}/jboss-as-messaging.jar"
+ tofile="${install.all.lib}/jboss-messaging-int.jar" filtering="no" />
+
+ <!--
+ Security metadata, same for "all" and "default" configurations.
+ -->
+ <mkdir dir="${install.all.conf}/props"/>
+ <copy todir="${install.all.conf}/props">
+ <fileset dir="${messaging.module.output}/etc/deploy/common">
+ <include name="messaging-*.properties"/>
+ </fileset>
+ </copy>
+
+ <!--
+ Clustered Config, using HSQLDB (but not supposed to go into production mode, since clustering requires a shared DB)
+ -->
+ <mkdir dir="${install.all.deploy}/messaging"/>
+ <!--<copy tofile="${install.all.deploy}/messaging/hsqldb-persistence-service.xml"
+ file="${jboss.messaging.resources}/clustered-hsqldb-persistence-service.xml"/>-->
+ <unzip src="${jboss.messaging:resources:jar}" dest="${install.all.deploy}/messaging/">
+ <patternset>
+ <include name="resources/clustered-hsqldb-persistence-service.xml"/>
+ </patternset>
+ <mapper type="glob" from="resources/clustered-hsqldb-persistence-service.xml" to="hsqldb-persistence-service.xml"/>
+ </unzip>
+ <copy todir="${install.all.deploy}/messaging">
+ <fileset dir="${messaging.module.output}/etc/deploy/common">
+ <include name="*-service.xml"/>
+ <include name="*-jboss-beans.xml"/>
+ <include name="jms-ds.xml"/>
+ <include name="destinations-service.xml"/>
+ </fileset>
+ <!--<fileset dir="${jboss.messaging.resources}/">
+ <include name="connection-factories-service.xml"/>
+ <include name="remoting-bisocket-service.xml"/>
+ </fileset>-->
+ </copy>
+
+ <unzip src="${jboss.messaging:resources:jar}" dest="${install.all.deploy}/messaging">
+ <patternset>
+ <include name="resources/connection-factories-service.xml"/>
+ <include name="resources/remoting-bisocket-service.xml"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+
+ <!--
+ Default configuration
+ -->
+ <mkdir dir="${install.default.deploy}/messaging"/>
+ <copy todir="${install.default.deploy}/messaging">
+ <fileset dir="${messaging.module.output}/etc/deploy/common">
+ <include name="*-service.xml"/>
+ <include name="*-jboss-beans.xml"/>
+ <include name="jms-ds.xml"/>
+ </fileset>
+ <!--<fileset dir="${jboss.messaging.resources}/">
+ <include name="connection-factories-service.xml"/>
+ <include name="hsqldb-persistence-service.xml"/>
+ <include name="remoting-bisocket-service.xml"/>
+ </fileset>-->
+ </copy>
+ <unzip src="${jboss.messaging:resources:jar}" dest="${install.default.deploy}/messaging">
+ <patternset>
+ <include name="resources/connection-factories-service.xml"/>
+ <include name="resources/hsqldb-persistence-service.xml"/>
+ <include name="resources/remoting-bisocket-service.xml"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+
+ <!-- copy example jms configs -->
+ <!-- we don't need them anymore, they are all in examples/config now
+ <mkdir dir="${install.examples.jms}"/>
+ <copy todir="${install.examples.jms}" filtering="no">
+ <fileset dir="${jboss.messaging.resources}">
+ <include name="*-persistence-service.xml"/>
+ <include name="remoting-*-service.xml"/>
+ </fileset>
+ </copy>
+ -->
+
+ <!-- the JBM bundled destinations-service.xml comes with many examples -->
+ <unzip src="${jboss.messaging:resources:jar}" dest="${install.examples.jms}">
+ <patternset>
+ <include name="resources/destinations-service.xml"/>
+ </patternset>
+ <mapper type="glob" from="resources/destinations-service.xml" to="example-destinations-service.xml"/>
+ </unzip>
+ <!-- <copy file="${jboss.messaging.resources}/destinations-service.xml"
+ tofile="${install.examples.jms}/example-destinations-service.xml"/>-->
+
+ <!-- JBM examples for JBoss 5 -->
+ <mkdir dir="${install.examples.jms}"/>
+ <copy todir="${install.examples.jms}" filtering="no">
+ <fileset dir="${messaging.module.output}/etc/">
+ </fileset>
+ </copy>
+ <!-- need to copy the following files as AS5 build while change the contents of them -->
+ <copy todir="${install.examples.jms}/examples/secure-socket/etc/" overwrite="yes">
+ <fileset dir="${project.root}/${messaging.module.name}/src/etc/examples/secure-socket/etc">
+ <include name="messaging.keystore"/>
+ <include name="messaging.truststore"/>
+ </fileset>
+ </copy>
+
</target>
- <!-- check if the the user has specied proxy settings -->
- <target name="check.proxy">
- <condition property="hasproxy">
- <and>
- <isset property="proxy.host"/>
- <isset property="proxy.port"/>
- <not>
- <equals arg1="" arg2="${proxy.host}" trim="true"/>
- </not>
- <not>
- <equals arg1="" arg2="${proxy.port}" trim="true"/>
- </not>
- </and>
- </condition>
+ <target name="module-messaging-all" depends="module-messaging">
- <!-- set proxy settings -->
- <condition property="hasproxyauth">
- <and>
- <isset property="hasproxy"/>
- <isset property="proxy.username"/>
- <isset property="proxy.password"/>
- <not>
- <equals arg1="" arg2="${proxy.username}" trim="true"/>
- </not>
- <not>
- <equals arg1="" arg2="${proxy.password}" trim="true"/>
- </not>
- </and>
- </condition>
- </target>
-
- <target name="set.proxy" depends="set.proxy.withoutauth, set.proxy.auth"/>
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${messaging.module.name}"/>
+ <copy todir="${install.api}/${messaging.module.name}" filtering="no">
+ <fileset dir="${messaging.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
- <!-- set proxy settings without auth -->
- <target name="set.proxy.withoutauth" if="hasproxy" unless="hasproxyauth" depends="check.proxy">
- <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
- </target>
+ <!-- ======== -->
+ <!-- Security -->
+ <!-- ======== -->
- <!-- set proxy settings using auth -->
- <target name="set.proxy.auth" if="hasproxyauth" depends="check.proxy">
- <echo>Auth Proxy is set to ${proxy.host}:${proxy.port} username=[${proxy.username}]</echo>
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
- </target>
+ <target name="module-security">
+ <property name="security.module.name" value="security"/>
+ <property name="security.module.output" value="${project.root}/${security.module.name}/target"/>
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy file="${security.module.output}/jboss-as-security.jar"
+ tofile="${install.all.lib}/jbosssx-server.jar" filtering="no"/>
+
+ <copy file="${security.module.output}/jboss-as-security-client.jar"
+ tofile="${install.client}/jbosssx-as-client.jar" filtering="no"/>
+
+
+ <!-- Copy the security configuration files -->
+ <mkdir dir="${install.all.deploy}/security"/>
+ <copy todir="${install.all.deploy}/security">
+ <fileset dir="${security.module.output}/etc/deploy/">
+ <include name="*-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Install JBoss Security Password batch scripts -->
+ <copy todir="${install.bin}" flatten="true" overwrite="true">
+ <fileset dir="${security.module.output}/etc/bin">
+ <include name="password_tool.*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="module-security-all" depends="module-security">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${security.module.name}"/>
+ <copy todir="${install.api}/${security.module.name}" filtering="no">
+ <fileset dir="${security.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ======= -->
+ <!-- Cluster -->
+ <!-- ======= -->
+
+ <target name="module-cluster">
+ <property name="cluster.module.name" value="cluster"/>
+ <property name="cluster.module.output" value="${project.root}/${cluster.module.name}/target"/>
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy file="${cluster.module.output}/jboss-as-cluster.jar"
+ tofile="${install.all.lib}/jbossha.jar" filtering="no" />
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${cluster.module.output}/jboss-as-cluster-jboss-ha-legacy-client.jar"
+ tofile="${install.client}/jboss-ha-legacy-client.jar" filtering="no" />
+
+ <!-- Copy the deployers -->
+ <copy todir="${install.server}/all/deployers" filtering="no">
+ <fileset dir="${cluster.module.output}/etc">
+ <include name="clustering-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the deployables -->
+ <mkdir dir="${install.server}/all/deploy/cluster"/>
+ <copy todir="${install.server}/all/deploy/cluster" filtering="no">
+ <fileset dir="${cluster.module.output}/etc">
+ <include name="hapartition-jboss-beans.xml"/>
+ <include name="deploy-hasingleton-jboss-beans.xml"/>
+ <include name="hajndi-jboss-beans.xml"/>
+ <include name="ha-legacy-jboss-beans.xml"/>
+ <include name="timestamps-jboss-beans.xml"/>
+ <include name="farm-deployment-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar"/>
+ <copy todir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar" filtering="no">
+ <fileset dir="${cluster.module.output}/resources/jgroups-channelfactory.sar">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${install.server}/all/deploy/cluster/jboss-cache-manager.sar"/>
+ <copy todir="${install.server}/all/deploy/cluster/jboss-cache-manager.sar" filtering="no">
+ <fileset dir="${cluster.module.output}/resources/jboss-cache-manager.sar">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${install.server}/all/deploy-hasingleton"/>
+ <mkdir dir="${install.server}/all/deploy/deploy.last"/>
+
+ <!-- Copy the farmed deployables -->
+ <mkdir dir="${install.server}/all/farm"/>
+ <copy todir="${install.server}/all/farm" filtering="no">
+ <fileset dir="${cluster.module.output}/etc">
+ <include name="cluster-examples-service.xml"/>
+ </fileset>
+ </copy>
+
+
+ </target>
+
+ <target name="module-cluster-all" depends="module-cluster">
+ <!-- Copy the examples -->
+ <mkdir dir="${install.docs}/${module}"/>
+ <copy todir="${install.docs}/${module}" filtering="no">
+ <fileset dir="${cluster.module.output}">
+ <include name="examples/*"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${cluster.module.name}"/>
+ <copy todir="${install.api}/${cluster.module.name}" filtering="no">
+ <fileset dir="${cluster.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ===== -->
+ <!-- Varia -->
+ <!-- ===== -->
+
+ <target name="module-varia">
+ <property name="varia.module.name" value="varia"/>
+ <property name="varia.module.output" value="${project.root}/${varia.module.name}/target"/>
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${varia.module.output}">
+ <include name="jboss-as-varia-mail-plugin.jar"/>
+ <include name="jboss-as-varia-scheduler-plugin.jar"/>
+ <include name="jboss-as-varia-scheduler-plugin-example.jar"/>
+ <include name="jboss-as-varia-hsqldb.jar"/>
+ <include name="jboss-as-varia-hsqldb-plugin.jar"/>
+ <include name="jboss-as-varia-autonumber-plugin.jar"/>
+ <include name="jboss-as-varia-properties-plugin.jar"/>
+ <include name="jboss-as-varia-jboss-bindingservice.jar"/>
+ <include name="jboss-as-varia-jboss-monitoring.jar"/>
+ <include name="jboss-as-varia-jboss-srp.jar"/>
+ </fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
+ </copy>
+
+ <!-- Copy to docs/examples -->
+ <mkdir dir="${install.examples.varia}"/>
+ <copy todir="${install.examples.varia}" filtering="no">
+ <!--
+ <fileset dir="${project.root}/testsuite/src/etc/cluster-test">
+ <include name="jboss-bindings.xml"/>
+ </fileset>
+ -->
+ <fileset dir="${varia.module.output}">
+ <include name="jboss-as-varia-derby-plugin.jar"/>
+ <include name="jboss-as-varia-threaddump.war"/>
+ </fileset>
+ <mapper type="glob" from="jboss-as-varia-*" to="*"/>
+ </copy>
+
+ <mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
+ <unjar src="${varia.module.output}/persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
+
+ <mkdir dir="${install.examples.varia}/deployment-service"/>
+ <copy todir="${install.examples.varia}/deployment-service">
+ <fileset dir="${varia.module.output}/">
+ <include name="deployment-service.sar"/>
+ </fileset>
+ <fileset dir="${varia.module.output}/resources/services/deployment">
+ <exclude name="META-INF/**"/>
+ </fileset>
+ </copy>
+
+ <!-- MBean Configurator sar for setting mbean attributes when registered -->
+ <mkdir dir="${install.examples}/jmx/mbean-configurator.sar"/>
+ <unjar src="${varia.module.output}/mbean-configurator.sar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
+
+ <!-- Client jars -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${varia.module.output}">
+ <include name="jboss-as-varia-jbossjmx-ant.jar"/>
+ <include name="jboss-as-varia-jboss-srp-client.jar"/>
+ </fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
+ </copy>
+
+ <!-- Default server config -->
+
+ <!-- Copy the deployables -->
+ <mkdir dir="${install.server}/all/deploy"/>
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <!-- Deployable configuration -->
+ <fileset dir="${varia.module.output}/etc">
+ <!-- These should move to example/deploy -->
+ <include name="monitoring-service.xml"/>
+ <include name="mail-service.xml"/>
+ <include name="schedule-manager-service.xml"/>
+ <include name="scheduler-service.xml"/>
+ <include name="properties-service.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- copy snmp-adaptor.sar unpacked to deploy -->
+ <mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
+ <unjar src="${varia.module.output}/snmp-adaptor.sar" dest="${install.server}/all/deploy/snmp-adaptor.sar"/>
+
+ <!-- Include the JMX console war unpacked -->
+ <mkdir dir="${install.server}/all/deploy/jmx-console.war"/>
+ <unjar src="${varia.module.output}/jboss-as-varia-jmx-console.war" dest="${install.server}/all/deploy/jmx-console.war"/>
+
+
+ <!-- Include the HTTP invoker service unpacked -->
+ <mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
+ <unjar src="${varia.module.output}/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
+
+ <!-- copy the ant jmx client -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${varia.module.output}">
+ <include name="jboss-as-varia-jbossjmx-ant.jar"/>
+ </fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
+ </copy>
+
+ <!-- copy the netboot war tool -->
+ <mkdir dir="${install.examples.netboot}"/>
+ <copy todir="${install.examples.netboot}" filtering="no">
+ <fileset dir="${varia.module.output}">
+ <include name="jboss-as-varia-netboot.war"/>
+ </fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
+ </copy>
+
+ <!-- copy the bsh.deployer and its associated beanshell lib from thirdparty -->
+ <mkdir dir="${install.server}/all/deployers"/>
+
+ <copy todir="${install.server}/all/deployers" filtering="no">
+ <fileset dir="${varia.module.output}/deployers">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <!-- copy the jboss-monitoring JAR -->
+ <copy file="${varia.module.output}/jboss-as-varia-jboss-monitoring.jar"
+ tofile="${install.server}/all/lib/jboss-monitoring.jar"/>
+
+ <!-- copy the binding-manager sample file and JAR
+ <copy file="${project.root}/varia/output/lib/bindingservice-plugin.jar" todir="${install.server}/all/lib"/>
+ -->
+ <!--
+ <mkdir dir="${install.examples.binding-manager}"/>
+ <copy file="${project.root}/varia/src/resources/services/binding/sample-bindings.xml" todir="${install.examples.binding-manager}"/>
+ -->
+
+ <!-- the bean deployer : obsolete in jboss5
+ <mkdir dir="${install.all.deploy}/jboss-bean.deployer"/>
+ <copy todir="${install.all.deploy}/jboss-bean.deployer" filtering="no">
+ <fileset dir="${_module.output}/lib/kernel/jboss-bean.deployer">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ -->
+
+ <!-- copy the logging-monitor service to examples -->
+ <mkdir dir="${install.examples}/jmx/logging-monitor/lib"/>
+ <copy todir="${install.examples}/jmx/logging-monitor/lib" filtering="no">
+ <fileset dir="${varia.module.output}/">
+ <include name="jboss-as-varia-logging-monitor.jar"/>
+ </fileset>
+ <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
+ </copy>
+ <copy todir="${install.examples}/jmx/logging-monitor" filtering="no">
+ <fileset dir="${varia.module.output}/resources/services/loggingmonitor"/>
+ </copy>
+
+ <copy todir="${install.server}/all/deployers/jboss-threads.deployer/META-INF">
+ <fileset dir="${varia.module.output}/resources/threads"/>
+ </copy>
+
+ <copy todir="${install.server}/all/deploy/xnio-provider.jar/META-INF">
+ <fileset dir="${varia.module.output}/resources/xnio">
+ <include name="xnio-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${install.server}/all/deployers/xnio.deployer/META-INF">
+ <fileset dir="${varia.module.output}/resources/xnio">
+ <include name="xnio-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="module-varia-all" depends="module-varia">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${varia.module.name}"/>
+ <copy todir="${install.api}/${varia.module.name}" filtering="no">
+ <fileset dir="${varia.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ===== -->
+ <!-- JBoss Web -->
+ <!-- ===== -->
+
+ <target name="module-tomcat">
+ <property name="tomcat.module.name" value="tomcat"/>
+ <property name="tomcat.module.output" value="${project.root}/${tomcat.module.name}/target"/>
+ <!--<property name="_module.ext" value="${project.root}/${_module.name}/ext"/>-->
+
+ <!-- Copy the deployers -->
+ <mkdir dir="${install.server}/all/deployers/jbossweb.deployer"/>
+ <copy todir="${install.server}/all/deployers/jbossweb.deployer">
+ <fileset dir="${tomcat.module.output}/deploy/jboss-web.deployer"/>
+ </copy>
+ <!--
+ <copy tofile="${install.server}/all/deployers/war-clustering-deployers-jboss-beans.xml"
+ file="${project.root}/${_module.name}/src/resources/war-clustering-deployers-jboss-beans.xml" overwrite="true"/>
+ -->
+
+ <!-- Copy the webserver runtime sar -->
+ <mkdir dir="${install.server}/all/deploy/jbossweb.sar"/>
+ <copy todir="${install.server}/all/deploy/jbossweb.sar">
+ <fileset dir="${tomcat.module.output}/deploy/jbossweb.sar"/>
+ </copy>
+
+ <!-- Copy the ROOT.war -->
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <fileset dir="${tomcat.module.output}/deploy">
+ <include name="ROOT.war/**"/>
+ </fileset>
+ </copy>
+ <!-- Copy the clustering service elements -->
+ <copy todir="${install.server}/all/deploy">
+ <fileset dir="${tomcat.module.output}/deploy">
+ <include name="cluster/**"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="module-tomcat-all" depends="module-tomcat">
+ </target>
+
+ <!-- ==== -->
+ <!-- IIOP -->
+ <!-- ==== -->
+
+ <target name="module-iiop">
+ <property name="iiop.module.name" value="iiop"/>
+ <property name="iiop.module.output" value="${project.root}/${iiop.module.name}/target"/>
+
+ <!-- Copy the jboss-iiop.jar -->
+ <copy file="${iiop.module.output}/jboss-as-iiop.jar"
+ tofile="${install.all.lib}/jboss-iiop.jar" filtering="no" />
+
+ <!-- Copy the jboss-iiop-client.jar -->
+ <copy file="${iiop.module.output}/jboss-as-iiop-client.jar"
+ tofile="${install.all.lib}/jboss-iiop-client.jar" filtering="no" />
+
+ <!-- Copy jndi.properties file -->
+ <mkdir dir="${install.server}/all/conf"/>
+ <copy todir="${install.server}/all/conf" filtering="no" overwrite="true">
+ <fileset dir="${iiop.module.output}/etc/conf">
+ <include name="jndi.properties"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${install.server}/all/deploy"/>
+ <copy todir="${install.server}/all/deploy" filtering="no">
+ <!-- Deployable service -->
+ <fileset dir="${iiop.module.output}/etc">
+ <include name="iiop-service.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="module-iiop-all" depends="module-iiop">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${iiop.module.name}"/>
+ <copy todir="${install.api}/${iiop.module.name}" filtering="no">
+ <fileset dir="${iiop.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ========== -->
+ <!-- Management -->
+ <!-- ========== -->
+
+ <target name="module-management">
+ <property name="management.module.name" value="management"/>
+ <property name="management.module.output" value="${project.root}/${management.module.name}/target"/>
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy file="${management.module.output}/jboss-as-management.jar"
+ tofile="${install.all.lib}/jboss-management.jar" filtering="no" />
+ <copy file="${management.module.output}/jboss-as-management-jsr77.jar"
+ tofile="${install.all.lib}/jboss-jsr77.jar" filtering="no" />
+
+ <mkdir dir="${install.examples}/jmx"/>
+ <copy file="${management.module.output}/jboss-as-management-ejb-management.jar"
+ tofile="${install.examples}/jmx/ejb-management.jar" filtering="no" />
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${management.module.output}/jboss-as-management-jsr77-client.jar"
+ tofile="${install.client}/jboss-jsr77-client.jar" filtering="no" />
+
+ </target>
+
+ <target name="module-management-all" depends="module-management">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${management.module.name}"/>
+ <copy todir="${install.api}/${management.module.name}" filtering="no">
+ <fileset dir="${management.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated todo docs -->
+ <mkdir dir="${install.todo}/${management.module.name}"/>
+ <copy todir="${install.todo}/${management.module.name}" filtering="no" failonerror="false">
+ <fileset dir="${management.module.output}/todo">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ======= -->
+ <!-- Console -->
+ <!-- ======= -->
+
+ <target name="module-console">
+ <property name="console.module.name" value="console"/>
+ <property name="console.module.output" value="${project.root}/${console.module.name}/target"/>
+
+ <!-- Copy the generated scripts & runnable jars -->
+ <mkdir dir="${install.bin}"/>
+ <copy todir="${install.bin}" filtering="no">
+ <fileset dir="${console.module.output}/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy file="${console.module.output}/jboss-as-console-twiddle.jar"
+ tofile="${install.bin}/twiddle.jar" filtering="no" />
+ <chmod perm="+x">
+ <fileset dir="${install.bin}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <!-- Unpack the plugin manager SAR (embedded) and application WAR -->
+ <unjar src="${console.module.output}/jboss-as-console-console-mgr-sar.jar"
+ dest="${install.all.deploy}/management/console-mgr.sar"/>
+ <unjar src="${console.module.output}/jboss-as-console-web-console.war"
+ dest="${install.all.deploy}/management/console-mgr.sar/web-console.war"/>
+
+ </target>
+
+ <target name="module-console-all" depends="module-console">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${console.module.name}"/>
+ <copy todir="${install.api}/${console.module.name}" filtering="no">
+ <fileset dir="${console.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ============= -->
+ <!-- Compatibility -->
+ <!-- ============= -->
+ <target name="module-compatibility">
+ <call target="make-compat"/>
+ <call target="check-compat"/>
+ </target>
+
+ <target name="make-compat" if="compatibility.make">
+ <!-- Create serialized versions of contract classes -->
+ <mkdir dir="${compatibility.dir}"/>
+ <java classname="${compatibility.bin}" fork="true" failonerror="true" dir="${compatibility.dir}">
+ <arg value="make"/>
+ <arg value="${contract.classes}"/>
+ <classpath>
+ <pathelement path="${compatibility.classpath}"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="check-compat" if="compatibility.check">
+ <!-- Check compiled contract classes against serialized versions -->
+ <java classname="${compatibility.bin}" fork="true" failonerror="true" dir="${compatibility.dir}">
+ <arg value="check"/>
+ <arg value="${contract.classes}"/>
+ <classpath>
+ <pathelement path="${compatibility.classpath}"/>
+ </classpath>
+ </java>
+ </target>
+
+ <!-- ========== -->
+ <!-- Deployment -->
+ <!-- ========== -->
+
+ <target name="module-deployment">
+ <property name="deployment.module.name" value="deployment"/>
+ <property name="deployment.module.output" value="${project.root}/${deployment.module.name}/target"/>
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy file="${deployment.module.output}/jboss-as-deployment-jboss-jsr88.jar"
+ tofile="${install.all.lib}/jboss-jsr88.jar" filtering="no"/>
+
+ <copy todir="${install.all.deploy}" filtering="no">
+ <fileset dir="${deployment.module.output}/etc">
+ <include name="jsr88-service.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy file="${deployment.module.output}/jboss-as-deployment.jar"
+ tofile="${install.client}/jboss-deployment.jar" filtering="no"/>
+
+ </target>
+
+ <target name="module-deployment-all" depends="module-deployment">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${deployment.module.name}"/>
+ <copy todir="${install.api}/${deployment.module.name}" filtering="no">
+ <fileset dir="${deployment.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated todo docs -->
+ <mkdir dir="${install.todo}/${deployment.module.name}"/>
+ <copy todir="${install.todo}/${deployment.module.name}" filtering="no" failonerror="false">
+ <fileset dir="${deployment.module.output}/todo">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- =========== -->
+ <!-- Webservices -->
+ <!-- =========== -->
+
+ <target name="module-webservices">
+ <property name="webservices.module.name" value="webservices"/>
+ <property name="webservices.module.output" value="${project.root}/${webservices.module.name}/target"/>
+
+ <unzip src="${org.jboss.ws.native:jbossws-native-resources:jar}"
+ dest="${install.bin}">
+ <patternset>
+ <include name="bin/wsconsume.bat"/>
+ <include name="bin/wsconsume.sh"/>
+ <include name="bin/wsprovide.bat"/>
+ <include name="bin/wsprovide.sh"/>
+ <include name="bin/wsrunclient.bat"/>
+ <include name="bin/wsrunclient.sh"/>
+ <include name="bin/wstools.bat"/>
+ <include name="bin/wstools.sh"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+
+ <!-- Install JBossWS jars to client directory -->
+ <copy file="${webservices.module.output}/jboss-as-webservices.jar"
+ tofile="${install.client}/jbossws-jboss60.jar" filtering="no" />
+
+ <available classname="java.io.Console" property="BUILT_ON_JDK6_AND_ABOVE"/>
+ <antcall target="install-jbossws-to-endorsed"/>
+
+ <antcall target="install-jbossws-to-deploy"/>
+ <antcall target="install-jbossws-to-deployers"/>
+ </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 file="${org.jboss.ws.native:jbossws-native-jaxrpc:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-jaxws:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-jaxws-ext:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-saaj:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+ </target>
+
+ <target name="install-jbossws-to-deploy">
+ <!-- Install JBossWS web console to deploy directory -->
+ <mkdir dir="${install.all.deploy}/jbossws.sar"/>
+ <unzip src="${org.jboss.ws.native: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="${webservices.module.output}/jboss-as-webservices-jbossws-jboss60-deployer.zip"/>
+ <copy todir="${install.all.deployers}/jbossws.deployer" flatten="true" overwrite="true">
+ <fileset file="${sun-fi:FastInfoset:jar}"/>
+ <fileset file="${jboss.jaxbintros:jboss-jaxb-intros:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-core:jar}"/>
+ <fileset file="${org.codehaus.jettison:jettison:jar}"/>
+ <fileset file="${wscommons-policy:policy:jar}"/>
+ <fileset file="${wsdl4j:wsdl4j:jar}"/>
+ <fileset file="${org.apache:xmlsec:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+ <copy todir="${install.all.deployers}/jbossws.deployer">
+ <fileset dir="${webservices.module.output}/jbossws-native-resources/resources/jbossws-jboss600/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.all.deployers}/jbossws.deployer/META-INF">
+ <fileset dir="${webservices.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 file="${org.jboss.ws:jbossws-common:jar}"/>
+ <fileset file="${org.jboss.ws:jbossws-framework:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+ </target>
+
+ <target name="module-webservices-all">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${webservices.module.name}"/>
+ <copy todir="${install.api}/${webservices.module.name}" filtering="no">
+ <fileset dir="${webservices.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated todo docs -->
+ <mkdir dir="${install.todo}/${webservices.module.name}"/>
+ <copy todir="${install.todo}/${webservices.module.name}" filtering="no" failonerror="false">
+ <fileset dir="${webservices.module.output}/todo">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ============ -->
+ <!-- Hibernate -->
+ <!-- ============ -->
+
+ <target name="module-hibernate-int">
+ <property name="hibernate.module.name" value="hibernate-int"/>
+ <property name="hibernate.module.output" value="${project.root}/${hibernate.module.name}/target"/>
+
+ <mkdir dir="${install.all.lib}"/>
+
+ <!-- The hibernate-int module output -->
+ <copy file="${hibernate.module.output}/jboss-as-hibernate-int.jar"
+ todir="${install.all.lib}/" filtering="no" />
+
+ <copy todir="${install.server}/all/deployers" filtering="no">
+ <fileset dir="${hibernate.module.output}/resources">
+ <include name="hibernate-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="module-hibernate-int-all" depends="module-hibernate-int">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${hibernate.module.name}"/>
+ <copy todir="${install.api}/${hibernate.module.name}" filtering="no">
+ <fileset dir="${hibernate.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================= -->
+ <!-- ProfileService -->
+ <!-- ================= -->
+
+ <target name="module-profileservice">
+
+ <property name="profileservice.module.name" value="profileservice"/>
+ <property name="profileservice.module.output" value="${project.root}/${profileservice.module.name}/target"/>
+
+ <mkdir dir="${install.all.lib}"/>
+
+ <!-- The profileservice module output -->
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${profileservice.module.output}/" includes="jboss-as-profileservice.jar"/>
+ </copy>
+ <!-- Copy the profileservice hdscanner bean to deploy -->
+ <copy todir="${install.server}/all/deploy/"
+ file="${profileservice.module.output}/resources/hdscanner-jboss-beans.xml" />
+ <!-- Copy the profileservice beans to an optional file -->
+ <copy todir="${install.server}/all/deploy/"
+ file="${profileservice.module.output}/resources/profileservice-jboss-beans.xml" />
+
+ </target>
+
+ <!-- ============ -->
+ <!-- Spring -->
+ <!-- ============ -->
+
+ <target name="module-spring-int">
+ <property name="spring-int.module.name" value="spring-int"/>
+ <property name="spring-int.module.output"
+ value="${project.root}/${spring-int.module.name}/output"/>
+
+ <!-- Uncomment this if you want jboss-spring.deployer in all configration -->
+ <!--
+ <mkdir dir="${install.server}/all/deploy/jboss-spring.deployer"/>
+ <unjar src="${_module.output}/lib/jboss-spring.deployer"
+ dest="${install.server}/all/deploy/jboss-spring.deployer"/>
+ -->
+ </target>
+
+ <target name="module-spring-int-all" depends="module-spring-int">
+ <mkdir dir="${install.api}/${spring-int.module.name}"/>
+ <copy todir="${install.api}/${spring-int.module.name}" filtering="no">
+ <fileset dir="${spring-int.module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ============================================================== -->
+ <!-- Thirdparty dependencies consumed directly from the repository -->
+ <!-- ============================================================== -->
+
+
+ <target name="thirdparty" description="Copy thirdparty dependencies from the repository">
+
+ <mkdir dir="${install.common.lib}"/>
+ <copy todir="${install.common.lib}" filtering="no">
+ <fileset file="${org.jboss.threads:jboss-threads:jar}"/>
+ <fileset file="${org.jboss.xnio:xnio-api:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-jaxrpc:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-jaxws:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-jaxws-ext:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-saaj:jar}"/>
+ <fileset file="${org.jboss.ws:jbossws-common:jar}"/>
+ <fileset file="${org.jboss.ws:jbossws-framework:jar}"/>
+ <fileset file="${org.jboss.ws:jbossws-spi:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <!-- Copy thirdparty libraries to server/all/lib -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset file="${antlr:antlr:jar}"/>
+ <fileset file="${commons-collections:commons-collections:jar}"/>
+ <fileset file="${org.jboss.cache:jbosscache-core:jar}"/>
+ <fileset file="${org.jboss.cache:jbosscache-pojo:jar}"/>
+ <fileset file="${org.jboss.security:jboss-negotiation:jar}"/>
+ <fileset file="${org.jboss.security:jboss-security-spi:jar}"/>
+ <fileset file="${org.jboss.security:jbosssx:jar}"/>
+ <fileset file="${org.jboss.security:jbossxacml:jar}"/>
+ <fileset file="${org.slf4j:slf4j-api:jar}"/>
+ <fileset file="${org.jboss.slf4j:slf4j-jboss-logging:jar}"/>
+ <fileset file="${log4j:log4j:jar}"/>
+ <fileset file="${quartz:quartz:jar}"/>
+ <fileset file="${commons-logging:commons-logging:jar}"/>
+ <fileset file="${jaxen:jaxen:jar}"/>
+ <fileset file="${org.jboss.cluster:jboss-ha-client:jar}"/>
+ <fileset file="${org.jboss.cluster:jboss-ha-server-api:jar}"/>
+ <fileset file="${org.jboss.cluster:jboss-ha-server-cache-spi:jar}"/>
+ <fileset file="${org.jboss.cluster:jboss-ha-server-cache-jbc:jar}"/>
+ <fileset file="${org.jboss.integration:jboss-integration:jar}"/>
+ <fileset file="${org.jboss.metadata:jboss-metadata:jar}"/>
+ <fileset file="${org.jboss.javaee:jboss-jaspi-api:jar}"/>
+ <fileset file="${org.jboss.javaee:jboss-javaee:jar}"/>
+ <fileset file="${org.jboss.naming:jnpserver:jar}"/>
+ <fileset file="${jgroups:jgroups:jar}"/>
+ <fileset file="${net.jcip:jcip-annotations:jar}"/>
+
+ <!-- copy binary release of JBossTS (JTA part) from thirdparty repo -->
+ <fileset file="${jboss.jbossts:jbossjta:jar}"/>
+ <fileset file="${jboss.jbossts:jbossjta-integration:jar}"/>
+ <fileset file="${jboss.jbossts:jbossts-common:jar}"/>
+
+ <fileset file="${org.jboss.remoting:jboss-remoting:jar}"/>
+ <fileset file="${jboss:jboss-serialization:jar}"/>
+
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-cache:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-common:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-core:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-deployers:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-endpoint:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-interceptors:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-metadata:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-mc-int:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-impl:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-spi:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-security:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-transactions:jar}"/>
+ <fileset file="${org.hibernate:hibernate-core:jar}"/>
+ <fileset file="${org.hibernate:hibernate-jmx:jar}"/>
+ <fileset file="${org.hibernate:hibernate-jbosscache2:jar}"/>
+ <fileset file="${org.hibernate:hibernate-commons-annotations:jar}"/>
+ <fileset file="${org.hibernate:ejb3-persistence:jar}"/>
+ <fileset file="${org.hibernate:hibernate-entitymanager:jar}"/>
+ <fileset file="${org.hibernate:hibernate-annotations:jar}"/>
+ <fileset file="${org.hibernate:hibernate-validator:jar}"/>
+ <fileset file="${org.jboss.jpa:jboss-jpa-deployers:jar}"/>
+ <fileset file="${org.jboss.aspects:jboss-current-invocation-aspects:jar}"/>
+ <fileset file="${org.jboss.aspects:jboss-remoting-aspects:jar}"/>
+ <fileset file="${org.jboss.aspects:jboss-security-aspects:jar}"/>
+ <fileset file="${org.jboss.aspects:jboss-transaction-aspects:jar}"/>
+ <fileset file="${bcel:bcel:jar}"/>
+ <fileset file="${javax.mail:mail:jar}"/>
+ <fileset file="${jboss.messaging:jboss-messaging:jar}"/>
+ <fileset file="${org.beanshell:bsh:jar}"/>
+ <fileset file="${joesnmp:joesnmp:jar}"/>
+ <fileset file="${wutka-dtdparser:dtdparser:jar}"/>
+ <fileset file="${apache-bsf:bsf:jar}"/>
+ <fileset file="${jboss.web:el-api:jar}"/>
+ <fileset file="${jboss.web:jsp-api:jar}"/>
+ <fileset file="${jboss.web:servlet-api:jar}"/>
+ <fileset file="${jacorb:jacorb:jar}"/>
+ <fileset file="${apache-avalon:avalon-framework:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+ <copy file="${snmptrapappender:snmpTrapAppender:jar}"
+ tofile="${install.all.lib}/log4j-snmp-appender.jar"/>
+
+
+ <!-- Copy the generated libraries to lib-->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
+ <fileset file="${javassist:javassist:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop:jar}"/>
+ <fileset file="${org.jboss.bootstrap:jboss-bootstrap:jar}"/>
+ <fileset file="${org.jboss:jboss-common-core:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-spi:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-jdk:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
+ <fileset file="${org.jboss.logbridge:jboss-logbridge:jar}"/>
+ <fileset file="${org.jboss.logmanager:jboss-logmanager:jar}"/>
+ <fileset file="${org.jboss.integration:jboss-classloading-spi:jar}"/>
+ <fileset file="${org.jboss.integration:jboss-profileservice-spi:jar}"/>
+ <fileset file="${org.jboss:jboss-reflect:jar}"/>
+ <fileset file="${org.jboss:jboss-mdr:jar}"/>
+ <fileset file="${org.jboss.man:jboss-managed:jar}"/>
+ <fileset file="${org.jboss.man:jboss-metatype:jar}"/>
+ <fileset file="${oswego-concurrent:concurrent:jar}"/>
+ <fileset file="${dom4j:dom4j:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-j2se:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-mbeans:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-jmx:jar}"/>
+ <fileset file="${org.jboss.cl:jboss-classloader:jar}"/>
+ <fileset file="${org.jboss.cl:jboss-classloading:jar}"/>
+ <fileset file="${org.jboss.cl:jboss-classloading-vfs:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-client:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-client-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-core:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-core-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-impl:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-structure-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-vfs:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-vfs-spi:jar}"/>
+ <fileset file="${org.jboss.microcontainer:jboss-aop-mc-int:jar}"/>
+ <fileset file="${org.jboss.microcontainer:jboss-dependency:jar}"/>
+ <fileset file="${org.jboss.microcontainer:jboss-kernel:jar}"/>
+ <fileset file="${org.jboss:jboss-vfs:jar}"/>
+ <fileset file="${org.osgi:osgi_R4_core:jar}"/>
+ <fileset file="${trove:trove:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-impl:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-xjc:jar}"/>
+ <fileset file="${org.codehaus.woodstox:wstx-lgpl:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop-asintegration-core:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop-asintegration-jmx:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop-asintegration-mc:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop-deployers:jar}"/>
+ <fileset file="${gnu-getopt:getopt:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+ <!--
+ - Note: this is copied separately because the name (jboss-xml-binding) is
+ - hardcoded in the wsconsume scripts. Once this is changed
+ - in the scripts, this should be added to the list of lib jars above
+ -->
+ <copy file="${org.jboss:jbossxb:jar}"
+ tofile="${install.lib}/jboss-xml-binding.jar"/>
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset file="${antlr:antlr:jar}"/>
+ <fileset file="${commons-logging:commons-logging:jar}"/>
+ <fileset file="${org.apache:xmlsec:jar}"/>
+ <fileset file="${wsdl4j:wsdl4j:jar}"/>
+ <fileset file="${javassist:javassist:jar}"/>
+ <fileset file="${org.jboss:jboss-common-core:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-spi:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-jdk:jar}"/>
+ <fileset file="${org.jboss.logging:jboss-logging-log4j:jar}"/>
+ <fileset file="${org.slf4j:slf4j-api:jar}"/>
+ <fileset file="${org.jboss.slf4j:slf4j-jboss-logging:jar}"/>
+ <fileset file="${org.jboss.integration:jboss-integration:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
+ <fileset file="${org.jboss.javaee:jboss-jaspi-api:jar}"/>
+ <fileset file="${org.jboss.javaee:jboss-javaee:jar}"/>
+ <fileset file="${org.jboss.security:jboss-security-spi:jar}"/>
+ <fileset file="${org.jboss.naming:jnp-client:jar}"/>
+ <fileset file="${org.jboss.security:jbosssx-client:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-j2se:jar}"/>
+ <fileset file="${org.jboss.mx:jboss-jmx:jar}"/>
+ <fileset file="${org.jboss.metadata:jboss-metadata:jar}"/>
+ <fileset file="${org.jboss:jboss-mdr:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-client:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-client-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-core:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-core-spi:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-vfs:jar}"/>
+ <fileset file="${org.jboss.deployers:jboss-deployers-vfs-spi:jar}"/>
+ <fileset file="${org.jboss.remoting:jboss-remoting:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-client:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-core:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-jaxrpc:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-jaxws-ext:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-jaxws:jar}"/>
+ <fileset file="${org.jboss.ws.native:jbossws-native-saaj:jar}"/>
+ <fileset file="${org.jboss.ws:jbossws-common:jar}"/>
+ <fileset file="${org.jboss.ws:jbossws-framework:jar}"/>
+ <fileset file="${org.jboss.ws:jbossws-spi:jar}"/>
+ <fileset file="${jboss:jboss-serialization:jar}"/>
+ <fileset file="${org.jboss.cluster:jboss-ha-client:jar}"/>
+ <fileset file="${javax.activation:activation:jar}"/>
+ <fileset file="${javax.mail:mail:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-impl:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-xjc:jar}"/>
+ <fileset file="${sun-jaxws:jaxws-tools:jar}"/>
+ <fileset file="${sun-jaxws:jaxws-rt:jar}"/>
+ <fileset file="${sun-jaxws:stax-ex:jar}"/>
+ <fileset file="${sun-jaxws:streambuffer:jar}"/>
+ <fileset file="${trove:trove:jar}"/>
+ <fileset file="${org.codehaus.woodstox:wstx-lgpl:jar}"/>
+ <fileset file="${wscommons-policy:policy:jar}"/>
+ <fileset file="${org.hibernate:ejb3-persistence:jar}"/>
+ <fileset file="${org.hibernate:hibernate-annotations:jar}"/>
+ <fileset file="${org.jboss.aop:jboss-aop:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api:jar}"/>
+ <!-- For JSR-250 impl -->
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-common:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-core:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client}"/>
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-security:jar:client}"/>
+ <fileset file="${log4j:log4j:jar}"/>
+ <fileset file="${gnu-getopt:getopt:jar}"/>
+ <fileset file="${oswego-concurrent:concurrent:jar}"/>
+ <fileset file="${jboss.messaging:jboss-messaging-client:jar}"/>
+ <fileset file="${org.jboss.security:jbosssx-client:jar}"/>
+ <fileset file="${apache-scout:scout:jar}"/>
+ <fileset file="${jacorb:jacorb:jar}"/>
+ <fileset file="${apache-avalon:avalon-framework:jar}"/>
+ <fileset file="${apache-avalon-logkit:logkit:jar}"/>
+ <fileset file="${sun-fi:FastInfoset:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-api:jar}"/>
+ <fileset file="${stax:stax-api:jar}"/>
+ <fileset file="${org.codehaus.jettison:jettison:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+ <!--
+ - Note: this is copied separately because the name (jboss-xml-binding) is
+ - hardcoded in the wsconsume scripts. Once this is changed
+ - in the scripts, this should be added to the list of client jars above
+ -->
+ <copy file="${org.jboss:jbossxb:jar}"
+ tofile="${install.client}/jboss-xml-binding.jar"/>
+
+ <!-- Copy thirdparty code to lib/endorsed -->
+ <mkdir dir="${install.lib}/endorsed"/>
+ <copy todir="${install.lib}/endorsed" filtering="no">
+ <fileset file="${xerces:xercesImpl:jar}"/>
+ <fileset file="${apache-xerces:resolver:jar}"/>
+ <fileset file="${apache-xalan:xalan:jar}"/>
+ <fileset file="${apache-xalan:serializer:jar}"/>
+ <fileset file="${sun-jaxb:jaxb-api:jar}"/>
+ <fileset file="${javax.activation:activation:jar}"/>
+ <fileset file="${stax:stax-api:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <!-- avoid the duplicate copying of jaxb/stax apis from jbossws macros -->
+ <delete file="${install.lib}/jaxb-api.jar"/>
+ <delete file="${install.lib}/stax-api.jar"/>
+
+ <!-- Unpack the javaee dtds/schemas from jboss-metadata.jar -->
+ <mkdir dir="${install.dtd}"/>
+ <mkdir dir="${install.schema}"/>
+ <unzip src="${org.jboss.metadata:jboss-metadata:jar}" dest="${install.docs}">
+ <patternset>
+ <include name="dtd/*"/>
+ <include name="schema/*"/>
+ </patternset>
+ </unzip>
+
+ <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
+
+ <unzip src="${jacorb:resources:jar}" dest="${install.all.conf}">
+ <patternset>
+ <include name="resources/jacorb.properties"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+
+ <mkdir dir="${install.examples}/jts"/>
+ <copy todir="${install.examples}/jts" filtering="no">
+ <fileset file="${jboss.jbossts:jbossjts:jar}"/>
+ <fileset file="${jboss.jbossts:jbossjts-integration:jar}"/>
+ <fileset file="${jboss.jbossts:jbossjts-jacorb:jar}"/>
+ <fileset file="${jboss.jbossts:jbossts-tools:sar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <unzip src="${jboss.jbossts:resources:jar}" dest="${install.examples}/jts">
+ <patternset>
+ <include name="resources/jbossjts-properties.xml"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+ <!-- copy JBossTS JTS install script and instructions from jbossas-jts module -->
+ <copy todir="${install.examples}/jts" filtering="no">
+ <fileset dir="${project.root}/jbossas-jts">
+ <include name="README.txt"/>
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
+
+ <chmod perm="+x">
+ <fileset dir="${install.bin}">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
+
+ <copy todir="${install.server}/all/deployers" filtering="no">
+ <fileset file="${org.jboss.ejb3:jboss-ejb3-endpoint-deployer:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <unzip dest="${install.server}/all/deployers">
+ <fileset file="${org.jboss.webbeans.integration:webbeans-ri-int-deployer:zip}"/>
+ </unzip>
+
+ <!-- Copy varia stuff -->
+
+ <!-- Include the juddi sar unpacked -->
+ <mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
+ <unjar src="${org.jboss.jaxr:juddi-service:sar}"
+ dest="${install.server}/all/deploy/juddi-service.sar" />
+
+ <!-- copy scout.jar and juddi.jar to juddi-service.sar directory -->
+ <copy todir="${install.server}/all/deploy/juddi-service.sar" filtering="no">
+ <fileset file="${apache-scout:scout:jar}"/>
+ <fileset file="${juddi:juddi:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <!-- Create optional libs; e.g. seam-integration -->
+ <mkdir dir="${install.server}/all/deployers/seam.deployer/lib-int"/>
+ <copy todir="${install.server}/all/deployers/seam.deployer/lib-int" filtering="no">
+ <fileset file="${org.jboss.seam.integration:jboss-seam-int-jbossas:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <!-- copy the threads deployer files into their proper places -->
+ <mkdir dir="${install.server}/all/deployers/jboss-threads.deployer/META-INF"/>
+ <copy todir="${install.server}/all/deployers/jboss-threads.deployer">
+ <fileset file="${org.jboss.threads:jboss-threads-metadata:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <!-- copy the xnio deployer files into their proper places -->
+ <mkdir dir="${install.server}/all/deploy/xnio-provider.jar/META-INF"/>
+ <copy todir="${install.server}/all/deploy/xnio-provider.jar">
+ <fileset file="${org.jboss.xnio:xnio-nio:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+
+ <mkdir dir="${install.server}/all/deployers/xnio.deployer/META-INF"/>
+ <copy todir="${install.server}/all/deployers/xnio.deployer">
+ <fileset file="${org.jboss.xnio:xnio-metadata:jar}"/>
+ <mapper classpathref="maven-ant-tasks.classpath"
+ classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${pom.dependencies.versions}" to="flatten" />
+ </copy>
+ <!-- End varia stuff -->
+ </target>
</project>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2009-05-20 21:34:32 UTC (rev 89217)
+++ trunk/build/pom.xml 2009-05-20 21:56:29 UTC (rev 89218)
@@ -109,8 +109,7 @@
<configuration>
<tasks>
<ant antfile="build.xml">
- <target name="modules-most"/>
- <target name="install"/>
+ <target name="dist"/>
</ant>
</tasks>
</configuration>
@@ -124,7 +123,7 @@
<configuration>
<tasks>
<ant antfile="build.xml">
- <target name="_buildmagic:clean"/>
+ <target name="clean"/>
</ant>
</tasks>
</configuration>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-05-20 21:34:32 UTC (rev 89217)
+++ trunk/component-matrix/pom.xml 2009-05-20 21:56:29 UTC (rev 89218)
@@ -1092,6 +1092,12 @@
</dependency>
<dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.0-RC2</version>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.0</version>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2009-05-20 21:34:32 UTC (rev 89217)
+++ trunk/thirdparty/pom.xml 2009-05-20 21:56:29 UTC (rev 89218)
@@ -1834,6 +1834,10 @@
<artifactId>wstx-lgpl</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_compendium</artifactId>
</dependency>
Modified: trunk/tools/maven/ant-tasks/maven-ant-tasks-2.0.10-SNAPSHOT.jar
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list