[jboss-cvs] JBossAS SVN: r90319 - in branches/JBPAPP_5_0_JBPAPP-2043: messaging2 and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 17 08:33:34 EDT 2009
Author: ataylor
Date: 2009-06-17 08:33:33 -0400 (Wed, 17 Jun 2009)
New Revision: 90319
Added:
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-common-build.xml
Modified:
branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties
branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml
Log:
updated tp JBM beta2
Modified: branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml 2009-06-17 12:23:30 UTC (rev 90318)
+++ branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml 2009-06-17 12:33:33 UTC (rev 90319)
@@ -41,7 +41,7 @@
<version.jboss.jbossws>3.1.2.GA</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.BETA1</version.org.jboss.messaging>
+ <version.org.jboss.messaging>2.0.0.BETA2</version.org.jboss.messaging>
<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.10.GA</version.jgroups>
@@ -998,6 +998,12 @@
<version>${version.org.jboss.messaging}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.messaging</groupId>
+ <artifactId>jbm-bootstrap</artifactId>
+ <version>${version.org.jboss.messaging}</version>
+ </dependency>
+
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml 2009-06-17 12:23:30 UTC (rev 90318)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml 2009-06-17 12:33:33 UTC (rev 90319)
@@ -118,7 +118,25 @@
</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"/>
+ <replaceregexp match="^(.+)MessagingServerImpl(.+)\n(.+)start(.+)\n(.+)stop(.+)$"
+ replace=" <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">"
+ flags="m">
+ <fileset dir="${JBossMessaging2.dir}/examples/jms/">
+ <include name="**/*/jbm-jboss-beans.xml"/>
+ </fileset>
+ </replaceregexp>
+ <replaceregexp match="^(.+)JBMSecurityManager(.+)\n(.+)parameter(.+)\n(.+)constructor(.+)$"
+ replace=" <inject bean="JBMSecurityManager"/>${line.separator}
+ </parameter>${line.separator}
+ </constructor>${line.separator}
+ <start ignored="true"/>${line.separator}
+ <stop ignored="true"/>${line.separator} "
+ flags="m">
+ <fileset dir="${JBossMessaging2.dir}/examples/jms/">
+ <include name="**/*/jbm-jboss-beans.xml"/>
+ </fileset>
+ </replaceregexp>
</target>
<target name="sar">
Added: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-common-build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-common-build.xml (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-common-build.xml 2009-06-17 12:33:33 UTC (rev 90319)
@@ -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="jbm.example.runServer" value="true"/>
+ <property name="jbm.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="${jbm.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="${jbm.jars.dir}">
+ <include name="**/*client*.jar"/>
+ <include name="**/jbm-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="${jbm.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="-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}"/>
+ <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>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties 2009-06-17 12:23:30 UTC (rev 90318)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/jms-example-ant.properties 2009-06-17 12:33:33 UTC (rev 90319)
@@ -1,5 +1,5 @@
jbm.example.logserveroutput=true
-jbm.jars.dir=${imported.basedir}/../../../../JBossMessaging2
-jars.dir=${imported.basedir}/../../../../server/lib
-client.jars.dir=${imported.basedir}/../../../../JBossMessaging2
+jbm.jars.dir=${imported.basedir}/../../../JBossMessaging2
+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/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml 2009-06-17 12:23:30 UTC (rev 90318)
+++ branches/JBPAPP_5_0_JBPAPP-2043/thirdparty/pom.xml 2009-06-17 12:33:33 UTC (rev 90319)
@@ -1654,6 +1654,10 @@
<artifactId>jbm-ra</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.messaging</groupId>
+ <artifactId>jbm-bootstrap</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list