[jboss-cvs] JBossAS SVN: r93610 - in branches/JBPAPP_5_0_JBPAPP-2043: build and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 16 09:34:27 EDT 2009
Author: ataylor
Date: 2009-09-16 09:34:26 -0400 (Wed, 16 Sep 2009)
New Revision: 93610
Added:
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/
Removed:
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/docs/api/
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/docs/user-manual/
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/
Modified:
branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml
branches/JBPAPP_5_0_JBPAPP-2043/build/build.xml
branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/build.xml
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/pom.xml
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/build.xml
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/java-ee-common-build.xml
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/javaee-example-ant.properties
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/jms-common-build.xml
branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/jms-example-ant.properties
branches/JBPAPP_5_0_JBPAPP-2043/pom.xml
branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml
Log:
updated to HornetQ Beta5
Modified: branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml 2009-09-16 13:29:05 UTC (rev 93609)
+++ branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -782,18 +782,18 @@
</copy>
</target>
- <target name="_module-messaging2-most">
- <property name="_module.name" value="messaging2" override="true"/>
+ <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="JBossMessaging2/**/*"/>
- <exclude name="JBossMessaging2/*sources.jar"/>
+ <include name="hornetq/**/*"/>
+ <exclude name="hornetq/*sources.jar"/>
</fileset>
</copy>
</target>
- <target name="_module-messaging2-all" depends="_module-messaging2-most"/>
+ <target name="_module-hornetq-all" depends="_module-hornetq-most"/>
<!-- ==== -->
<!-- J2SE -->
<!-- ==== -->
Modified: branches/JBPAPP_5_0_JBPAPP-2043/build/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/build/build.xml 2009-09-16 13:29:05 UTC (rev 93609)
+++ branches/JBPAPP_5_0_JBPAPP-2043/build/build.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -115,7 +115,7 @@
<module name="management"/>
<module name="mbeans"/>
<module name="messaging"/>
- <module name="messaging2"/>
+ <module name="hornetq"/>
<module name="jbossas/remoting"/>
<module name="jmx-remoting"/>
<module name="jbossas/jmx-remoting"/>
@@ -155,7 +155,7 @@
jmx-remoting,
jbossas/jmx-remoting,
messaging,
- messaging2,
+ hornetq,
cluster,
varia,
iiop,
@@ -529,12 +529,12 @@
<!-- Messaging 2 -->
<!-- ========= -->
- <target name="_module-messaging2-most">
- <ant antfile="build-distr.xml" target="_module-messaging2-most"/>
+ <target name="_module-hornetq-most">
+ <ant antfile="build-distr.xml" target="_module-hornetq-most"/>
</target>
- <target name="_module-messaging2-all" depends="_module-messaging2-most">
- <ant antfile="build-distr.xml" target="_module-messaging2-all"/>
+ <target name="_module-hornetq-all" depends="_module-hornetq-most">
+ <ant antfile="build-distr.xml" target="_module-hornetq-all"/>
</target>
<!-- ==== -->
Modified: branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml 2009-09-16 13:29:05 UTC (rev 93609)
+++ branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -41,7 +41,7 @@
<version.jboss.jbossws>3.1.2.SP3</version.jboss.jbossws>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.messaging>1.4.3.GA</version.jboss.messaging>
- <version.org.jboss.messaging>2.0.0.BETA4</version.org.jboss.messaging>
+ <version.org.hornetq>2.0.0.BETA5</version.org.hornetq>
<version.org.jboss.netty>3.1.0.BETA3</version.org.jboss.netty>
<version.jboss.web>2.1.3.GA</version.jboss.web>
<version.jgroups>2.6.11.GA</version.jgroups>
@@ -922,57 +922,57 @@
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-core-client</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-core</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-transports</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-jms</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-jms-client</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-resources</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-jboss-as-security</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jboss-as-security</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-ra</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-bootstrap</artifactId>
- <version>${version.org.jboss.messaging}</version>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ <version>${version.org.hornetq}</version>
</dependency>
<dependency>
Copied: branches/JBPAPP_5_0_JBPAPP-2043/hornetq (from rev 91961, branches/JBPAPP_5_0_JBPAPP-2043/messaging2)
Modified: branches/JBPAPP_5_0_JBPAPP-2043/hornetq/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml 2009-08-04 13:12:37 UTC (rev 91961)
+++ branches/JBPAPP_5_0_JBPAPP-2043/hornetq/build.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -93,25 +93,25 @@
| Build all jar files.
-->
<target name="module-jars">
- <property name="JBossMessaging2.dir" value="output/JBossMessaging2"/>
- <copy todir="${JBossMessaging2.dir}">
- <fileset dir="${org.jboss.messaging.lib}"/>
+ <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="${JBossMessaging2.dir}/jbm-resources.jar"/>
+ <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="${JBossMessaging2.dir}/config"/>
- <copy todir="${JBossMessaging2.dir}/config">
+ <mkdir dir="${hornetq.dir}/config"/>
+ <copy todir="${hornetq.dir}/config">
<fileset dir="output/etc/jboss-as"/>
</copy>
- <copy file="output/etc/ra.xml" todir="${JBossMessaging2.dir}/config"/>
- <copy todir="${JBossMessaging2.dir}" overwrite="true">
+ <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"/>-->
@@ -121,8 +121,8 @@
<!--<include name="*.so"/>-->
</fileset>
</copy>
- <copy tofile="${JBossMessaging2.dir}/examples/javaee/common/build.xml" file="output/etc/java-ee-common-build.xml" overwrite="true"/>
- <copy tofile="${JBossMessaging2.dir}/examples/common/build.xml" file="output/etc/jms-common-build.xml" overwrite="true"/>
+ <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">
Modified: branches/JBPAPP_5_0_JBPAPP-2043/hornetq/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/pom.xml 2009-08-04 13:12:37 UTC (rev 91961)
+++ branches/JBPAPP_5_0_JBPAPP-2043/hornetq/pom.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -7,11 +7,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-messaging2</artifactId>
+ <artifactId>jboss-as-hornetq</artifactId>
<packaging>jar</packaging>
<name>JBoss Application Server Messaging</name>
<url>http://www.jboss.org/jbossas</url>
- <description>JBoss Application Server (messaging2 module)</description>
+ <description>JBoss Application Server (hornetq module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
<resources>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml 2009-08-04 13:12:37 UTC (rev 91961)
+++ branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/build.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -39,58 +39,62 @@
<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}/messaging.sar"/>
+ <mkdir dir="${default.deploy.dir}/hornetq.sar"/>
<mkdir dir="${default.deploy.dir}/jms-ra.rar"/>
<mkdir dir="${default.deploy.dir}/jms-ra.rar/META-INF"/>
- <copy todir="${default.deploy.dir}/messaging.sar">
+ <copy todir="${default.deploy.dir}/hornetq.sar">
<fileset dir="${non-clustered.config}">
- <include name="jbm-jboss-beans.xml"/>
- <include name="jbm-configuration.xml"/>
- <include name="jbm-jms.xml"/>
- <include name="jbm-ds.xml"/>
+ <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}/jms-ra.rar" file="jbm-ra.jar"/>
+ <copy todir="${default.deploy.dir}/jms-ra.rar" file="hornetq-ra.jar"/>
<copy todir="${default.deploy.dir}/jms-ra.rar/META-INF/" file="${config.dir}/ra.xml"/>
<copy todir="${default.lib.dir}">
<fileset dir=".">
- <include name="jbm-core.jar"/>
- <include name="jbm-jboss-as-security.jar"/>
- <include name="jbm-jms.jar"/>
- <include name="jbm-transports.jar"/>
+ <include name="hornetq-core.jar"/>
+ <include name="hornetq-jboss-as-security.jar"/>
+ <include name="hornetq-jms.jar"/>
+ <include name="hornetq-transports.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}/messaging.sar"/>
+ <mkdir dir="${all.deploy.dir}/hornetq.sar"/>
<mkdir dir="${all.deploy.dir}/jms-ra.rar"/>
<mkdir dir="${all.deploy.dir}/jms-ra.rar/META-INF"/>
- <copy todir="${all.deploy.dir}/messaging.sar">
+ <copy todir="${all.deploy.dir}/hornetq.sar">
<fileset dir="${clustered.config}">
- <include name="jbm-jboss-beans.xml"/>
- <include name="jbm-configuration.xml"/>
- <include name="jbm-jms.xml"/>
- <include name="jbm-ds.xml"/>
+ <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}/jms-ra.rar" file="jbm-ra.jar"/>
+ <copy todir="${all.deploy.dir}/jms-ra.rar" file="hornetq-ra.jar"/>
<copy todir="${all.deploy.dir}/jms-ra.rar/META-INF/" file="${config.dir}/ra.xml"/>
<copy todir="${all.lib.dir}">
<fileset dir=".">
- <include name="jbm-core.jar"/>
- <include name="jbm-jboss-as-security.jar"/>
- <include name="jbm-jms.jar"/>
- <include name="jbm-transports.jar"/>
+ <include name="hornetq-core.jar"/>
+ <include name="hornetq-jboss-as-security.jar"/>
+ <include name="hornetq-jms.jar"/>
+ <include name="hornetq-transports.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
Modified: branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/java-ee-common-build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/java-ee-common-build.xml 2009-08-04 13:12:37 UTC (rev 91961)
+++ branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/java-ee-common-build.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -52,8 +52,8 @@
<property name="src.dir" value="src"/>
<property name="example.classname" value="this.shouldn't.be.run.directly"/>
- <property name="jbm.example.runServer" value="true"/>
- <property name="jbm.example.beans.file" value="server0"/>
+ <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"/>
@@ -61,7 +61,7 @@
<property name="example.config.dir" value="config"/>
<path id="jms.compilation.classpath">
- <fileset dir="${jbm.jars.dir}">
+ <fileset dir="${hornetq.jars.dir}">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${jboss.home}/client">
@@ -105,7 +105,7 @@
<target name="jar" depends="compile">
<jar destfile="${build.dir}/${example.name}-example.jar"
basedir="${classes.dir}"
- includes="org/jboss/javaee/example/server/**/*">
+ includes="org/hornetq/javaee/example/server/**/*">
</jar>
</target>
@@ -126,7 +126,7 @@
<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/messaging.sar">
+ <copy todir="${example-profile}/deploy/hornetq.sar">
<fileset dir="${example.server.dir}"/>
</copy>
<copy todir="${example-profile}/deploy/">
@@ -146,9 +146,9 @@
<mkdir dir="${example-profile}"/>
<copy todir="${example-profile}">
<fileset dir="${profile}">
- <exclude name="**/*jbm-configuration.xml"/>
- <exclude name="**/*jbm-jms.xml"/>
- <exclude name="**/*jbm-users.xml"/>
+ <exclude name="**/*hornetq-configuration.xml"/>
+ <exclude name="**/*hornetq-jms.xml"/>
+ <exclude name="**/*hornetq-users.xml"/>
</fileset>
</copy>
</target>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/javaee-example-ant.properties
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/javaee-example-ant.properties 2009-08-04 13:12:37 UTC (rev 91961)
+++ branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/javaee-example-ant.properties 2009-09-16 13:34:26 UTC (rev 93610)
@@ -1,5 +1,5 @@
-jbm.example.logserveroutput=true
-jbm.jars.dir=${imported.basedir}/../../../../JBossMessaging2
+hornetq.example.logserveroutput=true
+hornetq.jars.dir=${imported.basedir}/../../../../hornetq
jars.dir=${imported.basedir}/../../../../../server/lib
-client.jars.dir=${imported.basedir}/../../../../JBossMessaging2
+client.jars.dir=${imported.basedir}/../../../../hornetq
aio.library.path=${imported.basedir}/../../native/bin
Modified: branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/jms-common-build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-common-build.xml 2009-08-04 13:12:37 UTC (rev 91961)
+++ branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/jms-common-build.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -51,8 +51,8 @@
<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="jbm.example.runServer" value="true"/>
- <property name="jbm.example.beans.file" value="server0"/>
+ <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"/>
@@ -62,7 +62,7 @@
</path>
<path id="compilation.classpath">
- <fileset dir="${jbm.jars.dir}">
+ <fileset dir="${hornetq.jars.dir}">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${client.jars.dir}">
@@ -75,9 +75,9 @@
</path>
<path id="client.compilation.classpath">
- <fileset dir="${jbm.jars.dir}">
+ <fileset dir="${hornetq.jars.dir}">
<include name="**/*client*.jar"/>
- <include name="**/jbm-jms-api.jar"/>
+ <include name="**/hornetq-jms-api.jar"/>
</fileset>
<path refid="extra.classpath"/>
</path>
@@ -90,7 +90,7 @@
<fileset dir="${client.jars.dir}">
<include name="**/*client*.jar"/>
</fileset>
- <fileset dir="${jbm.jars.dir}">
+ <fileset dir="${hornetq.jars.dir}">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${jars.dir}">
@@ -144,11 +144,11 @@
<!--<echo>client classpath = ${clientClasspath}</echo>-->
<property file="${imported.basedir}/config/server.properties"/>
<java classname="${example.classname}" fork="true" resultproperty="example-result">
- <jvmarg value="-Djbm.example.server.classpath=${serverclasspath}"/>
- <jvmarg value="-Djbm.example.server.args=${server.args}"/>
- <jvmarg value="-Djbm.example.logserveroutput=${jbm.example.logserveroutput}"/>
- <jvmarg value="-Djbm.example.runServer=${jbm.example.runServer}"/>
- <arg line="${jbm.example.beans.file}"/>
+ <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>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/jms-example-ant.properties
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties 2009-08-04 13:12:37 UTC (rev 91961)
+++ branches/JBPAPP_5_0_JBPAPP-2043/hornetq/src/etc/jms-example-ant.properties 2009-09-16 13:34:26 UTC (rev 93610)
@@ -1,5 +1,5 @@
-jbm.example.logserveroutput=true
-jbm.jars.dir=${imported.basedir}/../../../JBossMessaging2
+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_JBPAPP-2043/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/pom.xml 2009-09-16 13:29:05 UTC (rev 93609)
+++ branches/JBPAPP_5_0_JBPAPP-2043/pom.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -373,7 +373,7 @@
<module>jbossas</module>
<module>jmx-remoting</module>
<module>messaging</module>
- <module>messaging2</module>
+ <module>hornetq</module>
<module>cluster</module>
<module>varia</module>
<module>iiop</module>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml 2009-09-16 13:29:05 UTC (rev 93609)
+++ branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml 2009-09-16 13:34:26 UTC (rev 93610)
@@ -1586,40 +1586,40 @@
<artifactId>resources</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-core-client</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-core</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-transports</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-transports</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-jms</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-jms-client</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-resources</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-resources</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-jboss-as-security</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jboss-as-security</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-ra</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.messaging</groupId>
- <artifactId>jbm-bootstrap</artifactId>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
More information about the jboss-cvs-commits
mailing list