[jboss-cvs] JBossAS SVN: r99654 - in branches/JBPAPP_5_0_HornetQ: build and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 20 07:12:27 EST 2010
Author: ataylor
Date: 2010-01-20 07:12:26 -0500 (Wed, 20 Jan 2010)
New Revision: 99654
Added:
branches/JBPAPP_5_0_HornetQ/hornetq/
branches/JBPAPP_5_0_HornetQ/hornetq/build.xml
branches/JBPAPP_5_0_HornetQ/hornetq/pom.xml
branches/JBPAPP_5_0_HornetQ/hornetq/src/
branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/
branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/build.xml
branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/docs/
branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/docs/README.txt
branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/java-ee-common-build.xml
branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/javaee-example-ant.properties
branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/jms-common-build.xml
branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/jms-example-ant.properties
Modified:
branches/JBPAPP_5_0_HornetQ/build/build-distr.xml
branches/JBPAPP_5_0_HornetQ/build/build.xml
branches/JBPAPP_5_0_HornetQ/build/jbossas-5-ewp-production.patch
branches/JBPAPP_5_0_HornetQ/component-matrix/pom.xml
branches/JBPAPP_5_0_HornetQ/hibernate-int/build.xml
branches/JBPAPP_5_0_HornetQ/pom.xml
branches/JBPAPP_5_0_HornetQ/thirdparty/pom.xml
Log:
first pass of latest hornetq integration
Modified: branches/JBPAPP_5_0_HornetQ/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/build/build-distr.xml 2010-01-20 11:31:28 UTC (rev 99653)
+++ branches/JBPAPP_5_0_HornetQ/build/build-distr.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -785,7 +785,24 @@
</copy>
</target>
+ <!-- ==== -->
+ <!-- HornetQ -->
<!-- ==== -->
+
+ <target name="_module-hornetq-most">
+ <property name="_module.name" value="hornetq" override="true"/>
+ <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+ <copy todir="${install.root}">
+ <fileset dir="${_module.output}">
+ <include name="hornetq/**/*"/>
+ <exclude name="hornetq/*sources.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="_module-hornetq-all" depends="_module-hornetq-most"/>
+
+ <!-- ==== -->
<!-- J2SE -->
<!-- ==== -->
Modified: branches/JBPAPP_5_0_HornetQ/build/build.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/build/build.xml 2010-01-20 11:31:28 UTC (rev 99653)
+++ branches/JBPAPP_5_0_HornetQ/build/build.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -131,6 +131,7 @@
<module name="management"/>
<module name="mbeans"/>
<module name="messaging"/>
+ <module name="hornetq"/>
<module name="jbossas/remoting"/>
<module name="jmx-remoting"/>
<module name="jbossas/jmx-remoting"/>
@@ -170,6 +171,7 @@
jmx-remoting,
jbossas/jmx-remoting,
messaging,
+ hornetq,
cluster,
varia,
iiop,
@@ -319,6 +321,11 @@
<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"/>
+
+ <property name="install.hornetq" value="${install.server}/hornetq"/>
+ <property name="install.hornetq.lib" value="${install.hornetq}/lib"/>
+ <property name="install.hornetq.deploy" value="${install.hornetq}/deploy"/>
+ <property name="install.hornetq.conf" value="${install.hornetq}/conf"/>
<!-- libs shared by the server configurations -->
<property name="install.common" value="${install.root}/common"/>
@@ -538,7 +545,19 @@
<ant antfile="build-distr.xml" target="_module-messaging-all"/>
</target>
+ <!-- ========= -->
+ <!-- HornetQ -->
+ <!-- ========= -->
+ <target name="_module-hornetq-most">
+ <ant antfile="build-distr.xml" target="_module-hornetq-most"/>
+ </target>
+
+ <target name="_module-hornetq-all" depends="_module-hornetq-most">
+ <ant antfile="build-distr.xml" target="_module-messaging-all"/>
+ </target>
+
+
<!-- ==== -->
<!-- J2SE -->
<!-- ==== -->
@@ -833,8 +852,23 @@
<delete file="${install.client}/jboss-messaging-client.jar"/>
<delete dir="${install.default}/deployers/bsh.deployer"/>
- <delete dir="${install.production}/deployers/bsh.deployer"/>
+ <delete dir="${install.production}/deployers/bsh.deployer"/>
+ <!-- default is not clustered, do not deploy cluster stuff -->
+ <delete dir="${install.default}/deploy/cluster"/>
+ <delete dir="${install.default}/deploy-hasingleton"/>
+ <delete dir="${install.default}/farm"/>
+ <delete file="${install.default}/lib/jgroups.jar"/>
+ <delete file="${install.default}/lib/jbosscache-core.jar"/>
+ <delete file="${install.default}/lib/jbosscache-pojo.jar"/>
+ <delete file="${install.default}/lib/hibernate-jbosscache2.jar"/>
+
+ <!-- Nor use this config as the beans will not work -->
+ <delete file="${install.default}/deployers/clustering-deployer-jboss-beans.xml"/>
+
+ <!-- Nor use this config as it is not correct (see JBPAPP-3230) -->
+ <delete file="${install.production}/farm/cluster-examples-service.xml"/>
+
<!-- end delete client and deployers litter -->
<!-- Change some defauls in the production config -->
@@ -1067,6 +1101,14 @@
<include name="lib/jgroups.jar"/>
</fileset>
</copy>
+
+ <!--Build hornetq config manually-->
+ <copy todir="${install.hornetq}">
+ <fileset dir="${install.default}">
+ <exclude name="**/messaging/**"/>
+ <exclude name="conf/login-config.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- Partition the default single configuration build into a
Modified: branches/JBPAPP_5_0_HornetQ/build/jbossas-5-ewp-production.patch
===================================================================
--- branches/JBPAPP_5_0_HornetQ/build/jbossas-5-ewp-production.patch 2010-01-20 11:31:28 UTC (rev 99653)
+++ branches/JBPAPP_5_0_HornetQ/build/jbossas-5-ewp-production.patch 2010-01-20 12:12:26 UTC (rev 99654)
@@ -12,3 +12,17 @@
<!-- Use jdk1.5 features in jsp pages -->
<init-param>
<param-name>compilerSourceVM</param-name>
+--- server/production/deploy/cluster/ha-legacy-jboss-beans.xml.orig 2010-01-19 19:39:59.000000000 -0500
++++ server/production/deploy/cluster/ha-legacy-jboss-beans.xml 2010-01-19 19:42:25.000000000 -0500
+@@ -109,11 +109,6 @@
+ <!-- Distributed EJB2 entity cache invalidation -->
+ <!-- ==================================================================== -->
+
+- <bean name="JGCacheInvalidationBridge"
+- class="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge">
+-
+- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=InvalidationBridge,type=JavaGroups", exposedInterface=org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridgeMBean.class, registerDirectly=true)</annotation>
+-
+ <!-- Partition used for group RPCs -->
+ <property name="HAPartition"><inject bean="HAPartition"/></property>
+ <property name="invalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></property>
Modified: branches/JBPAPP_5_0_HornetQ/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/component-matrix/pom.xml 2010-01-20 11:31:28 UTC (rev 99653)
+++ branches/JBPAPP_5_0_HornetQ/component-matrix/pom.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -40,6 +40,7 @@
<version.jboss.jbossws-spi>1.1.2.SP1</version.jboss.jbossws-spi>
<version.jboss.jbossws>3.1.2.SP3-patch-02</version.jboss.jbossws>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
+ <version.org.jboss.netty>3.1.5.GA</version.org.jboss.netty>
<version.jboss.messaging>1.4.6.GA</version.jboss.messaging>
<version.jboss.web>2.1.3.GA</version.jboss.web>
<version.jgroups>2.6.13.GA</version.jgroups>
@@ -95,6 +96,7 @@
<version.org.jboss.vfs>2.1.3.SP1</version.org.jboss.vfs>
<version.org.jboss.xnio.metadata>1.0.1.GA</version.org.jboss.xnio.metadata>
<version.org.jboss.xnio>1.2.1.GA</version.org.jboss.xnio>
+ <version.org.hornetq>2.0.0.GA</version.org.hornetq>
<version.org.slf4j>1.5.8</version.org.slf4j>
<version.org.springframework>2.5.6.SEC01</version.org.springframework>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
@@ -298,7 +300,13 @@
<artifactId>bsf</artifactId>
<version>2.4.0</version>
</dependency>
-
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ </dependency>
+
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
@@ -923,8 +931,74 @@
<artifactId>resources</artifactId>
<version>${version.jboss.messaging}</version>
</dependency>
-
+
<dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jboss-as-integration</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-logging</artifactId>
+ <version>${version.org.hornetq}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${version.org.jboss.netty}</version>
+ </dependency>
+
+ <dependency>
<groupId>jboss.profiler.jvmti</groupId>
<artifactId>jboss-profiler-jvmti</artifactId>
<version>1.0.0.CR5</version>
Modified: branches/JBPAPP_5_0_HornetQ/hibernate-int/build.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/hibernate-int/build.xml 2010-01-20 11:31:28 UTC (rev 99653)
+++ branches/JBPAPP_5_0_HornetQ/hibernate-int/build.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -93,7 +93,7 @@
<!-- Specify modules upon which this build depends -->
<path id="dependentmodule.classpath">
- <path refid="org.hibernate.classpath"/>
+ <path refid="hibernate.hibernate.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
Added: branches/JBPAPP_5_0_HornetQ/hornetq/build.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/hornetq/build.xml (rev 0)
+++ branches/JBPAPP_5_0_HornetQ/hornetq/build.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<project default="main" name="JBoss/HornetQ Integration">
+
+ <!-- ================================================================== -->
+ <!-- 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.
+ -->
+
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+
+ &buildmagic;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Configure the build system.
+ |
+ | This target is invoked by the Buildmagic initialization logic and
+ | should contain module specific configuration elements.
+ -->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+ <property name="module.name" value="messagin2g"/>
+ <property name="module.Name" value="JBoss Messaging 2 Integration"/>
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+ &libraries;
+
+ <!-- ======= -->
+ <!-- Modules -->
+ <!-- ======= -->
+ &modules;
+ <call target="_default:task-init"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+ <target name="compile" depends="_default:compile-etc"
+ description="Compile all source files."/>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars">
+ <property name="hornetq.dir" value="output/hornetq"/>
+ <copy todir="${hornetq.dir}">
+ <fileset dir="${org.hornetq.lib}"/>
+ <fileset dir="${org.jboss.netty.lib}"/>
+ <fileset dir="output/etc">
+ <include name="*example-ant.properties"/>
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
+ <unzip dest="output/etc" src="${hornetq.dir}/hornetq-resources.jar"/>
+
+ <copy file="output/etc/javaee-example-ant.properties" tofile="output/etc/examples/javaee/common/config/ant.properties" overwrite="true"/>
+ <copy file="output/etc/jms-example-ant.properties" tofile="output/etc/examples/common/config/ant.properties" overwrite="true"/>
+ <mkdir dir="${hornetq.dir}/config"/>
+ <copy todir="${hornetq.dir}/config">
+ <fileset dir="output/etc/jboss-as"/>
+ </copy>
+ <copy file="output/etc/ra.xml" todir="${hornetq.dir}/config"/>
+ <copy todir="${hornetq.dir}" overwrite="true">
+ <fileset dir="output/etc">
+ <include name="examples/**"/>
+ <!--<include name="*.so"/>-->
+ </fileset>
+ <fileset dir="output/etc">
+ <include name="docs/**"/>
+ <!--<include name="*.so"/>-->
+ </fileset>
+ </copy>
+ <copy tofile="${hornetq.dir}/examples/javaee/common/build.xml" file="output/etc/java-ee-common-build.xml" overwrite="true"/>
+ <copy tofile="${hornetq.dir}/examples/common/build.xml" file="output/etc/jms-common-build.xml" overwrite="true"/>
+ </target>
+
+ <target name="sar">
+ </target>
+</project>
Added: branches/JBPAPP_5_0_HornetQ/hornetq/pom.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/hornetq/pom.xml (rev 0)
+++ branches/JBPAPP_5_0_HornetQ/hornetq/pom.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-hornetq</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Application Server HornetQ</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server (hornetq module)</description>
+
+</project>
\ No newline at end of file
Added: branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/build.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/build.xml (rev 0)
+++ branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/build.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -0,0 +1,102 @@
+<project default="install" name="JBM2 Tech Preview Installer">
+
+ <property name="root.dir" value=".."/>
+ <property name="bin.dir" value="${root.dir}/bin"/>
+ <property name="server.dir" value="${root.dir}/server"/>
+ <property name="server.lib.dir" value="${server.dir}/lib"/>
+ <property name="client.dir" value="${root.dir}/client"/>
+ <property name="docs.dir" value="${root.dir}/docs"/>
+ <property name="examples.dir" value="${docs.dir}/examples"/>
+ <property name="default.dir" value="${server.dir}/default"/>
+ <property name="default.lib.dir" value="${default.dir}/lib"/>
+ <property name="default.deploy.dir" value="${default.dir}/deploy"/>
+ <property name="all.dir" value="${server.dir}/all"/>
+ <property name="all.lib.dir" value="${all.dir}/lib"/>
+ <property name="all.deploy.dir" value="${all.dir}/deploy"/>
+
+ <property name="config.dir" value="config"/>
+ <property name="non-clustered.config" value="${config.dir}/non-clustered"/>
+ <property name="clustered.config" value="${config.dir}/non-clustered"/>
+
+ <target name="install" depends="install-default, install-all">
+
+ <delete file="${client.dir}/jboss-messaging-client.jar"/>
+ <copy todir="${client.dir}">
+ <fileset dir=".">
+ <include name="*-client.jar"/>
+ <include name="netty.jar"/>
+ </fileset>
+ </copy>
+ <!--<mkdir dir="${bin.dir}/META-INF/lib/linux2/x86"/>
+ <mkdir dir="${bin.dir}/META-INF/lib/linux2/x64"/>
+ <mkdir dir="${bin.dir}/META-INF/lib/linux2/i64"/>
+ <copy todir="${bin.dir}/META-INF/lib/linux2/x86" file="libJBMLibAIO32.so"/>
+ <copy todir="${bin.dir}/META-INF/lib/linux2/x64" file="libJBMLibAIO64.so"/>
+ <copy todir="${bin.dir}/META-INF/lib/linux2/i64" file="libJBMLibAIO_ia64.so"/>-->
+ </target>
+
+ <target name="install-default">
+ <delete dir="${default.deploy.dir}/messaging"/>
+ <!--<delete file="${default.deploy.dir}/jms-ra.rar"/>-->
+ <delete file="${default.dir}/conf/login-config.xml"/>
+ <mkdir dir="${default.deploy.dir}/hornetq.sar"/>
+ <mkdir dir="${default.deploy.dir}/hornetq-ra.rar"/>
+ <mkdir dir="${default.deploy.dir}/hornetq-ra.rar/META-INF"/>
+ <copy todir="${default.deploy.dir}/hornetq.sar">
+ <fileset dir="${non-clustered.config}">
+ <include name="hornetq-jboss-beans.xml"/>
+ <include name="hornetq-configuration.xml"/>
+ <include name="hornetq-jms.xml"/>
+ <include name="jms-ds.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${default.deploy.dir}/hornetq-ra.rar" file="hornetq-ra.jar"/>
+ <copy todir="${default.deploy.dir}/hornetq-ra.rar/META-INF/" file="${config.dir}/ra.xml"/>
+ <copy todir="${default.lib.dir}">
+ <fileset dir=".">
+ <include name="hornetq-core.jar"/>
+ <include name="hornetq-jboss-as-integration.jar"/>
+ <include name="hornetq-jms.jar"/>
+ <include name="hornetq-transports.jar"/>
+ <include name="hornetq-logging.jar"/>
+ <include name="netty.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${default.dir}/conf" file="${non-clustered.config}/login-config.xml"/>
+ <copy todir="${default.dir}/conf/props" file="${non-clustered.config}/hornetq-roles.properties"/>
+ <copy todir="${default.dir}/conf/props" file="${non-clustered.config}/hornetq-users.properties"/>
+ </target>
+
+ <target name="install-all">
+ <delete dir="${all.deploy.dir}/messaging"/>
+ <!--<delete file="${all.deploy.dir}/jms-ra.rar"/>-->
+ <delete file="${all.dir}/conf/login-config.xml"/>
+ <mkdir dir="${all.deploy.dir}/hornetq.sar"/>
+ <mkdir dir="${all.deploy.dir}/hornetq-ra.rar"/>
+ <mkdir dir="${all.deploy.dir}/hornetq-ra.rar/META-INF"/>
+ <copy todir="${all.deploy.dir}/hornetq.sar">
+ <fileset dir="${clustered.config}">
+ <include name="hornetq-jboss-beans.xml"/>
+ <include name="hornetq-configuration.xml"/>
+ <include name="hornetq-jms.xml"/>
+ <include name="jms-ds.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${all.deploy.dir}/hornetq-ra.rar" file="hornetq-ra.jar"/>
+ <copy todir="${all.deploy.dir}/hornetq-ra.rar/META-INF/" file="${config.dir}/ra.xml"/>
+ <copy todir="${all.lib.dir}">
+ <fileset dir=".">
+ <include name="hornetq-core.jar"/>
+ <include name="hornetq-jboss-as-integration.jar"/>
+ <include name="hornetq-jms.jar"/>
+ <include name="hornetq-transports.jar"/>
+ <include name="hornetq-logging.jar"/>
+ <include name="netty.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${all.dir}/conf" file="${clustered.config}/login-config.xml"/>
+ <copy todir="${default.dir}/conf/props" file="${non-clustered.config}/hornetq-roles.properties"/>
+ <copy todir="${default.dir}/conf/props" file="${non-clustered.config}/hornetq-users.properties"/>
+ </target>
+
+</project>
\ No newline at end of file
Added: branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/docs/README.txt
===================================================================
Added: branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/java-ee-common-build.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/java-ee-common-build.xml (rev 0)
+++ branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/java-ee-common-build.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -0,0 +1,189 @@
+<?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. -->
+<!-- -->
+<!-- =========================================================================================== -->
+
+
+<project default="compile" name="javaeeexample" basedir=".">
+ <dirname property="imported.basedir" file="${ant.file.javaeeexample}"/>
+ <property file="${imported.basedir}/config/ant.properties"/>
+ <property name="example.config.dir" value="config"/>
+ <property file="${example.config.dir}/ant.properties"/>
+ <property name="example.server.dir" value="server"/>
+ <property environment="ENV"/>
+ <property name="jboss.home" value="../../../../"/>
+
+ <!--
+ This module is based on Java 1.5
+ -->
+
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+
+ <property name="javac.debug" value="true"/>
+ <property name="javac.optimize" value="false"/>
+ <property name="javac.depend" value="false"/>
+ <property name="javac.verbose" value="false"/>
+ <property name="javac.deprecation" value="true"/>
+ <property name="javac.include.ant.runtime" value="false"/>
+ <property name="javac.include.java.runtime" value="true"/>
+ <property name="javac.fail.onerror" value="true"/>
+
+ <property name="src.dir" value="src"/>
+ <property name="example.classname" value="this.shouldn't.be.run.directly"/>
+ <property name="hornetq.example.runServer" value="true"/>
+ <property name="hornetq.example.beans.file" value="server0"/>
+
+ <property name="build.dir" value="build"/>
+ <property name="classes.dir" value="${build.dir}/classes"/>
+ <property name="config.dir" value="${imported.basedir}/config"/>
+ <property name="example.config.dir" value="config"/>
+
+ <path id="jms.compilation.classpath">
+ <fileset dir="${hornetq.jars.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/server/default/lib">
+ <include name="netty*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="jms.runtime.classpath">
+ <path refid="jms.compilation.classpath"/>
+ <pathelement location="${config.dir}"/>
+ <pathelement location="${example.config.dir}"/>
+ <pathelement location="${classes.dir}"/>
+ </path>
+ <target name="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ </target>
+
+ <target name="compile" depends="init">
+ <javac destdir="${classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.dir}"/>
+ </src>
+ <classpath refid="jms.compilation.classpath"/>
+ </javac>
+ </target>
+
+ <target name="jar" depends="compile">
+ <jar destfile="${build.dir}/${example.name}-example.jar"
+ basedir="${classes.dir}"
+ includes="org/hornetq/javaee/example/server/**/*">
+ </jar>
+ </target>
+
+ <target name="war" depends="jar">
+ <jar destfile="${build.dir}/${example.name}-example.war" basedir="${example.config.dir}"
+ includes="WEB-INF/**/*"/>
+ </target>
+
+ <target name="ear" depends="war">
+ <jar destfile="${build.dir}/${example.name}-example.ear" basedir="${build.dir}">
+ <include name="${example.name}-example.jar"/>
+ <include name="${example.name}-example.war"/>
+ <fileset dir="${example.config.dir}">
+ <include name="META-INF/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="deploy" depends="validate-jboss, copy-profile, copy-resources, ear">
+ <property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
+ <copy todir="${example-profile}/deploy/hornetq.sar">
+ <fileset dir="${example.server.dir}"/>
+ </copy>
+ <copy todir="${example-profile}/deploy/">
+ <fileset dir="${build.dir}">
+ <include name="${example.name}-example.ear"/>
+ </fileset>
+ </copy>
+ <exec dir="${jboss.home}/bin" executable="sh">
+ <arg line="run.sh -c ${example.name}-example-profile"/>
+ </exec>
+ </target>
+
+ <target name="copy-profile" depends="profile.check" unless="donot.copy.profile">
+ <property name="profile" value="${jboss.home}/server/default"/>
+ <property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
+ <property name="deploy.dir" value="${example-profile}/deploy/"/>
+ <mkdir dir="${example-profile}"/>
+ <copy todir="${example-profile}">
+ <fileset dir="${profile}">
+ <exclude name="**/*hornetq-configuration.xml"/>
+ <exclude name="**/*hornetq-jms.xml"/>
+ <exclude name="**/*hornetq-users.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- can be overriden if the example requires to copy resources after the
+ profile is created and before the server is started -->
+ <target name="copy-resources">
+ </target>
+
+ <target name="profile.check">
+ <property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
+ <condition property="donot.copy.profile">
+ <available file="${example-profile}" type="dir"/>
+ </condition>
+ </target>
+
+ <target name="undeploy" depends="validate-jboss">
+ <property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
+ <delete dir="${example-profile}"/>
+ </target>
+
+ <target name="validate-jboss">
+ <available property="default-config" type="dir" file="${jboss.home}/server/default"/>
+ <fail unless="default-config" message="${jboss.home}/server/default not found!"/>
+ </target>
+
+ <target name="runExample" depends="validate-jboss,compile">
+ <java classname="${example.classname}" fork="true">
+ <classpath refid="jms.runtime.classpath"/>
+ </java>
+
+ </target>
+
+ <target name="clean">
+ <delete dir="./build" quiet="true"/>
+ </target>
+
+</project>
Added: branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/javaee-example-ant.properties
===================================================================
--- branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/javaee-example-ant.properties (rev 0)
+++ branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/javaee-example-ant.properties 2010-01-20 12:12:26 UTC (rev 99654)
@@ -0,0 +1,5 @@
+hornetq.example.logserveroutput=true
+hornetq.jars.dir=${imported.basedir}/../../../../hornetq
+jars.dir=${imported.basedir}/../../../../../server/lib
+client.jars.dir=${imported.basedir}/../../../../hornetq
+aio.library.path=${imported.basedir}/../../native/bin
Added: branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/jms-common-build.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/jms-common-build.xml (rev 0)
+++ branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/jms-common-build.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent">
+ ]>
+
+<!-- =========================================================================================== -->
+<!-- -->
+<!-- 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. -->
+<!-- -->
+<!-- =========================================================================================== -->
+
+
+<project default="compile" name="example" basedir=".">
+ <dirname property="imported.basedir" file="${ant.file.example}"/>
+ <property file="${imported.basedir}/config/ant.properties"/>
+
+ <!--
+ This module is based on Java 1.5
+ -->
+
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+
+ <property name="javac.debug" value="true"/>
+ <property name="javac.optimize" value="false"/>
+ <property name="javac.depend" value="false"/>
+ <property name="javac.verbose" value="false"/>
+ <property name="javac.deprecation" value="true"/>
+ <property name="javac.include.ant.runtime" value="false"/>
+ <property name="javac.include.java.runtime" value="true"/>
+ <property name="javac.fail.onerror" value="true"/>
+
+ <property name="src.dir" value="${imported.basedir}/src"/>
+ <property name="src.example.dir" location="src"/>
+ <property name="example.classname" value="this.shouldn't.be.run.directly"/>
+ <property name="hornetq.example.runServer" value="true"/>
+ <property name="hornetq.example.beans.file" value="server0"/>
+
+ <property name="build.dir" value="build"/>
+ <property name="classes.dir" value="${build.dir}/classes"/>
+ <property name="config.dir" value="${imported.basedir}/config"/>
+ <property name="example.config.dir" value="config"/>
+ <path id="extra.classpath">
+ </path>
+
+ <path id="compilation.classpath">
+ <fileset dir="${hornetq.jars.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${client.jars.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jars.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <path refid="extra.classpath"/>
+ </path>
+
+ <path id="client.compilation.classpath">
+ <fileset dir="${hornetq.jars.dir}">
+ <include name="**/*client*.jar"/>
+ <include name="**/hornetq-jms-api.jar"/>
+ </fileset>
+ <path refid="extra.classpath"/>
+ </path>
+
+ <path id="client.classpath">
+ <path refid="client.compilation.classpath"/>
+ <pathelement location="${config.dir}"/>
+ <pathelement location="${example.config.dir}"/>
+ <pathelement location="${classes.dir}"/>
+ <fileset dir="${client.jars.dir}">
+ <include name="**/*client*.jar"/>
+ </fileset>
+ <fileset dir="${hornetq.jars.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jars.dir}">
+ <include name="**/netty*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="server.classpath">
+ <path refid="compilation.classpath"/>
+ <pathelement location="${config.dir}"/>
+ <pathelement location="${example.config.dir}"/>
+ <pathelement location="${classes.dir}"/>
+ <fileset dir="${jars.dir}">
+ <include name="jboss/jnpserver/lib/jnpserver.jar"/>
+ <include name="netty/lib/netty*.jar"/>
+ </fileset>
+ </path>
+
+
+ <target name="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ </target>
+
+ <target name="compile" depends="init">
+ <echo message="src.example.dir=${src.example.dir}"/>
+ <javac destdir="${classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.dir}"/>
+ <pathelement path="${src.example.dir}"/>
+ </src>
+ <classpath refid="compilation.classpath"/>
+ </javac>
+ </target>
+
+
+ <target name="runExample" depends="compile">
+
+ <property name="serverclasspath" refid="server.classpath"/>
+ <property name="clientClasspath" refid="client.classpath"/>
+ <!--<echo>client classpath = ${clientClasspath}</echo>-->
+ <property file="${imported.basedir}/config/server.properties"/>
+ <java classname="${example.classname}" fork="true" resultproperty="example-result">
+ <jvmarg value="-Dhornetq.example.server.classpath=${serverclasspath}"/>
+ <jvmarg value="-Dhornetq.example.server.args=${server.args}"/>
+ <jvmarg value="-Dhornetq.example.logserveroutput=${hornetq.example.logserveroutput}"/>
+ <jvmarg value="-Dhornetq.example.runServer=${hornetq.example.runServer}"/>
+ <arg line="${hornetq.example.beans.file}"/>
+ <sysproperty key="java.library.path" value="${java.library.path}${path.separator}${aio.library.path}"/>
+ <classpath refid="client.classpath"/>
+ </java>
+ <!-- if the example exited with a result value != 0, we fail the build -->
+ <fail message="Example ${example.classname} failed">
+ <condition>
+ <not>
+ <equals arg1="${example-result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+ </target>
+
+ <target name="clean-all">
+ <subant target="clean" failonerror="true">
+ <fileset dir=".." includes="*/build.xml" excludes="common/build.xml"/>
+ </subant>
+ </target>
+
+ <target name="clean">
+ <delete dir="./build" quiet="true"/>
+ <delete dir="./logs" quiet="true"/>
+ <delete dir="./server0/logs" quiet="true"/>
+ <delete dir="./server0/data" quiet="true"/>
+ <delete dir="./server0/build" quiet="true"/>
+ <delete dir="./server1/logs" quiet="true"/>
+ <delete dir="./server1/data" quiet="true"/>
+ <delete dir="./server2/logs" quiet="true"/>
+ <delete dir="./server2/data" quiet="true"/>
+ <delete dir="./server3/logs" quiet="true"/>
+ <delete dir="./server3/data" quiet="true"/>
+ <delete dir="./server4/logs" quiet="true"/>
+ <delete dir="./server4/data" quiet="true"/>
+ <delete dir="./server5/logs" quiet="true"/>
+ <delete dir="./server5/data" quiet="true"/>
+ <delete dir="./ObjectStore" quiet="true"/>
+ <delete dir="./data" quiet="true"/>
+ <!-- large-message creates huge .dat files -->
+ <delete>
+ <fileset dir=".">
+ <include name="*.dat"/>
+ </fileset>
+ </delete>
+ </target>
+
+ <target name="all" description="Run all the examples">
+ <subant target="run" failonerror="true">
+ <fileset dir="..">
+ <include name="core/*/build.xml"/>
+ <include name="jms/*/build.xml"/>
+ <exclude name="common/build.xml"/>
+ <exclude name="core/perf/build.xml"/>
+ <exclude name="jms/perf/build.xml"/>
+ </fileset>
+ </subant>
+ </target>
+
+</project>
Added: branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/jms-example-ant.properties
===================================================================
--- branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/jms-example-ant.properties (rev 0)
+++ branches/JBPAPP_5_0_HornetQ/hornetq/src/etc/jms-example-ant.properties 2010-01-20 12:12:26 UTC (rev 99654)
@@ -0,0 +1,5 @@
+hornetq.example.logserveroutput=true
+hornetq.jars.dir=${imported.basedir}/../../../hornetq
+jars.dir=${imported.basedir}/../../../lib
+client.jars.dir=${imported.basedir}/../../../client
+aio.library.path=${imported.basedir}/../../native/bin
Modified: branches/JBPAPP_5_0_HornetQ/pom.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/pom.xml 2010-01-20 11:31:28 UTC (rev 99653)
+++ branches/JBPAPP_5_0_HornetQ/pom.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -373,6 +373,7 @@
<module>jbossas</module>
<module>jmx-remoting</module>
<module>messaging</module>
+ <module>hornetq</module>
<module>cluster</module>
<module>varia</module>
<module>iiop</module>
Modified: branches/JBPAPP_5_0_HornetQ/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0_HornetQ/thirdparty/pom.xml 2010-01-20 11:31:28 UTC (rev 99653)
+++ branches/JBPAPP_5_0_HornetQ/thirdparty/pom.xml 2010-01-20 12:12:26 UTC (rev 99654)
@@ -1138,6 +1138,10 @@
<artifactId>bsh</artifactId>
</dependency>
<dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
+ <dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
@@ -1651,6 +1655,50 @@
<artifactId>resources</artifactId>
</dependency>
<dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jboss-as-integration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list