[jboss-cvs] JBoss Messaging SVN: r7888 - branches/Branch_1_4.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 2 00:13:41 EST 2009
Author: gaohoward
Date: 2009-11-02 00:13:41 -0500 (Mon, 02 Nov 2009)
New Revision: 7888
Added:
branches/Branch_1_4/build-messaging-EAP5.xml
branches/Branch_1_4/build-thirdparty-EAP5.xml
Modified:
branches/Branch_1_4/build-messaging.xml
branches/Branch_1_4/build.properties
branches/Branch_1_4/build.xml
Log:
JBMESSAGING-1755
Added: branches/Branch_1_4/build-messaging-EAP5.xml
===================================================================
--- branches/Branch_1_4/build-messaging-EAP5.xml (rev 0)
+++ branches/Branch_1_4/build-messaging-EAP5.xml 2009-11-02 05:13:41 UTC (rev 7888)
@@ -0,0 +1,102 @@
+<project name="JBoss Messaging AS5 Include">
+ <!--
+ Non-JBoss dependencies.
+ They must available in the repository and declared as <componentrefs> in build-thirdparty.xml.
+ -->
+ <path id="external.dependencies.classpath" >
+ <path refid="apache.logging.classpath" />
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jgroups.jgroups.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ </path>
+
+ <!--
+ JBoss dependencies.
+ They must available in the repository and declared as <componentrefs> in build-thirdparty.xml.
+
+ NOTE: If one of JBoss dependencies (jboss-remoting.jar) is locally
+ present in ./lib, it will take precedence over the corresponding repository instance.
+ -->
+
+ <path id="jboss.dependencies.classpath">
+ <path refid="jboss.common.core.classpath"/>
+ <path refid="jboss.common.logging.jdk.classpath"/>
+ <path refid="jboss.common.logging.log4j.classpath"/>
+ <path refid="jboss.common.logging.spi.classpath"/>
+ <path refid="jboss.jboss.mdr.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.jbossts.classpath"/>
+ <path refid="jbossas.core.libs.classpath"/>
+ <!-- some components at JBoss use JBossSerialization (JCA for instance) -->
+ <path refid="jboss.serialization.classpath"/>
+ </path>
+
+ <!--
+ The compilation classpath.
+ -->
+ <path id="compilation.classpath">
+ <path refid="external.dependencies.classpath"/>
+ <path refid="jboss.dependencies.classpath"/>
+ </path>
+
+ <!--
+ The AOPC classpath.
+ -->
+ <path id="aopc.classpath">
+ <path refid="compilation.classpath"/>
+ <pathelement path="${build.classes}"/>
+ </path>
+
+
+ <target name="instrument-classes">
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
+ <echo message="NOTE: aopc incremental compilation might fail, if so do an ant clean first (see JBMESSAGING-271)"/>
+ <aopc compilerclasspathref="aopc.classpath"
+ classpathref="aopc.classpath"
+ verbose="false">
+ <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
+ <classpath refid="aopc.classpath"/>
+ <src path="${build.classes}/org/jboss/jms"/>
+ <aoppath path="${source.etc}/prepare-aop.xml"/>
+ </aopc>
+ </target>
+
+ <!-- Note: This target must be ran after the smoke test -->
+ <target name="examples" depends="release-structure">
+ <copy todir="${release.output}/examples">
+ <fileset dir="./docs/examples" excludes="examples.properties">
+ <exclude name="programmatic-deployment"/>
+ <exclude name="stateless-clustered/**"/>
+ <exclude name="**/*/build.xml*"/>
+ </fileset>
+ </copy>
+ <copy todir="${release.output}/examples">
+ <fileset dir="./docs/examples">
+ <exclude name="stateless-clustered/**"/>
+ </fileset>
+ <globmapper from="*build.xml.AS5" to="*build.xml"/>
+ </copy>
+ <copy todir="${release.output}/examples/config">
+ <fileset dir="${integration-dir}/etc/server/default/deploy">
+ <include name="*-persistence-service.xml"/>
+ <include name="*-ds.xml"/>
+ </fileset>
+ <fileset dir="${integration-dir}/etc/remoting">
+ <include name="servlet-invoker.war/**/*"/>
+ <include name="*-service.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="extra" depends="examples" description="create an example package for AS5">
+ <mkdir dir="${build.lib}"/>
+ <zip destfile="${build.lib}/jbm-examples-${messaging.version.major}.${messaging.version.minor}.${messaging.version.revision}.zip">
+ <zipfileset dir="${release.output}/examples" prefix="extra/jbm-examples"/>
+ </zip>
+ </target>
+
+
+</project>
Modified: branches/Branch_1_4/build-messaging.xml
===================================================================
--- branches/Branch_1_4/build-messaging.xml 2009-11-02 05:01:30 UTC (rev 7887)
+++ branches/Branch_1_4/build-messaging.xml 2009-11-02 05:13:41 UTC (rev 7888)
@@ -156,8 +156,14 @@
<!-- Compilation Tasks -->
<!-- ======================================================================================== -->
+ <target name="show.version">
+ <echo message="========================================" />
+ <echo message="Building ${module.version} for ${integration.base}!" />
+ <echo message="========================================" />
+ </target>
+
<target name="compile"
- depends="compile-parsers, compile-classes, compile-etc"/>
+ depends="show.version, compile-parsers, compile-classes, compile-etc"/>
<target name="compile-parsers">
Added: branches/Branch_1_4/build-thirdparty-EAP5.xml
===================================================================
--- branches/Branch_1_4/build-thirdparty-EAP5.xml (rev 0)
+++ branches/Branch_1_4/build-thirdparty-EAP5.xml 2009-11-02 05:13:41 UTC (rev 7888)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- =========================================================================================== -->
+<!-- -->
+<!-- JBoss, Home of Professional Open Source -->
+<!-- Copyright 2005, JBoss Inc., and individual contributors as indicated -->
+<!-- by the @authors tag. See the copyright.txt in the distribution for a -->
+<!-- full listing of individual contributors. -->
+<!-- -->
+<!-- This is free software; you can redistribute it and/or modify it -->
+<!-- under the terms of the GNU Lesser General Public License as -->
+<!-- published by the Free Software Foundation; either version 2.1 of -->
+<!-- the License, or (at your option) any later version. -->
+<!-- -->
+<!-- This software is distributed in the hope that it will be useful, -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
+<!-- Lesser General Public License for more details. -->
+<!-- -->
+<!-- You should have received a copy of the GNU Lesser General Public -->
+<!-- License along with this software; if not, write to the Free -->
+<!-- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -->
+<!-- 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
+<!-- -->
+<!-- =========================================================================================== -->
+
+
+<!-- =========================================================================================== -->
+<!-- -->
+<!-- $Id$ -->
+<!-- -->
+<!-- =========================================================================================== -->
+
+<project name="main.build" default="synchronize">
+
+ <!-- ======================================================================================== -->
+ <!-- Configuration -->
+ <!-- ======================================================================================== -->
+
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property name="librariesEntFile" value="./thirdparty/libraries.ent"/>
+
+ <property environment="ENV"/>
+
+ <!--
+ | Allow jbossbuild.repository to be set from (in order or priority)
+ | 1) Command line -Djbossbuild.repository=...
+ | 2) synchronize.properties jbossbuild.repository setting
+ | 3) JBOSS_REPOSITORY environment variable
+ -->
+ <condition property="jbossbuild.repository" value="${ENV.JBOSS_REPOSITORY}">
+ <isset property="ENV.JBOSS_REPOSITORY"/>
+ </condition>
+
+ <!--
+ | Fall back to default.
+ -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+ <import file="./tools/etc/jbossbuild/tasks.xml"/>
+
+ <!--
+ | This is where JBoss Messaging external dependencies are declared. The repository is in CVS
+ | under the module repository.jboss.com whose contents are pushed to the
+ | http://repository.jboss.com site.
+ -->
+ <build id="jboss-messaging"
+ impltitle="JBoss Messaging"
+ implversion="undefined"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Messaging"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="./thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
+
+
+ <!--
+ Dependencies required to build the project.
+ -->
+ <componentref name="retrotranslator" version="0.9.6jboss"/>
+ <componentref name="sun-javacc" version="4.0"/>
+ <componentref name="oswego-concurrent" version="1.3.4-jboss-update1"/>
+ <componentref name="apache-log4j" version="1.2.14"/>
+ <componentref name="javassist" version="3.9.0.GA"/>
+ <componentref name="jgroups" version="2.6.13.GA-brew"/>
+ <componentref name="trove" version="1.0.2"/>
+ <componentref name="jboss/common-core" version="2.2.14.GA"/>
+ <componentref name="jboss/common-logging-jdk" version="2.1.0.GA"/>
+ <componentref name="jboss/common-logging-log4j" version="2.1.0.GA"/>
+ <componentref name="jboss/common-logging-spi" version="2.1.0.GA"/>
+ <componentref name="jboss/jboss-mdr" version="2.0.1.GA"/>
+ <componentref name="jboss/aop" version="2.1.4.GA-brew"/>
+ <componentref name="jboss/remoting" version="2.5.2-brew"/>
+ <componentref name="jboss/jbossts" version="4.6.1.GA_CP03-brew"/>
+ <componentref name="jbossas/core-libs" version="4.2.0.GA"/>
+
+
+ <!-- <componentref name="jboss/microcontainer" version="2.0.0.Beta5"/>
+ <componentref name="jboss/jboss-security-spi" version="2.0.1.GA"/>
+ <componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
+ <componentref name="jboss/integration" version="5.0.0.Beta4"/>
+ <componentref name="org/jboss/jbosssx-client" version="2.0.1.GA"/>
+ <componentref name="org/jboss/jboss-javaee" version="5.0.0.Beta3Update1"/>
+ <componentref name="org/jboss/jboss-common-logging-spi" version="2.0.4.GA"/> -->
+
+
+
+ <!--
+ Totally unapropriate here, but this is what we need to do for the time being if we
+ want HTTP.
+ See http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4022727 for more details.
+ -->
+ <componentref name="apache-tomcat" version="5.5.15"/>
+
+ <!--
+ Dependencies required to test the project.
+ -->
+ <componentref name="junit" version="3.8.2-brew"/>
+ <componentref name="hsqldb" version="1.8.0.8-brew"/>
+ <componentref name="dom4j" version="1.6.1"/>
+ <componentref name="apache-xerces" version="2.9.1"/> <!-- needed by org.jboss.logging.Log4jLoggerPlugin -->
+ <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
+ <componentref name="jboss/jbossxb" version="2.0.0.GA"/>
+ <componentref name="jboss/test14" version="1.0.0.GA"/>
+
+ <!-- This is a non declared dependency of jboss/test14 -->
+ <componentref name="jboss/jbossretro-rt" version="1.0.5.GA"/>
+ <!-- This is a non declared dependency of jboss/test14 -->
+ <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
+
+
+ </build>
+
+ <synchronizeinfo/>
+
+ <!--
+ | Generate the targets.
+ -->
+ <generate generate="jboss-messaging"/>
+
+ <target name="generate-libraries-ent" depends="synchronize">
+ <gen-lib-file path="tools/etc/buildmagic" filename="${librariesEntFile}"/>
+ <visit-componentref-graph componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
+ </target>
+
+</project>
Modified: branches/Branch_1_4/build.properties
===================================================================
--- branches/Branch_1_4/build.properties 2009-11-02 05:01:30 UTC (rev 7887)
+++ branches/Branch_1_4/build.properties 2009-11-02 05:13:41 UTC (rev 7888)
@@ -10,6 +10,6 @@
#integration.base=AS5
-integration.base=EAP4
+#integration.base=EAP4
-#integration.base=EAP5
+integration.base=EAP5
Modified: branches/Branch_1_4/build.xml
===================================================================
--- branches/Branch_1_4/build.xml 2009-11-02 05:01:30 UTC (rev 7887)
+++ branches/Branch_1_4/build.xml 2009-11-02 05:13:41 UTC (rev 7888)
@@ -69,6 +69,10 @@
<ant antfile="build-messaging.xml" target="compile"/>
</target>
+ <target name="show.version">
+ <ant antfile="build-messaging.xml" target="show.version"/>
+ </target>
+
<target name="sar" depends="createthirdparty">
<ant antfile="build-messaging.xml" target="sar"/>
</target>
More information about the jboss-cvs-commits
mailing list