[jboss-cvs] JBoss Messaging SVN: r6579 - in trunk: examples/javaee/common and 18 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 27 10:27:29 EDT 2009
Author: jmesnil
Date: 2009-04-27 10:27:29 -0400 (Mon, 27 Apr 2009)
New Revision: 6579
Added:
trunk/build-messaging.properties
trunk/src/config/common/
trunk/src/config/common/version.properties
trunk/src/config/jboss-as/
trunk/src/config/jboss-as/build.xml
trunk/src/config/jboss-as/clustered/
trunk/src/config/jboss-as/clustered/jbm-configuration.xml
trunk/src/config/jboss-as/clustered/jbm-jboss-beans.xml
trunk/src/config/jboss-as/clustered/jbm-jms.xml
trunk/src/config/jboss-as/clustered/jbm-queues.xml
trunk/src/config/jboss-as/clustered/jms-ds.xml
trunk/src/config/jboss-as/clustered/login-config.xml
trunk/src/config/jboss-as/clustered/messaging-roles.properties
trunk/src/config/jboss-as/clustered/messaging-users.properties
trunk/src/config/jboss-as/non-clustered/
trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
trunk/src/config/jboss-as/non-clustered/jbm-jboss-beans.xml
trunk/src/config/jboss-as/non-clustered/jbm-jms.xml
trunk/src/config/jboss-as/non-clustered/jbm-queues.xml
trunk/src/config/jboss-as/non-clustered/jms-ds.xml
trunk/src/config/jboss-as/non-clustered/login-config.xml
trunk/src/config/jboss-as/non-clustered/messaging-roles.properties
trunk/src/config/jboss-as/non-clustered/messaging-users.properties
trunk/src/config/stand-alone/
trunk/src/config/stand-alone/clustered/
trunk/src/config/stand-alone/clustered/jbm-configuration.xml
trunk/src/config/stand-alone/clustered/jbm-jms.xml
trunk/src/config/stand-alone/clustered/jbm-queues.xml
trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml
trunk/src/config/stand-alone/clustered/jbm-users.xml
trunk/src/config/stand-alone/clustered/jndi.properties
trunk/src/config/stand-alone/clustered/log4j.xml
trunk/src/config/stand-alone/clustered/logging.properties
trunk/src/config/stand-alone/non-clustered/
trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
trunk/src/config/stand-alone/non-clustered/jbm-queues.xml
trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml
trunk/src/config/stand-alone/non-clustered/jbm-users.xml
trunk/src/config/stand-alone/non-clustered/jndi.properties
trunk/src/config/stand-alone/non-clustered/log4j.xml
trunk/src/config/stand-alone/non-clustered/logging.properties
Removed:
trunk/AS/
trunk/src/config/jbm-cluster-configuration.xml
trunk/src/config/jbm-cluster-standalone-beans.xml
trunk/src/config/jbm-configuration.xml
trunk/src/config/jbm-jms.xml
trunk/src/config/jbm-queues.xml
trunk/src/config/jbm-standalone-beans.xml
trunk/src/config/jbm-users.xml
trunk/src/config/log4j.xml
trunk/src/config/logging.properties
trunk/src/config/version.properties
Modified:
trunk/.classpath
trunk/build-messaging.xml
trunk/examples/javaee/common/build.xml
trunk/examples/javaee/ejb-jms-transaction/readme.html
trunk/examples/javaee/jms-bridge/readme.html
trunk/examples/javaee/mdb-remote/build.xml
trunk/examples/javaee/mdb-remote/readme.html
trunk/examples/javaee/servlet-transport/build.xml
trunk/examples/javaee/xarecovery/readme.html
trunk/examples/jms/common/config/ant.properties
trunk/src/bin/run.bat
trunk/src/bin/run.sh
trunk/src/config/examples-ant.properties
trunk/tests/jms-tests/config/invm-beans.xml
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SecurityTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java
Log:
refactored config layout
* all configurations are stored in src/config subdirs.
* JBoss AS 5 profile creation is done from config/jboss-as dir (in the distribution): it creates 2 profiles:
- default-with-jbm2
- all-with-jbm2
* updated tests & examples to match the new config layout
+ fixed JBMESSAGING-1606: JMS Tests depends on AS 5 bean configuration
- used JBM basic user credentials and its own security manager rather than
depending on MockJBossSecurityManager
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/.classpath 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/>
- <classpathentry kind="src" path="examples/jms/xa-with-jta/src"/>
- <classpathentry kind="src" path="examples/javaee/servlet-transport/src"/>
<classpathentry kind="src" path="build/src"/>
+ <classpathentry kind="src" path="src/config/common"/>
<classpathentry kind="src" path="tests/jms-tests/config"/>
<classpathentry kind="src" path="tests/config"/>
- <classpathentry kind="src" path="src/config"/>
+ <classpathentry kind="src" path="src/config/stand-alone/non-clustered"/>
+ <classpathentry kind="src" path="src/schemas"/>
<classpathentry excluding="**/.svn/**/*" kind="src" path="tests/src">
<attributes>
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="trunk/native/bin"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="tests/jms-tests/src"/>
- <classpathentry kind="src" path="src/schemas"/>
<classpathentry kind="src" path="tests/joram-tests/src"/>
<classpathentry kind="src" path="tests/joram-tests/config"/>
<classpathentry kind="src" path="examples/jms/application-layer-failover/src"/>
@@ -67,11 +66,13 @@
<classpathentry kind="src" path="examples/jms/xa-heuristic/src"/>
<classpathentry kind="src" path="examples/jms/xa-receive/src"/>
<classpathentry kind="src" path="examples/jms/xa-send/src"/>
+ <classpathentry kind="src" path="examples/jms/xa-with-jta/src"/>
<classpathentry kind="src" path="examples/javaee/ejb-jms-transaction/src"/>
<classpathentry kind="src" path="examples/javaee/hajndi/src"/>
<classpathentry kind="src" path="examples/javaee/jms-bridge/src"/>
<classpathentry kind="src" path="examples/javaee/mdb/src"/>
<classpathentry kind="src" path="examples/javaee/mdb-remote/src"/>
+ <classpathentry kind="src" path="examples/javaee/servlet-transport/src"/>
<classpathentry kind="src" path="examples/javaee/xarecovery/src"/>
<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
Added: trunk/build-messaging.properties
===================================================================
--- trunk/build-messaging.properties (rev 0)
+++ trunk/build-messaging.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,33 @@
+# Compilation is based on Java 5
+javac.target=1.5
+javac.source=1.5
+javac.debug=true
+javac.optimize=false
+javac.depend=false
+javac.verbose=false
+javac.deprecation=true
+javac.include.ant.runtime=false
+javac.include.java.runtime=true
+javac.fail.onerror=true
+
+# JUnit properties
+junit.showoutput=true
+junit.formatter.usefile=true
+junit.batchtest.haltonerror=false
+junit.batchtest.haltonfailure=false
+junit.batchtest.fork=true
+junit.test.haltonfailure=false
+junit.test.haltonerror=false
+junit.printsummary=true
+junit.haltonerror=false
+junit.haltonfailure=false
+junit.fork=true
+junit.includeantruntime=true
+# 90 mins
+junit.timeout=5400000
+# 150 mins
+clustering.junit.timeout=9000000
+# 90 mins
+clustering.stress.junit.timeout=5400000
+# 90 mins
+stress.junit.timeout=5400000
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/build-messaging.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -25,39 +25,36 @@
<!-- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -->
<!-- 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
<!-- -->
+<!-- $Id: build.xml 4036 2008-04-11 12:43:24Z ataylor $ -->
<!-- =========================================================================================== -->
+<project default="jar" name="JBoss Messaging">
-<!-- =========================================================================================== -->
-<!-- -->
-<!-- $Id: build.xml 4036 2008-04-11 12:43:24Z ataylor $ -->
-<!-- -->
-<!-- =========================================================================================== -->
+ <!-- ======================================================================================== -->
+ <!-- javac + junit properties -->
+ <!-- ======================================================================================== -->
+ <property file="build-messaging.properties" />
-<project default="jar" name="JBoss Messaging">
+ <!-- ======================================================================================== -->
+ <!-- Module name(s) & version -->
+ <!-- ======================================================================================== -->
- <!--
- Module name(s) & version.
- -->
-
<property name="module.name" value="messaging"/>
-
- <property name="messaging.version.major" value="2"/>
- <property name="messaging.version.minor" value="0"/>
- <property name="messaging.version.micro" value="0"/>
- <property name="messaging.version.suffix" value="BETA1-SNAPSHOT"/>
- <property name="messaging.version.tag" value="beta1"/>
- <property name="messaging.version.revision" value="0"/>
- <property name="messaging.version.incrementing" value="101"/>
- <property name="messaging.version.name" value="Stilton"/>
+ <!-- Version properties are read rom version.properties instead of duplicating them here -->
+ <property file="src/config/common/version.properties"/>
+ <property name="messaging.version.revision" value="0" />
<property name="messaging.version.svnurl" value="https://svn.jboss.org/repos/messaging/trunk"/>
<property name="messaging.version.string"
- value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix} (${messaging.version.name}, ${messaging.version.incrementing})"/>
+ value="${messaging.version.majorVersion}.${messaging.version.minorVersion}.${messaging.version.microVersion}.${messaging.version.versionSuffix} (${messaging.version.versionName}, ${messaging.version.incrementingVersion})"/>
<property name="module.version"
- value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.revision}.${messaging.version.tag}"/>
+ value="${messaging.version.majorVersion}.${messaging.version.minorVersion}.${messaging.version.revision}.${messaging.versionTag}"/>
+ <property name="build.artifact"
+ value="${module.name}-${messaging.version.majorVersion}.${messaging.version.minorVersion}.${messaging.version.microVersion}.${messaging.version.versionSuffix}"/>
- <!--jar names-->
+ <!-- ======================================================================================== -->
+ <!-- Jar names -->
+ <!-- ======================================================================================== -->
<property name="core.jar.name" value="jbm-core.jar"/>
<property name="jms.jar.name" value="jbm-jms.jar"/>
@@ -72,10 +69,6 @@
<!--source and build dirs-->
<property name="build.dir" value="build"/>
- <property name="sar.name" value="messaging.sar"/>
- <property name="war.name" value="messaging.war"/>
- <property name="build.sar.dir" value="${build.dir}/${sar.name}"/>
- <property name="build.war.dir" value="${build.sar.dir}/${war.name}"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.core.classes.dir" value="${build.dir}/classes/core"/>
<property name="build.jms.classes.dir" value="${build.dir}/classes/jms"/>
@@ -86,10 +79,13 @@
<property name="build.ra.classes.dir" value="${build.dir}/classes/ra"/>
<property name="build.jars.dir" value="${build.dir}/jars"/>
<property name="build.src.dir" value="${build.dir}/src"/>
- <property name="as.dir" value="AS"/>
<property name="src.dir" value="src"/>
<property name="src.main.dir" value="${src.dir}/main"/>
<property name="src.config.dir" value="${src.dir}/config"/>
+ <property name="src.config.standalone.non-clustered.dir" value="${src.dir}/config/stand-alone/non-clustered"/>
+ <property name="src.config.standalone.clustered.dir" value="${src.dir}/config/stand-alone/clustered"/>
+ <property name="src.config.jbossas.non-clustered.dir" value="${src.dir}/config/jboss-as/non-clustered"/>
+ <property name="src.config.jbossas.clustered.dir" value="${src.dir}/config/jboss-as/clustered"/>
<property name="src.schemas.dir" value="${src.dir}/schemas"/>
<property name="src.bin.dir" value="${src.dir}/bin"/>
<property name="doc.dir" value="docs"/>
@@ -100,8 +96,6 @@
<property name="native.bin.dir" value="native/bin"/>
<property name="examples.dir" value="examples"/>
- <property name="build.artifact"
- value="${module.name}-${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix}"/>
<property name="build.distro.dir"
value="${build.dir}/${build.artifact}"/>
<property name="build.distro.lib.dir" value="${build.distro.dir}/lib"/>
@@ -111,7 +105,6 @@
<property name="build.distro.api.dir" value="${build.distro.dir}/docs/api"/>
<property name="build.distro.examples.dir" value="${build.distro.dir}/examples"/>
<property name="build.distro.licenses.dir" value="${build.distro.dir}/licenses"/>
- <property name="build.distro.as.dir" value="${build.distro.dir}/AS"/>
<property name="artifacts.dir" value="${build.dir}/artifacts"/>
<!--default clustering server settings-->
@@ -119,8 +112,9 @@
<property name="jnp.port" value="1099"/>
<property name="jnp.rmiPort" value="1098"/>
<property name="jbm.data.dir" value="data1"/>
+
<!-- ======================================================================================== -->
- <!-- Thirdparty Dependency Definitions -->
+ <!-- Thirdparty Dependency -->
<!-- ======================================================================================== -->
<property name="project.thirdparty" value="thirdparty"/>
@@ -128,24 +122,18 @@
&libraries;
<!--
- This module is based on Java 1.5
+ Setting "external.project" to true makes jbossbuild use the current directory, and not its
+ parent, as project root. DO NOT change this.
-->
-
- <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="external.project" value="true"/>
<!--
- test properties
+ Setting "nodownload" to true inhibits downloading of up-to-date dependencies.
-->
+ <property name="nodownload" value="false"/>
+
+ <!-- ======================================================================================== -->
+ <!-- Test properties -->
+ <!-- ======================================================================================== -->
<property name="test.dir" value="tests"/>
<property name="test.build.dir" value="${test.dir}/build"/>
@@ -165,37 +153,11 @@
<property name="test.joram.config.dir" value="${test.joram.dir}/config"/>
<property name="test.joram.build.dir" value="${test.joram.dir}/build"/>
<property name="test.joram.classes.dir" value="${test.joram.build.dir}/classes"/>
- <property name="disable.invm" value="false"/>
- <!--
- JUnit configuration (values specified in ./build.properties have priority)
- -->
+ <!-- ======================================================================================== -->
+ <!-- Classpath definition -->
+ <!-- ======================================================================================== -->
- <property name="junit.printsummary" value="true"/>
- <property name="junit.haltonerror" value="false"/>
- <property name="junit.haltonfailure" value="false"/>
- <property name="junit.fork" value="true"/>
- <property name="junit.includeantruntime" value="true"/>
- <property name="junit.timeout" value="5400000"/>
- <!-- 90 mins -->
- <property name="clustering.junit.timeout" value="9000000"/>
- <!-- 150 mins -->
- <property name="clustering.stress.junit.timeout" value="5400000"/>
- <!-- 90 mins -->
- <property name="stress.junit.timeout" value="5400000"/>
- <!-- 90 mins -->
-
- <property name="junit.showoutput" value="true"/>
- <property name="junit.jvm" value=""/>
- <property name="junit.jvm.options" value=""/>
- <property name="junit.formatter.usefile" value="true"/>
- <property name="junit.batchtest.todir" value="${test.reports.dir}"/>
- <property name="junit.batchtest.haltonerror" value="false"/>
- <property name="junit.batchtest.haltonfailure" value="false"/>
- <property name="junit.batchtest.fork" value="true"/>
- <property name="junit.test.haltonfailure" value="false"/>
- <property name="junit.test.haltonerror" value="false"/>
-
<path id="jms.compilation.classpath">
<path location="${build.core.classes.dir}"/>
<path refid="jboss.jboss.javaee.classpath"/>
@@ -286,53 +248,54 @@
<path refid="jboss.jbossxb.classpath"/>
</path>
- <path id="unit.test.execution.classpath">
- <!-- ensure that the core client jar is included for
- tests security tests which needs to read version.properties
- from inside this jar
- -->
- <fileset dir="${build.jars.dir}">
- <include name="${core.client.jar.name}"/>
- </fileset>
- <pathelement location="${test.dir}/config"/>
- <pathelement location="${test.dir}/tmpfiles"/>
- <pathelement location="${test.classes.dir}"/>
- <pathelement location="${src.config.dir}"/>
- <pathelement location="${src.schemas.dir}"/>
- <path refid="test.compilation.classpath"/>
- <path refid="sun.jaxb.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="cglib.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="trove.trove.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="apache.logging.classpath"/>
- </path>
+ <path id="unit.test.execution.classpath">
+ <!-- ensure that the core client jar is included for
+ tests security tests which needs to read version.properties
+ from inside this jar
+ -->
+ <fileset dir="${build.jars.dir}">
+ <include name="${core.client.jar.name}"/>
+ </fileset>
+ <pathelement location="${test.dir}/config"/>
+ <pathelement location="${test.dir}/tmpfiles"/>
+ <pathelement location="${test.classes.dir}"/>
+ <pathelement location="${src.config.dir}/common"/>
+ <pathelement location="${src.schemas.dir}"/>
+ <path refid="test.compilation.classpath"/>
+ <path refid="sun.jaxb.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="cglib.classpath"/>
+ <path refid="jboss.common.core.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ </path>
- <path id="emma.unit.test.execution.classpath">
- <pathelement location="${test.dir}/config"/>
- <pathelement location="${test.dir}/tmpfiles"/>
- <pathelement location="${test.classes.dir}"/>
- <pathelement location="${src.config.dir}"/>
- <pathelement location="${src.schemas.dir}"/>
- <path refid="test.compilation.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="cglib.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="trove.trove.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="apache.logging.classpath"/>
- </path>
-
+ <path id="emma.unit.test.execution.classpath">
+ <pathelement location="${test.dir}/config"/>
+ <pathelement location="${test.dir}/tmpfiles"/>
+ <pathelement location="${test.classes.dir}"/>
+ <pathelement location="${src.config.dir}/common"/>
+ <pathelement location="${src.schemas.dir}"/>
+ <path refid="test.compilation.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="cglib.classpath"/>
+ <path refid="jboss.common.core.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ </path>
+
<path id="jms.test.execution.classpath">
<pathelement location="${test.dir}/config"/>
- <pathelement location="${src.config.dir}"/>
+ <pathelement location="${src.config.standalone.non-clustered.dir}"/>
+ <pathelement location="${src.config.dir}/common"/>
<pathelement location="${src.schemas.dir}"/>
<pathelement location="${test.jms.dir}/config"/>
<pathelement location="${test.jms.classes.dir}"/>
@@ -360,11 +323,7 @@
</path>
<path id="jms.standalone.server.classpath">
- <pathelement location="${test.dir}/config"/>
- <pathelement location="${src.config.dir}"/>
<pathelement location="${src.schemas.dir}"/>
- <pathelement location="${test.jms.dir}/config"/>
- <pathelement location="${test.jms.classes.dir}"/>
<path location="${build.jars.dir}/${transports.jar.name}"/>
<path refid="jms.test.execution.classpath"/>
@@ -373,40 +332,15 @@
<path refid="jboss.jboss.mdr.classpath"/>
<path refid="jboss.jboss.common.logging.spi.classpath"/>
<path refid="jboss.jboss.common.logging.log4j.classpath"/>
- <!---->
</path>
- <!--
- Setting "external.project" to true makes jbossbuild use the current directory, and not its
- parent, as project root. DO NOT change this.
- -->
- <property name="external.project" value="true"/>
- <!--
- Setting "nodownload" to true inhibits downloading of up-to-date dependencies.
- -->
- <property name="nodownload" value="false"/>
-
- <target name="createthirdparty" unless="inhibit.downloads" depends="check.inhibit.downloads">
- <ant antfile="build-thirdparty.xml" target="generate-libraries-ent"/>
- </target>
-
- <target name="check.inhibit.downloads">
- <condition property="inhibit.downloads">
- <or>
- <uptodate property="dependencies.current"
- srcfile="build-thirdparty.xml"
- targetfile="./thirdparty/libraries.ent"/>
- <istrue value="${nodownload}"/>
- </or>
- </condition>
- </target>
-
<target name="clean">
<delete dir="${build.dir}"/>
<delete dir="${test.build.dir}"/>
<delete dir="${test.output.dir}"/>
<delete dir="${test.jms.build.dir}"/>
<delete dir="${test.joram.build.dir}"/>
+ <ant dir="${examples.dir}" target="clean" />
</target>
<target name="init" depends="createthirdparty">
@@ -422,7 +356,27 @@
<mkdir dir="${build.jars.dir}"/>
<mkdir dir="${build.src.dir}"/>
</target>
+
+
+ <target name="createthirdparty" unless="inhibit.downloads" depends="check.inhibit.downloads">
+ <ant antfile="build-thirdparty.xml" target="generate-libraries-ent"/>
+ </target>
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <or>
+ <uptodate property="dependencies.current"
+ srcfile="build-thirdparty.xml"
+ targetfile="./thirdparty/libraries.ent"/>
+ <istrue value="${nodownload}"/>
+ </or>
+ </condition>
+ </target>
+
+ <!-- ================================= -->
+ <!-- Compilation targets -->
+ <!-- ================================= -->
+
<target name="compile" depends="compile-jms"/>
<target name="compile-core" depends="init">
@@ -452,7 +406,7 @@
<javah class="org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl"
classpath="${build.core.classes.dir}" destdir="./native/src"/>
- <copy file="${src.config.dir}/version.properties"
+ <copy file="${src.config.dir}/common/version.properties"
tofile="${build.core.classes.dir}/version.properties"/>
<!--
@@ -591,33 +545,58 @@
</exec>
</target>
- <target name="validate-configuration" description="validate configuration files">
- <echo>validating server configuration</echo>
- <schemavalidate file="src/config/jbm-configuration.xml">
+ <target name="validate-configuration">
+ <antcall target="-validate-configuration">
+ <param name="conf.dir" value="${src.config.standalone.non-clustered.dir}"/>
+ </antcall>
+ <!-- user configuration is only for standalone -->
+ <schemavalidate file="${src.config.standalone.non-clustered.dir}/jbm-users.xml">
<schema namespace="urn:jboss:messaging"
- file="src/schemas/jbm-configuration.xsd"/>
+ file="${src.schemas.dir}/jbm-users.xsd"/>
</schemavalidate>
- <echo>validating security credentials</echo>
- <schemavalidate file="src/config/jbm-users.xml">
+
+ <antcall target="-validate-configuration">
+ <param name="conf.dir" value="${src.config.standalone.clustered.dir}"/>
+ </antcall>
+ <!-- user configuration is only for standalone -->
+ <schemavalidate file="${src.config.standalone.clustered.dir}/jbm-users.xml">
<schema namespace="urn:jboss:messaging"
- file="src/schemas/jbm-users.xsd"/>
+ file="${src.schemas.dir}/jbm-users.xsd"/>
</schemavalidate>
- <echo>validating queue settings</echo>
- <schemavalidate file="src/config/jbm-queues.xml">
+
+ <antcall target="-validate-configuration">
+ <param name="conf.dir" value="${src.config.jbossas.non-clustered.dir}"/>
+ </antcall>
+
+ <antcall target="-validate-configuration">
+ <param name="conf.dir" value="${src.config.jbossas.clustered.dir}"/>
+ </antcall>
+ </target>
+
+ <target name="-validate-configuration">
+ <echo>validating configuration from ${conf.dir}</echo>
+ <schemavalidate file="${conf.dir}/jbm-configuration.xml">
<schema namespace="urn:jboss:messaging"
- file="src/schemas/jbm-queues.xsd"/>
+ file="${src.schemas.dir}/jbm-configuration.xsd"/>
</schemavalidate>
- <echo>validating jms resources</echo>
- <schemavalidate file="src/config/jbm-jms.xml">
+ <schemavalidate file="${conf.dir}/jbm-queues.xml">
<schema namespace="urn:jboss:messaging"
- file="src/schemas/jbm-jms.xsd"/>
+ file="${src.schemas.dir}/jbm-queues.xsd"/>
</schemavalidate>
+ <schemavalidate file="${conf.dir}/jbm-jms.xml">
+ <schema namespace="urn:jboss:messaging"
+ file="${src.schemas.dir}/jbm-jms.xsd"/>
+ </schemavalidate>
</target>
-
+
<!-- ======================================================================================== -->
- <!-- Archival Tasks -->
+ <!-- Jar Targets -->
<!-- ======================================================================================== -->
+ <target name="jar"
+ depends="jar-core, jar-client, jar-jms, jar-transports, jar-security, jar-bootstrap, jar-logging, jar-ra">
+ </target>
+
<target name="jar-core" depends="compile-core">
<jar jarfile="${build.jars.dir}/${core.jar.name}">
@@ -718,97 +697,18 @@
</jar>
</target>
- <target name="jar"
- depends="jar-core, jar-client, jar-jms, jar-transports, jar-security, jar-bootstrap, jar-logging, jar-ra">
- </target>
-
-
<!-- ======================================================================================== -->
- <!-- Distro Tasks -->
+ <!-- Distribution targets -->
<!-- ======================================================================================== -->
- <target name="deploy-jboss" depends="isJbossHomeSet, build.sar">
- <mkdir dir="${JBOSS_HOME}/server/messaging" />
- <copy todir="${JBOSS_HOME}/server/messaging">
- <fileset dir="${JBOSS_HOME}/server/default">
- <exclude name="**/messaging/**"/>
- <exclude name="**/jboss-messaging.jar"/>
- <exclude name="**/jboss-messaging-client.jar"/>
- </fileset>
- </copy>
- <delete file="${JBOSS_HOME}/common/lib/jboss-messaging.jar"/>
- <delete file="${JBOSS_HOME}/client/lib/jboss-messaging-client.jar"/>
- <copy todir="${JBOSS_HOME}/server/messaging/deploy">
- <fileset dir="${build.dir}">
- <include name="${sar.name}/**/*"/>
- </fileset>
- </copy>
- <copy todir="${JBOSS_HOME}/server/messaging/conf" overwrite="yes">
- <fileset dir="${src.config.dir}">
- <include name="**/*login-config.xml"/>
- </fileset>
- </copy>
- </target>
-
- <target name="deploy" depends="isJbossHomeSet, build.sar">
- <copy todir="${JBOSS_HOME}/server/messaging/deploy">
- <fileset dir="${build.dir}">
- <include name="${sar.name}/**/*"/>
- </fileset>
- </copy>
- </target>
-
- <target name="isJbossHomeSet" unless="JBOSS_HOME">
- <fail message="please set JBOSS_HOME"/>
- </target>
-
- <target name="build.sar" depends="jar">
- <mkdir dir="${build.sar.dir}"/>
- <mkdir dir="${build.war.dir}"/>
-
- <copy todir="${build.sar.dir}">
- <fileset dir="${src.config.dir}">
- <include name="jbm-*"/>
- <include name="queues.xml"/>
- <exclude name="jbm-standalone*"/>
- <exclude name="jbm-cluster*"/>
- </fileset>
- </copy>
- <copy todir="${build.sar.dir}">
- <fileset dir="${src.schemas.dir}">
- <include name="*.xsd"/>
- </fileset>
- </copy>
- <copy todir="${build.sar.dir}">
- <fileset dir="${build.jars.dir}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${netty.netty.lib}">
- <include name="*.jar"/>
- <exclude name="*sources.jar"/>
- </fileset>
- </copy>
- <copy todir="${build.war.dir}">
- <fileset dir="${src.dir}">
- <include name="WEB-INF/*"/>
- </fileset>
- </copy>
- <copy todir="${build.sar.dir}">
- <fileset dir="${src.schemas.dir}">
- <include name="*"/>
- </fileset>
- </copy>
- </target>
-
<target name="distro" depends="jar, jar-client, validate-configuration">
-
+
<mkdir dir="${build.distro.dir}"/>
<mkdir dir="${build.distro.lib.dir}"/>
<mkdir dir="${build.distro.config.dir}"/>
<mkdir dir="${build.distro.bin.dir}"/>
<mkdir dir="${build.distro.api.dir}"/>
<mkdir dir="${build.distro.licenses.dir}"/>
- <mkdir dir="${build.distro.as.dir}"/>
<copy todir="${build.distro.lib.dir}">
<fileset dir="${build.jars.dir}">
@@ -819,6 +719,7 @@
<include name="${bootstrap.jar.name}"/>
<include name="${logging.jar.name}"/>
<include name="${core.client.jar.name}"/>
+ <include name="jbm-ra.rar"/>
</fileset>
<fileset dir="${jboss.microcontainer.lib}">
<include name="jboss-container.jar"/>
@@ -898,6 +799,7 @@
<include name="*.xml"/>
<include name="jndi.properties"/>
<include name="logging.properties"/>
+ <exclude name="common/version.properties" />
</fileset>
<fileset dir="${test.dir}/config">
<include name="messaging.keystore"/>
@@ -937,22 +839,15 @@
</fileset>
</copy>
- <copy todir="${build.distro.as.dir}">
- <fileset dir="${as.dir}"/>
+ <copy todir="${build.distro.config.dir}">
+ <fileset dir="${src.config.dir}"/>
</copy>
- <copy todir="${build.distro.as.dir}">
- <fileset dir="${build.jars.dir}">
- <include name="jbm-ra.rar"/>
- </fileset>
- </copy>
- <copy tofile="${build.distro.examples.dir}/jms/common/config/ant.properties" file="src/config/examples-ant.properties" overwrite="true">
+
+ <!-- examples-ant.properties allow the examples to be run from the source or from the distribution -->
+ <!-- by configuring the correct lib/config location -->
+ <copy tofile="${build.distro.examples.dir}/jms/common/config/ant.properties" file="src/config/examples-ant.properties" overwrite="true" />
+ <copy tofile="${build.distro.examples.dir}/javaee/common/config/ant.properties" file="src/config/examples-ant.properties" overwrite="true" />
- </copy>
- <echo message="lib.dir=../../lib${line.separator}client.jar=../../lib/jboss-messaging-client.jar${line.separator}config.dir=../../config${line.separator}server.jar=../../lib/jboss-messaging.jar"
- file="${build.distro.examples.dir}/build.properties"/>
- <echo message="java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory${line.separator}java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"
- file="${build.distro.config.dir}/jndi.properties"/>
-
<zip basedir="${build.dir}"
destfile="${build.dir}/${build.artifact}.zip">
<include name="${build.artifact}/**"/>
@@ -975,6 +870,10 @@
destfile="${build.dir}/${build.artifact}.tar.gz"/>
</target>
+ <!-- ======================================================================================== -->
+ <!-- Documentation Targets -->
+ <!-- ======================================================================================== -->
+
<target name="dist-doc" unless="no-doc">
<antcall target="userdoc"/>
<copy todir="${build.distro.dir}/docs/userguide">
@@ -1062,17 +961,17 @@
<target name="artifact">
<echo message="${artifact.name}"/>
- <property name="artifacts.version" value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix}"/>
+ <property name="artifacts.version" value="${messaging.version.majorVersion}.${messaging.version.minorVersion}.${messaging.version.microVersion}.${messaging.version.versionSuffix}"/>
<property name="artifact.dir" value="${artifacts.dir}/${artifact.name}/${artifacts.version}"/>
<mkdir dir="${artifact.dir}"/>
- <copy tofile="${artifact.dir}/${artifact.name}-${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix}.jar"
+ <copy tofile="${artifact.dir}/${artifact.name}-${artifacts.version}.jar"
file="${build.jars.dir}/${artifact.name}.jar">
<!-- <globmapper from="jbm-core" to="jbm-core-${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix}*"/>-->
</copy>
- <copy file="pom.xml" tofile="${artifact.dir}/${artifact.name}-${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix}.pom">
+ <copy file="pom.xml" tofile="${artifact.dir}/${artifact.name}-${artifacts.version}.pom">
<filterset>
<filter token="artifactid" value="${artifact.name}"/>
- <filter token="version" value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix}"/>
+ <filter token="version" value="${artifacts.version}"/>
</filterset>
</copy>
<checksum algorithm="MD5">
@@ -1085,7 +984,9 @@
</checksum>
</target>
- <!-- test targets -->
+ <!-- ======================================================================================== -->
+ <!-- Tests Targets (compilation + execution) -->
+ <!-- ======================================================================================== -->
<target name="compile-unit-tests">
<mkdir dir="${test.classes.dir}"/>
@@ -1202,7 +1103,7 @@
<!--<jvmarg value="-ea"/>-->
<classpath refid="unit.test.execution.classpath"/>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
+ <batchtest todir="${test.reports.dir}"
haltonfailure="${junit.batchtest.haltonfailure}"
haltonerror="${junit.batchtest.haltonerror}"
failureproperty="tests.failed">
@@ -1250,11 +1151,10 @@
value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
<!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
<!--<jvmarg value="-ea"/>-->
- <sysproperty key="jbm.remoting.disable.invm" value="${disable.invm}"/>
<sysproperty key="java.io.tmpdir" value="${java.io.tmpdir}"/>
<classpath refid="jms.test.execution.classpath"/>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
+ <batchtest todir="${test.reports.dir}"
haltonfailure="${junit.batchtest.haltonfailure}"
haltonerror="${junit.batchtest.haltonerror}">
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -1292,11 +1192,10 @@
<jvmarg value="-Dmodule.output=./"/>
<!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
<!--<jvmarg value="-ea"/>-->
- <sysproperty key="jbm.remoting.disable.invm" value="${disable.invm}"/>
<sysproperty key="java.io.tmpdir" value="${java.io.tmpdir}"/>
<classpath refid="joram.test.execution.classpath"/>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
+ <batchtest todir="${test.reports.dir}"
haltonfailure="${junit.batchtest.haltonfailure}"
haltonerror="${junit.batchtest.haltonerror}">
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -1334,7 +1233,7 @@
<!--<jvmarg value="-ea"/>-->
<classpath refid="unit.test.execution.classpath"/>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
+ <batchtest todir="${test.reports.dir}"
haltonfailure="${junit.batchtest.haltonfailure}"
haltonerror="${junit.batchtest.haltonerror}">
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -1367,6 +1266,10 @@
</junitreport>
</target>
+ <!-- ======================================================================================== -->
+ <!-- Code coverage + find bugs targets -->
+ <!-- ======================================================================================== -->
+
<target name="emma" depends="jar, compile-unit-tests">
<property name="emma.dir" location="${build.dir}/emma"/>
@@ -1413,7 +1316,7 @@
<!--<jvmarg value="-ea"/>-->
<classpath refid="emma.execution.classpath"/>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
+ <batchtest todir="${test.reports.dir}"
haltonfailure="${junit.batchtest.haltonfailure}"
haltonerror="${junit.batchtest.haltonerror}">
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -1442,8 +1345,23 @@
</emma>
</target>
- <!--server-->
+
+ <target name="findbugs" depends="jar">
+ <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
+ <findbugs home="${findbugs.home}"
+ output="html"
+ outputFile="bugs.html">
+ <auxClasspath refid="findbugs.classpath"/>
+ <sourcePath path="${src.main.dir}"/>
+ <class location="${build.jars.dir}/jboss-${module.name}.jar"/>
+ </findbugs>
+ </target>
+
+ <!-- ======================================================================================== -->
+ <!-- Server execution targets -->
+ <!-- ======================================================================================== -->
+
<target name="runServer" depends="jar">
<java classname="org.jboss.messaging.integration.bootstrap.JBMBootstrapServer" fork="true">
<jvmarg value="-XX:+UseParallelGC"/>
@@ -1452,15 +1370,14 @@
<jvmarg value="-XX:+AggressiveOpts"/>
<jvmarg value="-XX:+UseFastAccessorMethods"/>
<jvmarg value="-Dcom.sun.management.jmxremote"/>
- <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
+ <jvmarg value="-Djava.util.logging.config.file=${src.config.standalone.non-clustered.dir}/logging.properties"/>
<jvmarg
value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
<jvmarg value="-Djava.library.path=${native.bin.dir}"/>
- <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>
- <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"/>
<!--<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>-->
<arg line="jbm-standalone-beans.xml"/>
<classpath refid="jms.standalone.server.classpath"/>
+ <classpath path="${src.config.standalone.non-clustered.dir}" />
</java>
</target>
@@ -1472,18 +1389,17 @@
<jvmarg value="-XX:+AggressiveOpts"/>
<jvmarg value="-XX:+UseFastAccessorMethods"/>
<jvmarg value="-Dcom.sun.management.jmxremote"/>
- <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
+ <jvmarg value="-Djava.util.logging.config.file=${src.config.standalone.clustered.dir}/logging.properties"/>
<jvmarg
value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
<jvmarg value="-Djava.library.path=${native.bin.dir}"/>
- <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>
- <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"/>
<jvmarg value="-Djbm.remoting.netty.port=${jbm.remoting.netty.port}"/>
<jvmarg value="-Djnp.port=${jnp.port}"/>
<jvmarg value="-Djnp.rmiPort=${jnp.rmiPort}"/>
<jvmarg value="-Djbm.data.dir=${jbm.data.dir}"/>
- <arg line="jbm-cluster-standalone-beans.xml"/>
+ <arg line="jbm-standalone-beans.xml"/>
<classpath refid="jms.standalone.server.classpath"/>
+ <classpath path="${src.config.standalone.clustered.dir}" />
</java>
</target>
@@ -1510,16 +1426,4 @@
</java>
</target>
- <target name="findbugs" depends="jar">
- <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
- <findbugs home="${findbugs.home}"
- output="html"
- outputFile="bugs.html">
- <auxClasspath refid="findbugs.classpath"/>
- <sourcePath path="${src.main.dir}"/>
- <class location="${build.jars.dir}/jboss-${module.name}.jar"/>
- </findbugs>
-
- </target>
-
</project>
Modified: trunk/examples/javaee/common/build.xml
===================================================================
--- trunk/examples/javaee/common/build.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/examples/javaee/common/build.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -64,7 +64,7 @@
<fileset dir="${jboss.home}/client">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/server/jbm2_default/lib">
+ <fileset dir="${jboss.home}/server/default-with-jbm2/lib">
<include name="netty-3.1.0.BETA1.jar"/>
</fileset>
</path>
@@ -118,17 +118,17 @@
<target name="do-deploy" depends="validate-jboss, ear">
<!-- some examples may choose to do a little extra on deploy and call this target directly -->
- <copy file="${build.dir}/mdb-example.ear" todir="${jboss.home}/server/jbm2_default/deploy"/>
+ <copy file="${build.dir}/mdb-example.ear" todir="${jboss.home}/server/default-with-jbm2/deploy"/>
</target>
<target name="undeploy" depends="validate-jboss">
- <delete file="${jboss.home}/server/jbm2_default/deploy/mdb-example.ear"/>
+ <delete file="${jboss.home}/server/default-with-jbm2/deploy/mdb-example.ear"/>
</target>
<target name="validate-jboss">
<fail unless="ENV.JBOSS_HOME" message="JBOSS_HOME environment variable not set! Set it and try again."/>
- <available property="default-config" type="dir" file="${jboss.home}/server/jbm2_default"/>
- <fail unless="default-config" message="${jboss.home}/server/jbm2_default not found!"/>
+ <available property="default-config" type="dir" file="${jboss.home}/server/default-with-jbm2"/>
+ <fail unless="default-config" message="${jboss.home}/server/default-with-jbm2 not found!"/>
</target>
<target name="runExample" depends="compile">
Modified: trunk/examples/javaee/ejb-jms-transaction/readme.html
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/readme.html 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/examples/javaee/ejb-jms-transaction/readme.html 2009-04-27 14:27:29 UTC (rev 6579)
@@ -30,12 +30,12 @@
database documentation to configure it appropriately.</p>
<p>To use MySQL with JBoss AS 5</p>
<ul>
- <li>remove HSQLDB configuration from jbm2_default deployment</li>
+ <li>remove HSQLDB configuration from default-with-jbm2 deployment</li>
<pre>
- <code>rm $JBOSS_HOME/server/jbm2_default/deploy/hsqldb-ds.xml</code>
+ <code>rm $JBOSS_HOME/server/default-with-jbm2/deploy/hsqldb-ds.xml</code>
</pre>
- <li>copy <a href="config/mysql-ds.xml">mysql-ds.xml</a> to <code>$JBOSS_HOME/server/jbm2_default/deploy/</code></li>
- <li>copy MySQL JDBC jar to <code>$JBOSS_HOME/server/jbm2_default/lib/</code></li>
+ <li>copy <a href="config/mysql-ds.xml">mysql-ds.xml</a> to <code>$JBOSS_HOME/server/default-with-jbm2/deploy/</code></li>
+ <li>copy MySQL JDBC jar to <code>$JBOSS_HOME/server/default-with-jbm2/lib/</code></li>
</ul>
<p>MySQL is configured to connect to a <code>jbossdb</code> database using the <code>jboss</code>/<code>jboss</code> credentials
Modified: trunk/examples/javaee/jms-bridge/readme.html
===================================================================
--- trunk/examples/javaee/jms-bridge/readme.html 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/examples/javaee/jms-bridge/readme.html 2009-04-27 14:27:29 UTC (rev 6579)
@@ -31,7 +31,7 @@
<h3>JBoss Messaging configuration</h3>
<p>We will add two queues to JBoss Messaging JMS configuration in
- <code>${JBOSS_HOME}/server/jbm2/default/deploy/messaging.sar/jbm-jms.xml</code></p>
+ <code>${JBOSS_HOME}/server/default-with-jbm2/deploy/messaging.sar/jbm-jms.xml</code></p>
<pre>
<code><queue name="source">
<entry name="/queue/source"/>
@@ -44,7 +44,7 @@
<h3>JMS Bridge configuration</h3>
<p>The JMS Bridge is configured using JBoss microcontainer.<br />
- To setup the bridge in JBoss AS 5, copy <a href="config/jms-bridge-jboss-beans.xml">jms-bridge-jboss-beans.xml</a> to <code>${JBOSS_HOME}/server/jbm2/default/deploy/</code></p>
+ To setup the bridge in JBoss AS 5, copy <a href="config/jms-bridge-jboss-beans.xml">jms-bridge-jboss-beans.xml</a> to <code>${JBOSS_HOME}/server/default-with-jbm2/deploy/</code></p>
<p><span class="missing-doc">Explain the bridge configuration</span></p>
Modified: trunk/examples/javaee/mdb-remote/build.xml
===================================================================
--- trunk/examples/javaee/mdb-remote/build.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/examples/javaee/mdb-remote/build.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -30,7 +30,7 @@
<import file="../common/build.xml"/>
<target name="deploy">
- <copy file="./server-config/jms-remote-ds.xml" todir="${jboss.home}/server/jbm2_default/deploy"/>
+ <copy file="./server-config/jms-remote-ds.xml" todir="${jboss.home}/server/default-with-jbm2/deploy"/>
<antcall target="do-deploy"></antcall>
</target>
Modified: trunk/examples/javaee/mdb-remote/readme.html
===================================================================
--- trunk/examples/javaee/mdb-remote/readme.html 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/examples/javaee/mdb-remote/readme.html 2009-04-27 14:27:29 UTC (rev 6579)
@@ -128,10 +128,10 @@
<ol>
<li>Define the property JBOSS_HOME pointing to the root of a JBoss 5.1 distribution</li>
<li>Create a JBoss messaging clustered profile by typing <code>ant</code> int the <code>AS</code> directory off the root of
- the JBoss Messaging distribution. This will create a server profile called <code>$JBOSS_HOME/server/jbm2_default</code>.</li>
- <li>Copy the directory <code>$JBOSS_HOME/server/jbm2_default</code> to <code>$JBOSS_HOME/server/jbm2_default_2</code>.</li>
- <li>Start the first server with <code>./run.sh -c jbm2_default</code></li>
- <li>Start the second server with <code>./run.sh -c jbm2_default_2 -Djboss.service.binding.set=ports-01</li>
+ the JBoss Messaging distribution. This will create a server profile called <code>$JBOSS_HOME/server/default-with-jbm2</code>.</li>
+ <li>Copy the directory <code>$JBOSS_HOME/server/default-with-jbm2</code> to <code>$JBOSS_HOME/server/default-with-jbm2_2</code>.</li>
+ <li>Start the first server with <code>./run.sh -c default-with-jbm2</code></li>
+ <li>Start the second server with <code>./run.sh -c default-with-jbm2_2 -Djboss.service.binding.set=ports-01</li>
</ol>
<h2>Example part step-by-step</h2>
Modified: trunk/examples/javaee/servlet-transport/build.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/build.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/examples/javaee/servlet-transport/build.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -30,14 +30,14 @@
<import file="../common/build.xml"/>
<target name="deploy-servlet">
- <copy todir="${jboss.home}/server/jbm2_default/deploy/jms-servlet.war">
+ <copy todir="${jboss.home}/server/default-with-jbm2/deploy/jms-servlet.war">
<fileset dir="config/jms-servlet.war"/>
</copy>
<sleep seconds="5"/>
</target>
<target name="undeploy-servlet">
- <delete dir="${jboss.home}/server/jbm2_default/deploy/jms-servlet.war" quiet="true"/>
+ <delete dir="${jboss.home}/server/default-with-jbm2/deploy/jms-servlet.war" quiet="true"/>
</target>
<target name="run" depends="deploy-servlet">
Modified: trunk/examples/javaee/xarecovery/readme.html
===================================================================
--- trunk/examples/javaee/xarecovery/readme.html 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/examples/javaee/xarecovery/readme.html 2009-04-27 14:27:29 UTC (rev 6579)
@@ -25,7 +25,7 @@
<h3>XA Recovery configuration</h3>
<p>You need to enable XA Recovery of JBoss Messaging resources.</p>
- <p>In the <code>jta</code> section of the <code>$JBOSS_HOME/server/jbm2_default/conf/jbossts-properties.xml</code> configuration file, add the
+ <p>In the <code>jta</code> section of the <code>$JBOSS_HOME/server/default-with-jbm2/conf/jbossts-properties.xml</code> configuration file, add the
property:</p>
<pre>
<code><property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
@@ -33,11 +33,11 @@
</pre>
<p>This informs the Recovery Manager that it can recovers JBoss Messaging XA Resources using the <code>XAConnectionFactory</code> bound to <code>java:/XAConnectionFactory</code> in JNDI
- (as it is configured in <code>$JBOSS_HOME/server/jbm2_default/deploy/messaging.sar/jbm-jms.xml</code>).</p>
+ (as it is configured in <code>$JBOSS_HOME/server/default-with-jbm2/deploy/messaging.sar/jbm-jms.xml</code>).</p>
<h2>Example step-by-step</h2>
- <p><em>You need to start JBoss AS 5 with the <code>jbm2_default</code> configuration.<br />
+ <p><em>You need to start JBoss AS 5 with the <code>default-with-jbm2</code> configuration.<br />
To deploy the example, type <code>ant deploy</code> from this directory<br />
Once the example is deployed in JBoss AS 5, type <code>ant sender</code> to start the example.
This will also crash the server, you will need to restart it.<br />
Modified: trunk/examples/jms/common/config/ant.properties
===================================================================
--- trunk/examples/jms/common/config/ant.properties 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/examples/jms/common/config/ant.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,4 +1,4 @@
jbm.example.logserveroutput=true
-logging.properties=${imported.basedir}/../../../src/config/logging.properties
+logging.properties=${imported.basedir}/../../../src/config/stand-alone/non-clustered/logging.properties
jbm.jars.dir=${imported.basedir}/../../../build/jars
-jars.dir=${imported.basedir}/../../../thirdparty
\ No newline at end of file
+jars.dir=${imported.basedir}/../../../thirdparty
Modified: trunk/src/bin/run.bat
===================================================================
--- trunk/src/bin/run.bat 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/bin/run.bat 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,9 +1,10 @@
@ echo off
setlocal ENABLEDELAYEDEXPANSION
set JBM_HOME=..
-set CLASSPATH=%JBM_HOME%\config\;%JBM_HOME%\schemas\
-set JVM_ARGS=-XX:+UseParallelGC -Xms512M -Xmx1024M -Djava.util.logging.config.file=%JBM_HOME%\config\logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=.
-REM export JVM_ARGS="-Xmx512M -Djava.util.logging.config.file=%JBM_HOME%\config\logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
+set CONFIG_DIR=%JBM_HOME%\config\stand-alone\non-clustered
+set CLASSPATH=%CONFIG_DIR%;%JBM_HOME%\schemas\
+set JVM_ARGS=-XX:+UseParallelGC -Xms512M -Xmx1024M -Djava.util.logging.config.file=%CONFIG_DIR%\logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=.
+REM export JVM_ARGS="-Xmx512M -Djava.util.logging.config.file=%CONFIG_DIR%\config\logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
for /R ..\lib %%A in (*.jar) do (
SET CLASSPATH=!CLASSPATH!;%%A
)
Modified: trunk/src/bin/run.sh
===================================================================
--- trunk/src/bin/run.sh 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/bin/run.sh 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,11 +1,18 @@
export JBM_HOME=..
-if [ a"$1" = a ]; then FILENAME=jbm-standalone-beans.xml; else FILENAME="$1"; fi
-export CLASSPATH=$JBM_HOME/config/:$JBM_HOME/schemas/
-export JVM_ARGS="-XX:+UseParallelGC -Xms512M -Xmx1024M -Djava.util.logging.config.file=$JBM_HOME/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=."
-#export JVM_ARGS="-Xmx512M -Djava.util.logging.config.file=$JBM_HOME/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
+
+# By default, the server is started in the non-clustered standalone configuration
+
+if [ a"$1" = a ]; then CONFIG_DIR=$JBM_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1"; fi
+if [ a"$2" = a ]; then FILENAME=jbm-standalone-beans.xml; else FILENAME="$2"; fi
+
+export CLASSPATH=$CONFIG_DIR:$JBM_HOME/schemas/
+export JVM_ARGS="-XX:+UseParallelGC -Xms512M -Xmx1024M -Djava.util.logging.config.file=$CONFIG_DIR/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=."
+#export JVM_ARGS="-Xmx512M -Djava.util.logging.config.file=$CONFIG_DIR/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
+
for i in `ls $JBM_HOME/lib/*.jar`; do
CLASSPATH=$i:$CLASSPATH
done
+
echo ***********************************************************************************
echo "java $JVM_ARGS -classpath $CLASSPATH org.jboss.messaging.integration.bootstrap.JBMBootstrapServer $FILENAME"
echo ***********************************************************************************
Added: trunk/src/config/common/version.properties
===================================================================
--- trunk/src/config/common/version.properties (rev 0)
+++ trunk/src/config/common/version.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,7 @@
+messaging.version.versionName=Stilton
+messaging.version.majorVersion=2
+messaging.version.minorVersion=0
+messaging.version.microVersion=0
+messaging.version.incrementingVersion=101
+messaging.version.versionSuffix=BETA1-SNAPSHOT
+messaging.version.versionTag=beta1
\ No newline at end of file
Modified: trunk/src/config/examples-ant.properties
===================================================================
--- trunk/src/config/examples-ant.properties 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/examples-ant.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,4 +1,4 @@
jbm.example.logserveroutput=false
-logging.properties=${imported.basedir}/../../../config/logging.properties
+logging.properties=${imported.basedir}/../../../config/stand-alone/clustered/logging.properties
jbm.jars.dir=${imported.basedir}/../../../lib
jars.dir=${imported.basedir}/../../../lib
\ No newline at end of file
Deleted: trunk/src/config/jbm-cluster-configuration.xml
===================================================================
--- trunk/src/config/jbm-cluster-configuration.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/jbm-cluster-configuration.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,188 +0,0 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
-
- <clustered>true</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-max-pool-size>30</scheduled-max-pool-size>
-
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
-
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
-
- <management-address>admin.management</management-address>
- <management-notification-address>admin.notification</management-notification-address>
-
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
-
- <!-- by default, message counter is disabled -->
- <message-counter-enabled>false</message-counter-enabled>
-
- <connection-scan-period>10000</connection-scan-period>
-
- <!--how long before timing a transaction out-->
- <transaction-timeout>60000</transaction-timeout>
- <!--how often to scan for timedout transactions-->
- <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
-
- <!-- how often do we scan the queues for expired messages-->
- <message-expiry-scan-period>30000</message-expiry-scan-period>
- <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
- <message-expiry-thread-priority>3</message-expiry-thread-priority>
-
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
- <queue-activation-timeout>30000</queue-activation-timeout>
-
- <backup>false</backup>
-
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-backup">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
- </connector>
-
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </connector>
-
- <connector name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector>
-
- <connector name="netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
- <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
- </connector>
-
- <connector name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <!-- In VM acceptor -->
- <acceptor name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
- <!-- Netty standard TCP acceptor -->
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
- </acceptor>
- <!-- Netty SSL Acceptor
- <acceptor name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </acceptor>
- -->
- <!--Netty HTTP Acceptor-->
- <!--<acceptor name-"netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
- <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
- </acceptor>-->
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <local-bind-port>1234</local-bind-port>
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>5000</broadcast-period>
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <bridges>
- <bridge name="foo">
- <queue-name>toto</queue-name>
- <forwarding-address>blah</forwarding-address>
- <filter string="color > 1"/>
- <connector-ref connector-name="netty"/>
- </bridge>
- </bridges>
-
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>${jbm.data.dir}/paging</paging-directory>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
-
- <bindings-directory>${jbm.data.dir}/bindings</bindings-directory>
-
- <create-bindings-dir>true</create-bindings-dir>
-
- <journal-directory>${jbm.data.dir}/journal</journal-directory>
-
- <create-journal-dir>true</create-journal-dir>
-
- <journal-type>ASYNCIO</journal-type>
-
- <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
- Set this to -1 to disable this feature -->
- <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
-
- <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
- <journal-sync-transactional>true</journal-sync-transactional>
-
- <!-- Does the journal sync to disk for every non transactional persistent operation? -->
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
-
- <!-- 10 MB journal file size -->
- <journal-file-size>10485760</journal-file-size>
-
- <journal-min-files>15</journal-min-files>
-
- <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
- (parameter ignored on NIO)
- You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
- -->
- <journal-max-aio>10000</journal-max-aio>
-
- </configuration>
-
-</deployment>
Deleted: trunk/src/config/jbm-cluster-standalone-beans.xml
===================================================================
--- trunk/src/config/jbm-cluster-standalone-beans.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/jbm-cluster-standalone-beans.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">${jnp.port}</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">${jnp.rmiPort}</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <bean name="DeploymentManager" class="org.jboss.messaging.core.deployers.impl.FileDeploymentManager">
- <constructor>
- <!-- The scan time in milliseconds -->
- <parameter>5000</parameter>
- </constructor>
- </bean>
-
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
- <property name="configurationUrl">jbm-cluster-configuration.xml</property>
- </bean>
-
- <!--<bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBossASSecurityManager"/>-->
-
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- </bean>
-
- <bean name="BasicSecurityDeployer" class="org.jboss.messaging.core.deployers.impl.BasicUserCredentialsDeployer">
- <constructor>
- <parameter>
- <inject bean="DeploymentManager"/>
- </parameter>
- </constructor>
- <property name="jbmSecurityManager">
- <inject bean="JBMSecurityManager"/>
- </property>
- </bean>
-
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <depends>AddressSettingsDeployer</depends>
- <property name="storageManager">
- <inject bean="StorageManager"/>
- </property>
- <property name="remotingService">
- <inject bean="RemotingService"/>
- </property>
- <property name="configuration">
- <inject bean="Configuration"/>
- </property>
- <property name="securityManager">
- <inject bean="JBMSecurityManager"/>
- </property>
- <property name="managementService">
- <inject bean="ManagementService"/>
- </property>
- </bean>
-
- <bean name="StorageManager" class="org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager">
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="RemotingService" class="org.jboss.messaging.core.remoting.server.impl.RemotingServiceImpl">
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- </constructor>
- <property name="managementService">
- <inject bean="ManagementService"/>
- </property>
- </bean>
-
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer" />
- </parameter>
- </constructor>
- </bean>
-
- <bean name="JMSServerDeployer" class="org.jboss.messaging.jms.server.impl.JMSServerDeployer">
- <constructor>
- <parameter>
- <inject bean="DeploymentManager"/>
- </parameter>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- </constructor>
- <property name="jmsServerManager">
- <inject bean="JMSServerManager"/>
- </property>
- </bean>
-
- <bean name="AddressSettingsDeployer" class="org.jboss.messaging.core.deployers.impl.AddressSettingsDeployer">
- <constructor>
- <parameter>
- <inject bean="DeploymentManager"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="addressSettingsRepository" state="Configured"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="SecurityDeployer" class="org.jboss.messaging.core.deployers.impl.SecurityDeployer">
- <constructor>
- <parameter>
- <inject bean="DeploymentManager"/>
- </parameter>
- <parameter>
- <inject bean="MessagingServer" property="securityRepository"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="ManagementService" class="org.jboss.messaging.core.management.impl.ManagementServiceImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="Configuration" property="JMXManagementEnabled" />
- </parameter>
- </constructor>
- </bean>
-
- <bean name="JMSManagementService" class="org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl">
- <constructor>
- <parameter>
- <inject bean="ManagementService"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
-</deployment>
\ No newline at end of file
Deleted: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/jbm-configuration.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,215 +0,0 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
-
- <clustered>false</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-max-pool-size>30</scheduled-max-pool-size>
-
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
-
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
-
- <management-address>jbm.management</management-address>
- <management-notification-address>jbm.notifications</management-notification-address>
-
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
-
- <!-- by default, message counter is disabled -->
- <message-counter-enabled>false</message-counter-enabled>
-
- <connection-scan-period>10000</connection-scan-period>
-
- <!--how long before timing a transaction out-->
- <transaction-timeout>60000</transaction-timeout>
- <!--how often to scan for timedout transactions-->
- <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
-
- <!-- how often do we scan the queues for expired messages-->
- <message-expiry-scan-period>30000</message-expiry-scan-period>
- <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
- <message-expiry-thread-priority>3</message-expiry-thread-priority>
-
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
- <queue-activation-timeout>30000</queue-activation-timeout>
-
- <backup>false</backup>
-
- <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
-
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-backup">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
- </connector>
-
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </connector>
-
- <connector name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector>
-
- <connector name="netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
- <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
- </connector>
-
- <connector name="netty-servlet">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
- <param key="jbm.remoting.netty.useservlet" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.servletpath" value="/jms-servlet/JBMServlet" type="String"/>
- </connector>
-
- <connector name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
-
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <!-- In VM acceptor -->
- <acceptor name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
-
- <!-- Netty TCP Acceptor -->
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
-
- <!-- Netty Servlet Acceptor -->
- <!--
- <acceptor name="netty-servlet">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>
- -->
-
- <!-- Netty SSL Acceptor -->
- <!--
- <acceptor name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </acceptor>
- -->
-
- <!--Netty HTTP Acceptor-->
- <!--
- <acceptor name-"netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
- <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
- </acceptor>
-
- -->
- <!-- Netty In VM Acceptor, needed for the servlet transport-->
- <!--
- <acceptor name="netty-invm">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>
- -->
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <local-bind-port>1234</local-bind-port>
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>5000</broadcast-period>
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>data/paging</paging-directory>
-
- <paging-global-watermark-size>10485760</paging-global-watermark-size>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
-
- <bindings-directory>data/bindings</bindings-directory>
-
- <create-bindings-dir>true</create-bindings-dir>
-
- <journal-directory>data/journal</journal-directory>
-
- <create-journal-dir>true</create-journal-dir>
-
- <journal-type>NIO</journal-type>
-
- <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
- Set this to -1 to disable this feature -->
- <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
-
- <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
- <journal-sync-transactional>true</journal-sync-transactional>
-
- <!-- Does the journal sync to disk for every non transactional persistent operation? -->
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
-
- <!-- 10 MB journal file size -->
- <journal-file-size>10485760</journal-file-size>
-
- <journal-min-files>15</journal-min-files>
-
- <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
- (parameter ignored on NIO)
- You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
- -->
- <journal-max-aio>10000</journal-max-aio>
-
- </configuration>
-
-</deployment>
Deleted: trunk/src/config/jbm-jms.xml
===================================================================
--- trunk/src/config/jbm-jms.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/jbm-jms.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,195 +0,0 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
-
- <connection-factory name="testConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="testConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ServerAckConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="ServerAckConnectionFactory"/>
- <entry name="/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckXAConnectionFactory"/>
- </entries>
- <pre-acknowledge>true</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactory">
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <!--
- <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
- <discovery-group-ref discovery-group-name="dg-group1"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
- -->
-
- <connection-factory name="MyExampleConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="/MyExampleConnectionFactory"/>
- <entry name="/acme/MyExampleConnectionFactoryDupe"/>
- <entry name="java:/xyz/CF1"/>
- <entry name="java:/connectionfactories/acme/connection_factory"/>
- </entries>
- <ping-period>5000</ping-period>
- <call-timeout>30000</call-timeout>
- <!-- This is the window size in bytes to use when using consumer window based flow control -->
- <consumer-window-size>1048576</consumer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
- <consumer-max-rate>5000</consumer-max-rate>
- <!-- This is the send window size in bytes -->
- <producer-window-size>1048576</producer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
- <producer-max-rate>100</producer-max-rate>
- <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
- <min-large-message-size>10240</min-large-message-size>
- <!-- You can specify the default Client ID to use for connections created using this factory -->
- <client-id>MyClientID</client-id>
- <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
- <dups-ok-batch-size>1048576</dups-ok-batch-size>
- <!-- The batch size in bytes to use when using transactional sessions -->
- <transaction-batch-size>1048576</transaction-batch-size>
- <!--Whether or not we use a blocking call when acknowledging a message-->
- <block-on-acknowledge>false</block-on-acknowledge>
- <!--Whether we send non persistent messages synchronously-->
- <send-np-messages-synchronously>true</send-np-messages-synchronously>
- <!--Whether we send persistent messages synchronously-->
- <send-p-messages-synchronously>true</send-p-messages-synchronously>
- <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
- <auto-group-id>true</auto-group-id>
- <!--if true then the server will pre ack any message before delivery to a consumer-->
- <pre-acknowledge>false</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="TestInVMConnectionFactory">
- <connector-ref connector-name="in-vm"/>
- <entries>
- <entry name="/TestInVMConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestSSLConnectionFactory">
- <connector-ref connector-name="netty-ssl"/>
- <entries>
- <entry name="/TestSSLConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestHttpConnectionFactory">
- <connector-ref connector-name="netty-http"/>
- <entries>
- <entry name="/TestHttpConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
- <entries>
- <entry name="/TestServletConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <queue name="MyQueue">
- <entry name="MyQueue"/>
- </queue>
- <queue name="DLQ">
- <entry name="/queue/DLQ"/>
- </queue>
- <queue name="ExpiryQueue">
- <entry name="/queue/ExpiryQueue"/>
- </queue>
- <topic name="testTopic">
- <entry name="/topic/testTopic"/>
- </topic>
- <topic name="topic.A">
- <entry name="/topic/topicA"/>
- </topic>
- <topic name="topic.B">
- <entry name="/topic/topicB"/>
- </topic>
- <topic name="securedTopic">
- <entry name="/topic/securedTopic"/>
- </topic>
- <topic name="testDurableTopic">
- <entry name="/topic/testDurableTopic"/>
- </topic>
- <queue name="testQueue">
- <entry name="/queue/testQueue"/>
- </queue>
- <queue name="testGroupQueue">
- <entry name="/queue/testGroupQueue"/>
- </queue>
- <queue name="testPerfQueue">
- <entry name="/queue/testPerfQueue"/>
- </queue>
- <queue name="A">
- <entry name="/queue/A"/>
- </queue>
- <queue name="B">
- <entry name="/queue/B"/>
- </queue>
- <queue name="C">
- <entry name="/queue/C"/>
- </queue>
- <queue name="D">
- <entry name="/queue/D"/>
- </queue>
- <queue name="ex">
- <entry name="/queue/ex"/>
- </queue>
- <queue name="PrivateDLQ">
- <entry name="/queue/PrivateDLQ"/>
- </queue>
- <queue name="PrivateExpiryQueue">
- <entry name="/queue/PrivateExpiryQueue"/>
- </queue>
- <queue name="QueueWithOwnDLQAndExpiryQueue">
- <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
- </queue>
- <topic name="TopicWithOwnDLQAndExpiryQueue">
- <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
- </topic>
- <queue name="QueueWithOwnRedeliveryDelay">
- <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
- </queue>
- <topic name="TopicWithOwnRedeliveryDelay">
- <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
- </topic>
- <queue name="testDistributedQueue">
- <entry name="/queue/testDistributedQueue"/>
- </queue>
- <topic name="testDistributedTopic">
- <entry name="/topic/testDistributedTopic"/>
- </topic>
-
-</deployment>
\ No newline at end of file
Deleted: trunk/src/config/jbm-queues.xml
===================================================================
--- trunk/src/config/jbm-queues.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/jbm-queues.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,137 +0,0 @@
-<settings xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
-
- <!-- manangement address -->
- <security match="jbm.management">
- <!-- only the admin role can interact with the management address -->
- <permission type="consume" roles="admin"/>
- <permission type="send" roles="admin"/>
- <permission type="manage" roles="admin"/>
- </security>
-
- <security match="jms.topic.testTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.topic.securedTopic">
- <permission type="send" roles="publisher"/>
- <permission type="consume" roles="publisher"/>
- </security>
-
- <security match="jms.topic.testDurableTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.queue.testQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.queue.NoSuchQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.topic.NoSuchTopic">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <security match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!--default security to catch all-->
- <security match="#">
- <permission type="createDurableQueue" roles="guest,def"/>
- <permission type="deleteDurableQueue" roles="guest,def"/>
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.queue.testDistributedQueue">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.topic.testDistributedTopic">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.testPerfQueue">
- <clustered>false</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.MyQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- </address-settings>
-
- <address-settings match="jms.queue.testGroupQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
- </address-settings>
-
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-settings>
-</settings>
Deleted: trunk/src/config/jbm-standalone-beans.xml
===================================================================
--- trunk/src/config/jbm-standalone-beans.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/jbm-standalone-beans.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
- </bean>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
Deleted: trunk/src/config/jbm-users.xml
===================================================================
--- trunk/src/config/jbm-users.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/jbm-users.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,10 +0,0 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
- <!--<user name="admin" password="admin">
- <role name="admin"/>
- </user>-->
-</deployment>
\ No newline at end of file
Added: trunk/src/config/jboss-as/build.xml
===================================================================
--- trunk/src/config/jboss-as/build.xml (rev 0)
+++ trunk/src/config/jboss-as/build.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,103 @@
+<?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="default" name="JBoss Messaging integration with JBoss AS 5">
+ <property environment="ENV"/>
+ <property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
+
+ <property name="lib.dir" value="../../lib"/>
+
+ <target name="default" description="Create JBoss AS 5 profiles to use JBoss Messaging">
+ <antcall target="create-profile">
+ <!-- created from JBoss AS 5 default profile -->
+ <param name="jbossas.profile.source" value="default"/>
+ <!-- based on JBoss Messaging jbossas/non-clustered config -->
+ <param name="messaging.config.dir" value="./non-clustered"/>
+ <!-- new profile is named default-with-jbm2 -->
+ <param name="messaging.profile.target" value="default-with-jbm2"/>
+ </antcall>
+ <antcall target="create-profile">
+ <!-- created from JBoss AS 5 all profile -->
+ <param name="jbossas.profile.source" value="all"/>
+ <!-- based on JBoss Messaging jbossas/clustered config -->
+ <param name="messaging.config.dir" value="clustered"/>
+ <!-- new profile is named all-with-jbm2 -->
+ <param name="messaging.profile.target" value="all-with-jbm2"/>
+ </antcall>
+ </target>
+
+ <target name="create-profile">
+ <antcall target="validate-jboss"/>
+ <property name="src.dir" value="${jboss.home}/server/${jbossas.profile.source}"/>
+ <property name="dest.dir" value="${jboss.home}/server/${messaging.profile.target}"/>
+
+ <mkdir dir="${dest.dir}"/>
+ <copy todir="${dest.dir}">
+ <fileset dir="${src.dir}">
+ <exclude name="**/messaging/**"/>
+ <exclude name="conf/login-config.xml"/>
+ <exclude name="**/jms-ra.rar"/>
+ </fileset>
+ </copy>
+ <copy todir="${dest.dir}/conf">
+ <fileset dir="${messaging.config.dir}">
+ <include name="login-config.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${dest.dir}/conf/props">
+ <fileset dir="${messaging.config.dir}">
+ <include name="messaging-users.properties"/>
+ <include name="messaging-roles.properties"/>
+ </fileset>
+ </copy>
+ <copy todir="${dest.dir}/lib">
+ <fileset dir="${lib.dir}">
+ <include name="jbm-*.jar"/>
+ <include name="netty*.jar"/>
+ </fileset>
+ </copy>
+ <property name="messaging.sar.dir" value="${dest.dir}/deploy/messaging.sar"/>
+ <mkdir dir="${messaging.sar.dir}"/>
+ <copy todir="${messaging.sar.dir}">
+ <fileset dir="${messaging.config.dir}" includes="*"/>
+ </copy>
+ <copy file="${lib.dir}/jbm-ra.rar" tofile="${dest.dir}/deploy/jms-ra.rar"/>
+ </target>
+
+ <!-- The JBOSS_HOME environment variable and the directory must exist, we also check we are running
+ in JBoss 5.1 or later -->
+ <target name="validate-jboss">
+ <fail unless="ENV.JBOSS_HOME" message="JBOSS_HOME environment variable not set! Set it and try again."/>
+ <available property="source-profile" type="dir" file="${jboss.home}/server/${jbossas.profile.source}"/>
+ <fail unless="source-profile" message="${jboss.home}/server/${jbossas.profile.source} profile not found!"/>
+ <available property="target-profile" type="dir" file="${jboss.home}/server/${messaging.profile.target}"/>
+ <fail if="target-profile"
+ message="'${messaging.profile.target}' profile already exists! Delete it manually and try again."/>
+ </target>
+
+</project>
Added: trunk/src/config/jboss-as/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-configuration.xml (rev 0)
+++ trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,172 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ <configuration>
+
+ <clustered>true</clustered>
+
+ <!-- Maximum number of threads to use for scheduled deliveries -->
+ <scheduled-max-pool-size>30</scheduled-max-pool-size>
+
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
+
+ <wild-card-routing-enabled>true</wild-card-routing-enabled>
+
+ <management-address>admin.management</management-address>
+ <management-notification-address>admin.notification</management-notification-address>
+
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
+
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
+ <connection-scan-period>10000</connection-scan-period>
+
+ <!--how long before timing a transaction out-->
+ <transaction-timeout>60000</transaction-timeout>
+ <!--how often to scan for timedout transactions-->
+ <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
+
+ <!-- how often do we scan the queues for expired messages-->
+ <message-expiry-scan-period>30000</message-expiry-scan-period>
+ <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
+ <message-expiry-thread-priority>3</message-expiry-thread-priority>
+
+ <!-- Example interceptors
+ <remoting-interceptors>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
+ </remoting-interceptors>
+ -->
+
+ <queue-activation-timeout>30000</queue-activation-timeout>
+
+ <backup>false</backup>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </connector>
+
+ <!-- <connector name="netty-connector-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.ssl.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </connector> -->
+
+ <connector name="in-vm-connector">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm-acceptor">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
+
+ <!-- Netty TCP Acceptor -->
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </acceptor>
+
+ <!-- Netty In VM Acceptor, needed for the servlet transport-->
+ <!--
+ <acceptor name="netty-invm">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
+ </acceptor>
+ -->
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+
+ <!-- Large Messages configuration -->
+
+ <large-messages-directory>${jboss.server.data.dir}/messaging/largemessages</large-messages-directory>
+
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>${jboss.server.data.dir}/messsaging/paging</paging-directory>
+
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
+
+ <!-- Storage configuration -->
+
+ <bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
+
+ <create-bindings-dir>true</create-bindings-dir>
+
+ <journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
+
+ <create-journal-dir>true</create-journal-dir>
+
+ <journal-type>ASYNCIO</journal-type>
+
+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+ Set this to -1 to disable this feature -->
+ <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
+
+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+ <journal-sync-transactional>true</journal-sync-transactional>
+
+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
+
+ <!-- 10 MB journal file size -->
+ <journal-file-size>10485760</journal-file-size>
+
+ <journal-min-files>15</journal-min-files>
+
+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+ (parameter ignored on NIO)
+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+ -->
+ <journal-max-aio>10000</journal-max-aio>
+
+ </configuration>
+
+</deployment>
Added: trunk/src/config/jboss-as/clustered/jbm-jboss-beans.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-jboss-beans.xml (rev 0)
+++ trunk/src/config/jboss-as/clustered/jbm-jboss-beans.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.integration.security.JBossASSecurityManager">
+ <depends>JBossSecurityJNDIContextEstablishment</depends>
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/jboss-as/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-jms.xml (rev 0)
+++ trunk/src/config/jboss-as/clustered/jbm-jms.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,194 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="testConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="testConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ServerAckConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ServerAckConnectionFactory"/>
+ <entry name="/ServerAckConnectionFactory"/>
+ <entry name="/ServerAckXAConnectionFactory"/>
+ <entry name="java:/ServerAckConnectionFactory"/>
+ <entry name="java:/ServerAckXAConnectionFactory"/>
+ </entries>
+ <pre-acknowledge>true</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactory">
+ <connector-ref connector-name="netty-connector" backup-connector-name="netty-backup"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="MyExampleConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="/MyExampleConnectionFactory"/>
+ <entry name="/acme/MyExampleConnectionFactoryDupe"/>
+ <entry name="java:/xyz/CF1"/>
+ <entry name="java:/connectionfactories/acme/connection_factory"/>
+ </entries>
+ <ping-period>5000</ping-period>
+ <call-timeout>30000</call-timeout>
+ <!-- This is the window size in bytes to use when using consumer window based flow control -->
+ <consumer-window-size>1048576</consumer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
+ <consumer-max-rate>5000</consumer-max-rate>
+ <!-- This is the send window size in bytes -->
+ <producer-window-size>1048576</producer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
+ <producer-max-rate>100</producer-max-rate>
+ <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
+ <min-large-message-size>10240</min-large-message-size>
+ <!-- You can specify the default Client ID to use for connections created using this factory -->
+ <client-id>MyClientID</client-id>
+ <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
+ <dups-ok-batch-size>1048576</dups-ok-batch-size>
+ <!-- The batch size in bytes to use when using transactional sessions -->
+ <transaction-batch-size>1048576</transaction-batch-size>
+ <!--Whether or not we use a blocking call when acknowledging a message-->
+ <block-on-acknowledge>false</block-on-acknowledge>
+ <!--Whether we send non persistent messages synchronously-->
+ <send-np-messages-synchronously>true</send-np-messages-synchronously>
+ <!--Whether we send persistent messages synchronously-->
+ <send-p-messages-synchronously>true</send-p-messages-synchronously>
+ <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
+ <auto-group-id>true</auto-group-id>
+ <!--if true then the server will pre ack any message before delivery to a consumer-->
+ <pre-acknowledge>false</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="TestInVMConnectionFactory">
+ <connector-ref connector-name="in-vm"/>
+ <entries>
+ <entry name="/TestInVMConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestSSLConnectionFactory">
+ <connector-ref connector-name="netty-ssl"/>
+ <entries>
+ <entry name="/TestSSLConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestHttpConnectionFactory">
+ <connector-ref connector-name="netty-http"/>
+ <entries>
+ <entry name="/TestHttpConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestServletConnectionFactory">
+ <connector-ref connector-name="netty-servlet"/>
+ <entries>
+ <entry name="/TestServletConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="MyQueue">
+ <entry name="MyQueue"/>
+ </queue>
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+ <topic name="testTopic">
+ <entry name="/topic/testTopic"/>
+ </topic>
+ <topic name="topic.A">
+ <entry name="/topic/topicA"/>
+ </topic>
+ <topic name="topic.B">
+ <entry name="/topic/topicB"/>
+ </topic>
+ <topic name="securedTopic">
+ <entry name="/topic/securedTopic"/>
+ </topic>
+ <topic name="testDurableTopic">
+ <entry name="/topic/testDurableTopic"/>
+ </topic>
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+ <queue name="testGroupQueue">
+ <entry name="/queue/testGroupQueue"/>
+ </queue>
+ <queue name="testPerfQueue">
+ <entry name="/queue/testPerfQueue"/>
+ </queue>
+ <queue name="A">
+ <entry name="/queue/A"/>
+ </queue>
+ <queue name="B">
+ <entry name="/queue/B"/>
+ </queue>
+ <queue name="C">
+ <entry name="/queue/C"/>
+ </queue>
+ <queue name="D">
+ <entry name="/queue/D"/>
+ </queue>
+ <queue name="ex">
+ <entry name="/queue/ex"/>
+ </queue>
+ <queue name="PrivateDLQ">
+ <entry name="/queue/PrivateDLQ"/>
+ </queue>
+ <queue name="PrivateExpiryQueue">
+ <entry name="/queue/PrivateExpiryQueue"/>
+ </queue>
+ <queue name="QueueWithOwnDLQAndExpiryQueue">
+ <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
+ </queue>
+ <topic name="TopicWithOwnDLQAndExpiryQueue">
+ <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
+ </topic>
+ <queue name="QueueWithOwnRedeliveryDelay">
+ <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
+ </queue>
+ <topic name="TopicWithOwnRedeliveryDelay">
+ <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
+ </topic>
+ <queue name="testDistributedQueue">
+ <entry name="/queue/testDistributedQueue"/>
+ </queue>
+ <topic name="testDistributedTopic">
+ <entry name="/topic/testDistributedTopic"/>
+ </topic>
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/jboss-as/clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-queues.xml (rev 0)
+++ trunk/src/config/jboss-as/clustered/jbm-queues.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,137 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <!-- manangement address -->
+ <security match="jbm.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security>
+
+ <security match="jms.topic.testTopic">
+ <permission type="createDurableQueue" roles="durpublisher"/>
+ <permission type="deleteDurableQueue" roles="durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="jms.topic.securedTopic">
+ <permission type="send" roles="publisher"/>
+ <permission type="consume" roles="publisher"/>
+ </security>
+
+ <security match="jms.topic.testDurableTopic">
+ <permission type="createDurableQueue" roles="durpublisher"/>
+ <permission type="deleteDurableQueue" roles="durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.queue.NoSuchQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.topic.NoSuchTopic">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <security match="jms.temptopic.#">
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>-->
+
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.topic.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>-->
+
+ <!--default security to catch all-->
+ <security match="#">
+ <permission type="createDurableQueue" roles="guest,def"/>
+ <permission type="deleteDurableQueue" roles="guest,def"/>
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
+ <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
+ <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="jms.queue.testDistributedQueue">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="jms.topic.testDistributedTopic">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="jms.queue.testPerfQueue">
+ <clustered>false</clustered>
+ </address-settings>
+
+ <address-settings match="jms.queue.MyQueue">
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <drop-messages-when-full>false</drop-messages-when-full>
+ </address-settings>
+
+ <address-settings match="jms.queue.testGroupQueue">
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <drop-messages-when-full>false</drop-messages-when-full>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
+ </address-settings>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Added: trunk/src/config/jboss-as/clustered/jms-ds.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jms-ds.xml (rev 0)
+++ trunk/src/config/jboss-as/clustered/jms-ds.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,26 @@
+<connection-factories>
+ <!--
+ JMS Stuff
+ -->
+
+ <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider">
+ <attribute name="ProviderName">DefaultJMSProvider</attribute>
+ <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
+ <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
+ <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
+ <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
+ </mbean>
+ <!--
+ JMS XA Resource adapter, use this to get transacted JMS in beans
+ -->
+ <tx-connection-factory>
+ <jndi-name>JmsXA</jndi-name>
+ <xa-transaction/>
+ <rar-name>jms-ra.rar</rar-name>
+ <connection-definition>org.jboss.messaging.ra.JBMConnectionFactory</connection-definition>
+ <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
+ <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+ <max-pool-size>20</max-pool-size>
+ <security-domain-and-application>JmsXARealm</security-domain-and-application>
+ </tx-connection-factory>
+</connection-factories>
\ No newline at end of file
Added: trunk/src/config/jboss-as/clustered/login-config.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/login-config.xml (rev 0)
+++ trunk/src/config/jboss-as/clustered/login-config.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,146 @@
+<?xml version='1.0'?>
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+ <authentication>
+ <login-module code="login.module1.class.name" flag="control_flag">
+ <module-option name = "option1-name">option1-value</module-option>
+ <module-option name = "option2-name">option2-value</module-option>
+ ...
+ </login-module>
+
+ <login-module code="login.module2.class.name" flag="control_flag">
+ ...
+ </login-module>
+ ...
+ </authentication>
+</application-policy>
+
+$Id: login-config.xml 76444 2008-07-29 23:50:53Z sguilhen at redhat.com $
+$Revision: 76444 $
+-->
+
+<policy>
+ <!-- Used by clients within the application server VM such as
+ mbeans and servlets that access EJBs.
+ -->
+ <application-policy name="client-login">
+ <authentication>
+ <login-module code="org.jboss.security.ClientLoginModule"
+ flag="required">
+ <!-- Any existing security context will be restored on logout -->
+ <module-option name="restore-login-identity">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domains for testing new jca framework -->
+ <application-policy name="HsqlDbRealm">
+ <authentication>
+ <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag="required">
+ <module-option name="principal">sa</module-option>
+ <module-option name="userName">sa</module-option>
+ <module-option name="password"></module-option>
+ <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name="JmsXARealm">
+ <authentication>
+ <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag="required">
+ <module-option name="principal">guest</module-option>
+ <module-option name="userName">guest</module-option>
+ <module-option name="password">guest</module-option>
+ <module-option name="managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for messaging. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+<application-policy name="messaging">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name="usersProperties">props/messaging-users.properties</module-option>
+ <module-option name="rolesProperties">props/messaging-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the jmx-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="jmx-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+ <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the web-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="web-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">web-console-users.properties</module-option>
+ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!--
+ A template configuration for the JBossWS security domain.
+ This defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="JBossWS">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- The default login configuration used by any security domain that
+ does not have a application-policy entry with a matching name
+ -->
+ <application-policy name="other">
+ <!-- A simple server login module, which can be used when the number
+ of users is relatively small. It uses two properties files:
+ users.properties, which holds users (key) and their password (value).
+ roles.properties, which holds users (key) and a comma-separated list of
+ their roles (value).
+ The unauthenticatedIdentity property defines the name of the principal
+ that will be used when a null username and password are presented as is
+ the case for an unuathenticated web client or MDB. If you want to
+ allow such users to be authenticated add the property, e.g.,
+ unauthenticatedIdentity="nobody"
+ -->
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required"/>
+ </authentication>
+ </application-policy>
+
+</policy>
Added: trunk/src/config/jboss-as/clustered/messaging-roles.properties
===================================================================
--- trunk/src/config/jboss-as/clustered/messaging-roles.properties (rev 0)
+++ trunk/src/config/jboss-as/clustered/messaging-roles.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,4 @@
+#
+# user=role1,role2,...
+#
+guest=guest
Added: trunk/src/config/jboss-as/clustered/messaging-users.properties
===================================================================
--- trunk/src/config/jboss-as/clustered/messaging-users.properties (rev 0)
+++ trunk/src/config/jboss-as/clustered/messaging-users.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,4 @@
+#
+# user=password
+#
+guest=guest
Added: trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,150 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ <configuration>
+
+ <clustered>false</clustered>
+
+ <!-- Maximum number of threads to use for scheduled deliveries -->
+ <scheduled-max-pool-size>30</scheduled-max-pool-size>
+
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
+
+ <wild-card-routing-enabled>true</wild-card-routing-enabled>
+
+ <management-address>jbm.management</management-address>
+ <management-notification-address>jbm.notifications</management-notification-address>
+
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
+
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
+ <connection-scan-period>10000</connection-scan-period>
+
+ <!--how long before timing a transaction out-->
+ <transaction-timeout>60000</transaction-timeout>
+ <!--how often to scan for timedout transactions-->
+ <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
+
+ <!-- how often do we scan the queues for expired messages-->
+ <message-expiry-scan-period>30000</message-expiry-scan-period>
+ <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
+ <message-expiry-thread-priority>3</message-expiry-thread-priority>
+
+ <!-- Example interceptors
+ <remoting-interceptors>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
+ </remoting-interceptors>
+ -->
+
+ <queue-activation-timeout>30000</queue-activation-timeout>
+
+ <backup>false</backup>
+
+ <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
+
+ <!--
+ <backup-connector-ref connector-name="netty-backup"/>
+ -->
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </connector>
+
+ <!-- <connector name="netty-connector-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.ssl.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </connector> -->
+
+ <connector name="in-vm-connector">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm-acceptor">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
+
+ <!-- Netty TCP Acceptor -->
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </acceptor>
+
+ <!-- Netty In VM Acceptor, needed for the servlet transport-->
+ <!--
+ <acceptor name="netty-invm">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
+ </acceptor>
+ -->
+ </acceptors>
+
+ <!-- Large Messages configuration -->
+
+ <large-messages-directory>${jboss.server.data.dir}/messaging/largemessages</large-messages-directory>
+
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>${jboss.server.data.dir}/messaging/paging</paging-directory>
+
+ <paging-global-watermark-size>10485760</paging-global-watermark-size>
+
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
+
+ <!-- Storage configuration -->
+
+ <bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
+
+ <create-bindings-dir>true</create-bindings-dir>
+
+ <journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
+
+ <create-journal-dir>true</create-journal-dir>
+
+ <journal-type>ASYNCIO</journal-type>
+
+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+ Set this to -1 to disable this feature -->
+ <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
+
+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+ <journal-sync-transactional>true</journal-sync-transactional>
+
+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
+
+ <!-- 10 MB journal file size -->
+ <journal-file-size>10485760</journal-file-size>
+
+ <journal-min-files>15</journal-min-files>
+
+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+ (parameter ignored on NIO)
+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+ -->
+ <journal-max-aio>10000</journal-max-aio>
+
+ </configuration>
+
+</deployment>
Added: trunk/src/config/jboss-as/non-clustered/jbm-jboss-beans.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-jboss-beans.xml (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/jbm-jboss-beans.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.integration.security.JBossASSecurityManager">
+ <depends>JBossSecurityJNDIContextEstablishment</depends>
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/jboss-as/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-jms.xml (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/jbm-jms.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,194 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="testConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="testConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ServerAckConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ServerAckConnectionFactory"/>
+ <entry name="/ServerAckConnectionFactory"/>
+ <entry name="/ServerAckXAConnectionFactory"/>
+ <entry name="java:/ServerAckConnectionFactory"/>
+ <entry name="java:/ServerAckXAConnectionFactory"/>
+ </entries>
+ <pre-acknowledge>true</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactory">
+ <connector-ref connector-name="netty-connector" backup-connector-name="netty-backup"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="MyExampleConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="/MyExampleConnectionFactory"/>
+ <entry name="/acme/MyExampleConnectionFactoryDupe"/>
+ <entry name="java:/xyz/CF1"/>
+ <entry name="java:/connectionfactories/acme/connection_factory"/>
+ </entries>
+ <ping-period>5000</ping-period>
+ <call-timeout>30000</call-timeout>
+ <!-- This is the window size in bytes to use when using consumer window based flow control -->
+ <consumer-window-size>1048576</consumer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
+ <consumer-max-rate>5000</consumer-max-rate>
+ <!-- This is the send window size in bytes -->
+ <producer-window-size>1048576</producer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
+ <producer-max-rate>100</producer-max-rate>
+ <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
+ <min-large-message-size>10240</min-large-message-size>
+ <!-- You can specify the default Client ID to use for connections created using this factory -->
+ <client-id>MyClientID</client-id>
+ <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
+ <dups-ok-batch-size>1048576</dups-ok-batch-size>
+ <!-- The batch size in bytes to use when using transactional sessions -->
+ <transaction-batch-size>1048576</transaction-batch-size>
+ <!--Whether or not we use a blocking call when acknowledging a message-->
+ <block-on-acknowledge>false</block-on-acknowledge>
+ <!--Whether we send non persistent messages synchronously-->
+ <send-np-messages-synchronously>true</send-np-messages-synchronously>
+ <!--Whether we send persistent messages synchronously-->
+ <send-p-messages-synchronously>true</send-p-messages-synchronously>
+ <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
+ <auto-group-id>true</auto-group-id>
+ <!--if true then the server will pre ack any message before delivery to a consumer-->
+ <pre-acknowledge>false</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="TestInVMConnectionFactory">
+ <connector-ref connector-name="in-vm"/>
+ <entries>
+ <entry name="/TestInVMConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestSSLConnectionFactory">
+ <connector-ref connector-name="netty-ssl"/>
+ <entries>
+ <entry name="/TestSSLConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestHttpConnectionFactory">
+ <connector-ref connector-name="netty-http"/>
+ <entries>
+ <entry name="/TestHttpConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestServletConnectionFactory">
+ <connector-ref connector-name="netty-servlet"/>
+ <entries>
+ <entry name="/TestServletConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="MyQueue">
+ <entry name="MyQueue"/>
+ </queue>
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+ <topic name="testTopic">
+ <entry name="/topic/testTopic"/>
+ </topic>
+ <topic name="topic.A">
+ <entry name="/topic/topicA"/>
+ </topic>
+ <topic name="topic.B">
+ <entry name="/topic/topicB"/>
+ </topic>
+ <topic name="securedTopic">
+ <entry name="/topic/securedTopic"/>
+ </topic>
+ <topic name="testDurableTopic">
+ <entry name="/topic/testDurableTopic"/>
+ </topic>
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+ <queue name="testGroupQueue">
+ <entry name="/queue/testGroupQueue"/>
+ </queue>
+ <queue name="testPerfQueue">
+ <entry name="/queue/testPerfQueue"/>
+ </queue>
+ <queue name="A">
+ <entry name="/queue/A"/>
+ </queue>
+ <queue name="B">
+ <entry name="/queue/B"/>
+ </queue>
+ <queue name="C">
+ <entry name="/queue/C"/>
+ </queue>
+ <queue name="D">
+ <entry name="/queue/D"/>
+ </queue>
+ <queue name="ex">
+ <entry name="/queue/ex"/>
+ </queue>
+ <queue name="PrivateDLQ">
+ <entry name="/queue/PrivateDLQ"/>
+ </queue>
+ <queue name="PrivateExpiryQueue">
+ <entry name="/queue/PrivateExpiryQueue"/>
+ </queue>
+ <queue name="QueueWithOwnDLQAndExpiryQueue">
+ <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
+ </queue>
+ <topic name="TopicWithOwnDLQAndExpiryQueue">
+ <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
+ </topic>
+ <queue name="QueueWithOwnRedeliveryDelay">
+ <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
+ </queue>
+ <topic name="TopicWithOwnRedeliveryDelay">
+ <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
+ </topic>
+ <queue name="testDistributedQueue">
+ <entry name="/queue/testDistributedQueue"/>
+ </queue>
+ <topic name="testDistributedTopic">
+ <entry name="/topic/testDistributedTopic"/>
+ </topic>
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/jboss-as/non-clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-queues.xml (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/jbm-queues.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,137 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <!-- manangement address -->
+ <security match="jbm.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security>
+
+ <security match="jms.topic.testTopic">
+ <permission type="createDurableQueue" roles="durpublisher"/>
+ <permission type="deleteDurableQueue" roles="durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="jms.topic.securedTopic">
+ <permission type="send" roles="publisher"/>
+ <permission type="consume" roles="publisher"/>
+ </security>
+
+ <security match="jms.topic.testDurableTopic">
+ <permission type="createDurableQueue" roles="durpublisher"/>
+ <permission type="deleteDurableQueue" roles="durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.queue.NoSuchQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.topic.NoSuchTopic">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <security match="jms.temptopic.#">
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>-->
+
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.topic.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>-->
+
+ <!--default security to catch all-->
+ <security match="#">
+ <permission type="createDurableQueue" roles="guest,def"/>
+ <permission type="deleteDurableQueue" roles="guest,def"/>
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
+ <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
+ <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="jms.queue.testDistributedQueue">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="jms.topic.testDistributedTopic">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="jms.queue.testPerfQueue">
+ <clustered>false</clustered>
+ </address-settings>
+
+ <address-settings match="jms.queue.MyQueue">
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <drop-messages-when-full>false</drop-messages-when-full>
+ </address-settings>
+
+ <address-settings match="jms.queue.testGroupQueue">
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <drop-messages-when-full>false</drop-messages-when-full>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
+ </address-settings>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Added: trunk/src/config/jboss-as/non-clustered/jms-ds.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jms-ds.xml (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/jms-ds.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,26 @@
+<connection-factories>
+ <!--
+ JMS Stuff
+ -->
+
+ <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider">
+ <attribute name="ProviderName">DefaultJMSProvider</attribute>
+ <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
+ <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
+ <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
+ <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
+ </mbean>
+ <!--
+ JMS XA Resource adapter, use this to get transacted JMS in beans
+ -->
+ <tx-connection-factory>
+ <jndi-name>JmsXA</jndi-name>
+ <xa-transaction/>
+ <rar-name>jms-ra.rar</rar-name>
+ <connection-definition>org.jboss.messaging.ra.JBMConnectionFactory</connection-definition>
+ <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
+ <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+ <max-pool-size>20</max-pool-size>
+ <security-domain-and-application>JmsXARealm</security-domain-and-application>
+ </tx-connection-factory>
+</connection-factories>
\ No newline at end of file
Added: trunk/src/config/jboss-as/non-clustered/login-config.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/login-config.xml (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/login-config.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,146 @@
+<?xml version='1.0'?>
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+ <authentication>
+ <login-module code="login.module1.class.name" flag="control_flag">
+ <module-option name = "option1-name">option1-value</module-option>
+ <module-option name = "option2-name">option2-value</module-option>
+ ...
+ </login-module>
+
+ <login-module code="login.module2.class.name" flag="control_flag">
+ ...
+ </login-module>
+ ...
+ </authentication>
+</application-policy>
+
+$Id: login-config.xml 76444 2008-07-29 23:50:53Z sguilhen at redhat.com $
+$Revision: 76444 $
+-->
+
+<policy>
+ <!-- Used by clients within the application server VM such as
+ mbeans and servlets that access EJBs.
+ -->
+ <application-policy name="client-login">
+ <authentication>
+ <login-module code="org.jboss.security.ClientLoginModule"
+ flag="required">
+ <!-- Any existing security context will be restored on logout -->
+ <module-option name="restore-login-identity">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domains for testing new jca framework -->
+ <application-policy name="HsqlDbRealm">
+ <authentication>
+ <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag="required">
+ <module-option name="principal">sa</module-option>
+ <module-option name="userName">sa</module-option>
+ <module-option name="password"></module-option>
+ <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name="JmsXARealm">
+ <authentication>
+ <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag="required">
+ <module-option name="principal">guest</module-option>
+ <module-option name="userName">guest</module-option>
+ <module-option name="password">guest</module-option>
+ <module-option name="managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for messaging. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+<application-policy name="messaging">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name="usersProperties">props/messaging-users.properties</module-option>
+ <module-option name="rolesProperties">props/messaging-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the jmx-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="jmx-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+ <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the web-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="web-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">web-console-users.properties</module-option>
+ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!--
+ A template configuration for the JBossWS security domain.
+ This defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="JBossWS">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- The default login configuration used by any security domain that
+ does not have a application-policy entry with a matching name
+ -->
+ <application-policy name="other">
+ <!-- A simple server login module, which can be used when the number
+ of users is relatively small. It uses two properties files:
+ users.properties, which holds users (key) and their password (value).
+ roles.properties, which holds users (key) and a comma-separated list of
+ their roles (value).
+ The unauthenticatedIdentity property defines the name of the principal
+ that will be used when a null username and password are presented as is
+ the case for an unuathenticated web client or MDB. If you want to
+ allow such users to be authenticated add the property, e.g.,
+ unauthenticatedIdentity="nobody"
+ -->
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required"/>
+ </authentication>
+ </application-policy>
+
+</policy>
Added: trunk/src/config/jboss-as/non-clustered/messaging-roles.properties
===================================================================
--- trunk/src/config/jboss-as/non-clustered/messaging-roles.properties (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/messaging-roles.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,4 @@
+#
+# user=role1,role2,...
+#
+guest=guest
Added: trunk/src/config/jboss-as/non-clustered/messaging-users.properties
===================================================================
--- trunk/src/config/jboss-as/non-clustered/messaging-users.properties (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/messaging-users.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,4 @@
+#
+# user=password
+#
+guest=guest
Deleted: trunk/src/config/log4j.xml
===================================================================
--- trunk/src/config/log4j.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/log4j.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- $Id: log4j.xml 536 2005-12-22 06:28:39Z ovidiu $ -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-
- <param name="File" value="./logs/messaging.log"/>
-
- <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
- for each test. We need to append if we want to preserve a full testsuite run log.
- Make sure the build script clears this log at the beginning of each run.
- -->
- <param name="Append" value="false"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-
- </layout>
- </appender>
-
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-
-
-</log4j:configuration>
Deleted: trunk/src/config/logging.properties
===================================================================
--- trunk/src/config/logging.properties 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/logging.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,31 +0,0 @@
-############################################################
-# Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-# Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler
-# classes. These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-handlers=org.jboss.messaging.integration.logging.JBossLoggerHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers. For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= INFO
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
Added: trunk/src/config/stand-alone/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-configuration.xml (rev 0)
+++ trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,190 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ <configuration>
+
+ <clustered>true</clustered>
+
+ <!-- Maximum number of threads to use for scheduled deliveries -->
+ <scheduled-max-pool-size>30</scheduled-max-pool-size>
+
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
+
+ <wild-card-routing-enabled>true</wild-card-routing-enabled>
+
+ <management-address>admin.management</management-address>
+ <management-notification-address>admin.notification</management-notification-address>
+
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
+
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
+ <connection-scan-period>10000</connection-scan-period>
+
+ <!--how long before timing a transaction out-->
+ <transaction-timeout>60000</transaction-timeout>
+ <!--how often to scan for timedout transactions-->
+ <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
+
+ <!-- how often do we scan the queues for expired messages-->
+ <message-expiry-scan-period>30000</message-expiry-scan-period>
+ <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
+ <message-expiry-thread-priority>3</message-expiry-thread-priority>
+
+ <!-- Example interceptors
+ <remoting-interceptors>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
+ </remoting-interceptors>
+ -->
+
+ <queue-activation-timeout>30000</queue-activation-timeout>
+
+ <backup>false</backup>
+
+ <!--
+ <backup-connector-ref connector-name="netty-backup"/>
+ -->
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-backup">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
+ </connector>
+
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
+
+ <connector name="netty-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </connector>
+
+ <connector name="netty-http">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
+ <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
+ </connector>
+
+ <connector name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
+ <!-- Netty standard TCP acceptor -->
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </acceptor>
+ <!-- Netty SSL Acceptor
+ <acceptor name="netty-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </acceptor>
+ -->
+ <!--Netty HTTP Acceptor-->
+ <!--<acceptor name-"netty-http">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
+ <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
+ </acceptor>-->
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <local-bind-port>1234</local-bind-port>
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>5000</broadcast-period>
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <!--
+ <bridges>
+ <bridge name="foo">
+ <queue-name>toto</queue-name>
+ <forwarding-address>blah</forwarding-address>
+ <filter string="color > 1"/>
+ <connector-ref connector-name="netty"/>
+ </bridge>
+ </bridges>
+ -->
+
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>${jbm.data.dir}/paging</paging-directory>
+
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
+
+ <!-- Storage configuration -->
+
+ <bindings-directory>${jbm.data.dir}/bindings</bindings-directory>
+
+ <create-bindings-dir>true</create-bindings-dir>
+
+ <journal-directory>${jbm.data.dir}/journal</journal-directory>
+
+ <create-journal-dir>true</create-journal-dir>
+
+ <journal-type>ASYNCIO</journal-type>
+
+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+ Set this to -1 to disable this feature -->
+ <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
+
+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+ <journal-sync-transactional>true</journal-sync-transactional>
+
+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
+
+ <!-- 10 MB journal file size -->
+ <journal-file-size>10485760</journal-file-size>
+
+ <journal-min-files>15</journal-min-files>
+
+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+ (parameter ignored on NIO)
+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+ -->
+ <journal-max-aio>10000</journal-max-aio>
+
+ </configuration>
+
+</deployment>
Added: trunk/src/config/stand-alone/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-jms.xml (rev 0)
+++ trunk/src/config/stand-alone/clustered/jbm-jms.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,195 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="testConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="testConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ServerAckConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ServerAckConnectionFactory"/>
+ <entry name="/ServerAckConnectionFactory"/>
+ <entry name="java:/ServerAckConnectionFactory"/>
+ <entry name="java:/ServerAckXAConnectionFactory"/>
+ </entries>
+ <pre-acknowledge>true</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactory">
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <!--
+ <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ -->
+
+ <connection-factory name="MyExampleConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="/MyExampleConnectionFactory"/>
+ <entry name="/acme/MyExampleConnectionFactoryDupe"/>
+ <entry name="java:/xyz/CF1"/>
+ <entry name="java:/connectionfactories/acme/connection_factory"/>
+ </entries>
+ <ping-period>5000</ping-period>
+ <call-timeout>30000</call-timeout>
+ <!-- This is the window size in bytes to use when using consumer window based flow control -->
+ <consumer-window-size>1048576</consumer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
+ <consumer-max-rate>5000</consumer-max-rate>
+ <!-- This is the send window size in bytes -->
+ <producer-window-size>1048576</producer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
+ <producer-max-rate>100</producer-max-rate>
+ <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
+ <min-large-message-size>10240</min-large-message-size>
+ <!-- You can specify the default Client ID to use for connections created using this factory -->
+ <client-id>MyClientID</client-id>
+ <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
+ <dups-ok-batch-size>1048576</dups-ok-batch-size>
+ <!-- The batch size in bytes to use when using transactional sessions -->
+ <transaction-batch-size>1048576</transaction-batch-size>
+ <!--Whether or not we use a blocking call when acknowledging a message-->
+ <block-on-acknowledge>false</block-on-acknowledge>
+ <!--Whether we send non persistent messages synchronously-->
+ <send-np-messages-synchronously>true</send-np-messages-synchronously>
+ <!--Whether we send persistent messages synchronously-->
+ <send-p-messages-synchronously>true</send-p-messages-synchronously>
+ <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
+ <auto-group-id>true</auto-group-id>
+ <!--if true then the server will pre ack any message before delivery to a consumer-->
+ <pre-acknowledge>false</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="TestInVMConnectionFactory">
+ <connector-ref connector-name="in-vm"/>
+ <entries>
+ <entry name="/TestInVMConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestSSLConnectionFactory">
+ <connector-ref connector-name="netty-ssl"/>
+ <entries>
+ <entry name="/TestSSLConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestHttpConnectionFactory">
+ <connector-ref connector-name="netty-http"/>
+ <entries>
+ <entry name="/TestHttpConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestServletConnectionFactory">
+ <connector-ref connector-name="netty-servlet"/>
+ <entries>
+ <entry name="/TestServletConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="MyQueue">
+ <entry name="MyQueue"/>
+ </queue>
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+ <topic name="testTopic">
+ <entry name="/topic/testTopic"/>
+ </topic>
+ <topic name="topic.A">
+ <entry name="/topic/topicA"/>
+ </topic>
+ <topic name="topic.B">
+ <entry name="/topic/topicB"/>
+ </topic>
+ <topic name="securedTopic">
+ <entry name="/topic/securedTopic"/>
+ </topic>
+ <topic name="testDurableTopic">
+ <entry name="/topic/testDurableTopic"/>
+ </topic>
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+ <queue name="testGroupQueue">
+ <entry name="/queue/testGroupQueue"/>
+ </queue>
+ <queue name="testPerfQueue">
+ <entry name="/queue/testPerfQueue"/>
+ </queue>
+ <queue name="A">
+ <entry name="/queue/A"/>
+ </queue>
+ <queue name="B">
+ <entry name="/queue/B"/>
+ </queue>
+ <queue name="C">
+ <entry name="/queue/C"/>
+ </queue>
+ <queue name="D">
+ <entry name="/queue/D"/>
+ </queue>
+ <queue name="ex">
+ <entry name="/queue/ex"/>
+ </queue>
+ <queue name="PrivateDLQ">
+ <entry name="/queue/PrivateDLQ"/>
+ </queue>
+ <queue name="PrivateExpiryQueue">
+ <entry name="/queue/PrivateExpiryQueue"/>
+ </queue>
+ <queue name="QueueWithOwnDLQAndExpiryQueue">
+ <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
+ </queue>
+ <topic name="TopicWithOwnDLQAndExpiryQueue">
+ <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
+ </topic>
+ <queue name="QueueWithOwnRedeliveryDelay">
+ <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
+ </queue>
+ <topic name="TopicWithOwnRedeliveryDelay">
+ <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
+ </topic>
+ <queue name="testDistributedQueue">
+ <entry name="/queue/testDistributedQueue"/>
+ </queue>
+ <topic name="testDistributedTopic">
+ <entry name="/topic/testDistributedTopic"/>
+ </topic>
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/stand-alone/clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-queues.xml (rev 0)
+++ trunk/src/config/stand-alone/clustered/jbm-queues.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,137 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <!-- manangement address -->
+ <security match="jbm.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security>
+
+ <security match="jms.topic.testTopic">
+ <permission type="createDurableQueue" roles="durpublisher"/>
+ <permission type="deleteDurableQueue" roles="durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="jms.topic.securedTopic">
+ <permission type="send" roles="publisher"/>
+ <permission type="consume" roles="publisher"/>
+ </security>
+
+ <security match="jms.topic.testDurableTopic">
+ <permission type="createDurableQueue" roles="durpublisher"/>
+ <permission type="deleteDurableQueue" roles="durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.queue.NoSuchQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.topic.NoSuchTopic">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <security match="jms.temptopic.#">
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>-->
+
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.topic.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>-->
+
+ <!--default security to catch all-->
+ <security match="#">
+ <permission type="createDurableQueue" roles="guest,def"/>
+ <permission type="deleteDurableQueue" roles="guest,def"/>
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
+ <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
+ <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="jms.queue.testDistributedQueue">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="jms.topic.testDistributedTopic">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="jms.queue.testPerfQueue">
+ <clustered>false</clustered>
+ </address-settings>
+
+ <address-settings match="jms.queue.MyQueue">
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <drop-messages-when-full>false</drop-messages-when-full>
+ </address-settings>
+
+ <address-settings match="jms.queue.testGroupQueue">
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <drop-messages-when-full>false</drop-messages-when-full>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
+ </address-settings>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Added: trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml (rev 0)
+++ trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">${jnp.port}</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">${jnp.rmiPort}</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
+ </bean>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/stand-alone/clustered/jbm-users.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-users.xml (rev 0)
+++ trunk/src/config/stand-alone/clustered/jbm-users.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,10 @@
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+ <!--<user name="admin" password="admin">
+ <role name="admin"/>
+ </user>-->
+</deployment>
\ No newline at end of file
Added: trunk/src/config/stand-alone/clustered/jndi.properties
===================================================================
--- trunk/src/config/stand-alone/clustered/jndi.properties (rev 0)
+++ trunk/src/config/stand-alone/clustered/jndi.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Added: trunk/src/config/stand-alone/clustered/log4j.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/log4j.xml (rev 0)
+++ trunk/src/config/stand-alone/clustered/log4j.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 536 2005-12-22 06:28:39Z ovidiu $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+
+ <param name="File" value="./logs/messaging.log"/>
+
+ <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+ for each test. We need to append if we want to preserve a full testsuite run log.
+ Make sure the build script clears this log at the beginning of each run.
+ -->
+ <param name="Append" value="false"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+
+ </layout>
+ </appender>
+
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+
+
+</log4j:configuration>
Added: trunk/src/config/stand-alone/clustered/logging.properties
===================================================================
--- trunk/src/config/stand-alone/clustered/logging.properties (rev 0)
+++ trunk/src/config/stand-alone/clustered/logging.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,31 @@
+############################################################
+# Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+# Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler
+# classes. These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+handlers=org.jboss.messaging.integration.logging.JBossLoggerHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers. For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= INFO
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
Added: trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,215 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ <configuration>
+
+ <clustered>false</clustered>
+
+ <!-- Maximum number of threads to use for scheduled deliveries -->
+ <scheduled-max-pool-size>30</scheduled-max-pool-size>
+
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
+
+ <wild-card-routing-enabled>true</wild-card-routing-enabled>
+
+ <management-address>jbm.management</management-address>
+ <management-notification-address>jbm.notifications</management-notification-address>
+
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
+
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
+ <connection-scan-period>10000</connection-scan-period>
+
+ <!--how long before timing a transaction out-->
+ <transaction-timeout>60000</transaction-timeout>
+ <!--how often to scan for timedout transactions-->
+ <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
+
+ <!-- how often do we scan the queues for expired messages-->
+ <message-expiry-scan-period>30000</message-expiry-scan-period>
+ <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
+ <message-expiry-thread-priority>3</message-expiry-thread-priority>
+
+ <!-- Example interceptors
+ <remoting-interceptors>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
+ </remoting-interceptors>
+ -->
+
+ <queue-activation-timeout>30000</queue-activation-timeout>
+
+ <backup>false</backup>
+
+ <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
+
+ <!--
+ <backup-connector-ref connector-name="netty-backup"/>
+ -->
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-backup">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
+ </connector>
+
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
+
+ <connector name="netty-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </connector>
+
+ <connector name="netty-http">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
+ <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
+ </connector>
+
+ <connector name="netty-servlet">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
+ <param key="jbm.remoting.netty.useservlet" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.servletpath" value="/jms-servlet/JBMServlet" type="String"/>
+ </connector>
+
+ <connector name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
+
+ <!-- Netty TCP Acceptor -->
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+
+ <!-- Netty Servlet Acceptor -->
+ <!--
+ <acceptor name="netty-servlet">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
+ </acceptor>
+ -->
+
+ <!-- Netty SSL Acceptor -->
+ <!--
+ <acceptor name="netty-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </acceptor>
+ -->
+
+ <!--Netty HTTP Acceptor-->
+ <!--
+ <acceptor name-"netty-http">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
+ <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
+ </acceptor>
+
+ -->
+ <!-- Netty In VM Acceptor, needed for the servlet transport-->
+ <!--
+ <acceptor name="netty-invm">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
+ </acceptor>
+ -->
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <local-bind-port>1234</local-bind-port>
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>5000</broadcast-period>
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>data/paging</paging-directory>
+
+ <paging-global-watermark-size>10485760</paging-global-watermark-size>
+
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
+
+ <!-- Storage configuration -->
+
+ <bindings-directory>data/bindings</bindings-directory>
+
+ <create-bindings-dir>true</create-bindings-dir>
+
+ <journal-directory>data/journal</journal-directory>
+
+ <create-journal-dir>true</create-journal-dir>
+
+ <journal-type>NIO</journal-type>
+
+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+ Set this to -1 to disable this feature -->
+ <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
+
+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+ <journal-sync-transactional>true</journal-sync-transactional>
+
+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
+
+ <!-- 10 MB journal file size -->
+ <journal-file-size>10485760</journal-file-size>
+
+ <journal-min-files>15</journal-min-files>
+
+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+ (parameter ignored on NIO)
+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+ -->
+ <journal-max-aio>10000</journal-max-aio>
+
+ </configuration>
+
+</deployment>
Added: trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-jms.xml (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,195 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="testConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="testConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="ServerAckConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ServerAckConnectionFactory"/>
+ <entry name="/ServerAckConnectionFactory"/>
+ <entry name="java:/ServerAckConnectionFactory"/>
+ <entry name="java:/ServerAckXAConnectionFactory"/>
+ </entries>
+ <pre-acknowledge>true</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactory">
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <!--
+ <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ -->
+
+ <connection-factory name="MyExampleConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="/MyExampleConnectionFactory"/>
+ <entry name="/acme/MyExampleConnectionFactoryDupe"/>
+ <entry name="java:/xyz/CF1"/>
+ <entry name="java:/connectionfactories/acme/connection_factory"/>
+ </entries>
+ <ping-period>5000</ping-period>
+ <call-timeout>30000</call-timeout>
+ <!-- This is the window size in bytes to use when using consumer window based flow control -->
+ <consumer-window-size>1048576</consumer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
+ <consumer-max-rate>5000</consumer-max-rate>
+ <!-- This is the send window size in bytes -->
+ <producer-window-size>1048576</producer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
+ <producer-max-rate>100</producer-max-rate>
+ <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
+ <min-large-message-size>10240</min-large-message-size>
+ <!-- You can specify the default Client ID to use for connections created using this factory -->
+ <client-id>MyClientID</client-id>
+ <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
+ <dups-ok-batch-size>1048576</dups-ok-batch-size>
+ <!-- The batch size in bytes to use when using transactional sessions -->
+ <transaction-batch-size>1048576</transaction-batch-size>
+ <!--Whether or not we use a blocking call when acknowledging a message-->
+ <block-on-acknowledge>false</block-on-acknowledge>
+ <!--Whether we send non persistent messages synchronously-->
+ <send-np-messages-synchronously>true</send-np-messages-synchronously>
+ <!--Whether we send persistent messages synchronously-->
+ <send-p-messages-synchronously>true</send-p-messages-synchronously>
+ <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
+ <auto-group-id>true</auto-group-id>
+ <!--if true then the server will pre ack any message before delivery to a consumer-->
+ <pre-acknowledge>false</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="TestInVMConnectionFactory">
+ <connector-ref connector-name="in-vm"/>
+ <entries>
+ <entry name="/TestInVMConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestSSLConnectionFactory">
+ <connector-ref connector-name="netty-ssl"/>
+ <entries>
+ <entry name="/TestSSLConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestHttpConnectionFactory">
+ <connector-ref connector-name="netty-http"/>
+ <entries>
+ <entry name="/TestHttpConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <connection-factory name="TestServletConnectionFactory">
+ <connector-ref connector-name="netty-servlet"/>
+ <entries>
+ <entry name="/TestServletConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="MyQueue">
+ <entry name="MyQueue"/>
+ </queue>
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+ <topic name="testTopic">
+ <entry name="/topic/testTopic"/>
+ </topic>
+ <topic name="topic.A">
+ <entry name="/topic/topicA"/>
+ </topic>
+ <topic name="topic.B">
+ <entry name="/topic/topicB"/>
+ </topic>
+ <topic name="securedTopic">
+ <entry name="/topic/securedTopic"/>
+ </topic>
+ <topic name="testDurableTopic">
+ <entry name="/topic/testDurableTopic"/>
+ </topic>
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+ <queue name="testGroupQueue">
+ <entry name="/queue/testGroupQueue"/>
+ </queue>
+ <queue name="testPerfQueue">
+ <entry name="/queue/testPerfQueue"/>
+ </queue>
+ <queue name="A">
+ <entry name="/queue/A"/>
+ </queue>
+ <queue name="B">
+ <entry name="/queue/B"/>
+ </queue>
+ <queue name="C">
+ <entry name="/queue/C"/>
+ </queue>
+ <queue name="D">
+ <entry name="/queue/D"/>
+ </queue>
+ <queue name="ex">
+ <entry name="/queue/ex"/>
+ </queue>
+ <queue name="PrivateDLQ">
+ <entry name="/queue/PrivateDLQ"/>
+ </queue>
+ <queue name="PrivateExpiryQueue">
+ <entry name="/queue/PrivateExpiryQueue"/>
+ </queue>
+ <queue name="QueueWithOwnDLQAndExpiryQueue">
+ <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
+ </queue>
+ <topic name="TopicWithOwnDLQAndExpiryQueue">
+ <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
+ </topic>
+ <queue name="QueueWithOwnRedeliveryDelay">
+ <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
+ </queue>
+ <topic name="TopicWithOwnRedeliveryDelay">
+ <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
+ </topic>
+ <queue name="testDistributedQueue">
+ <entry name="/queue/testDistributedQueue"/>
+ </queue>
+ <topic name="testDistributedTopic">
+ <entry name="/topic/testDistributedTopic"/>
+ </topic>
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/stand-alone/non-clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-queues.xml (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/jbm-queues.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,137 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <!-- manangement address -->
+ <security match="jbm.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security>
+
+ <security match="jms.topic.testTopic">
+ <permission type="createDurableQueue" roles="durpublisher"/>
+ <permission type="deleteDurableQueue" roles="durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="jms.topic.securedTopic">
+ <permission type="send" roles="publisher"/>
+ <permission type="consume" roles="publisher"/>
+ </security>
+
+ <security match="jms.topic.testDurableTopic">
+ <permission type="createDurableQueue" roles="durpublisher"/>
+ <permission type="deleteDurableQueue" roles="durpublisher"/>
+ <permission type="consume" roles="guest,publisher,durpublisher"/>
+ <permission type="send" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.queue.NoSuchQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.topic.NoSuchTopic">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <security match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <security match="jms.temptopic.#">
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>-->
+
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.topic.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>-->
+
+ <!--default security to catch all-->
+ <security match="#">
+ <permission type="createDurableQueue" roles="guest,def"/>
+ <permission type="deleteDurableQueue" roles="guest,def"/>
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
+ <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
+ <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
+ <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="jms.queue.testDistributedQueue">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="jms.topic.testDistributedTopic">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="jms.queue.testPerfQueue">
+ <clustered>false</clustered>
+ </address-settings>
+
+ <address-settings match="jms.queue.MyQueue">
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <drop-messages-when-full>false</drop-messages-when-full>
+ </address-settings>
+
+ <address-settings match="jms.queue.testGroupQueue">
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <drop-messages-when-full>false</drop-messages-when-full>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
+ </address-settings>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Added: trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
+ </bean>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Added: trunk/src/config/stand-alone/non-clustered/jbm-users.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-users.xml (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/jbm-users.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,10 @@
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-users.xsd ">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+ <!--<user name="admin" password="admin">
+ <role name="admin"/>
+ </user>-->
+</deployment>
\ No newline at end of file
Added: trunk/src/config/stand-alone/non-clustered/jndi.properties
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jndi.properties (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/jndi.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Added: trunk/src/config/stand-alone/non-clustered/log4j.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/log4j.xml (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/log4j.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 536 2005-12-22 06:28:39Z ovidiu $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+
+ <param name="File" value="./logs/messaging.log"/>
+
+ <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+ for each test. We need to append if we want to preserve a full testsuite run log.
+ Make sure the build script clears this log at the beginning of each run.
+ -->
+ <param name="Append" value="false"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+
+ </layout>
+ </appender>
+
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+
+
+</log4j:configuration>
Added: trunk/src/config/stand-alone/non-clustered/logging.properties
===================================================================
--- trunk/src/config/stand-alone/non-clustered/logging.properties (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/logging.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -0,0 +1,31 @@
+############################################################
+# Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+# Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler
+# classes. These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+handlers=org.jboss.messaging.integration.logging.JBossLoggerHandler
+
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers. For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= INFO
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
Deleted: trunk/src/config/version.properties
===================================================================
--- trunk/src/config/version.properties 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/src/config/version.properties 2009-04-27 14:27:29 UTC (rev 6579)
@@ -1,6 +0,0 @@
-messaging.version.versionName=Stilton
-messaging.version.majorVersion=2
-messaging.version.minorVersion=0
-messaging.version.microVersion=0
-messaging.version.incrementingVersion=101
-messaging.version.versionSuffix=BETA1-SNAPSHOT
\ No newline at end of file
Modified: trunk/tests/jms-tests/config/invm-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/invm-beans.xml 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/tests/jms-tests/config/invm-beans.xml 2009-04-27 14:27:29 UTC (rev 6579)
@@ -5,12 +5,4 @@
<bean name="ConfigurationHelper" class="org.jboss.test.messaging.tools.ConfigurationHelper">
<property name="configuration"><inject bean="Configuration"/> </property>
</bean>
-
- <bean name="jbm:AuthenticationManager" class="org.jboss.test.messaging.tools.container.MockJBossSecurityManager"/>
-
- <!--this is just here to satisfy a demand in the main beans file-->
- <bean name="jboss.jca:name=DefaultDS,service=DataSourceBinding" class="java.beans.Beans"/>
-
- <bean name="JBossSecurityJNDIContextEstablishment" class="java.beans.Beans"/>
-
</deployment>
\ No newline at end of file
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-04-27 14:27:29 UTC (rev 6579)
@@ -256,7 +256,7 @@
// FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1606
public String[] getContainerConfig()
{
- return new String[]{ "invm-beans.xml", "AS/config/independent/jbm-jboss-beans.xml"};
+ return new String[]{ "invm-beans.xml", "src/config/stand-alone/non-clustered/jbm-standalone-beans.xml"};
}
protected MessagingServer getJmsServer() throws Exception
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SecurityTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2009-04-27 14:27:29 UTC (rev 6579)
@@ -111,7 +111,7 @@
Connection conn1 = null;
try
{
- conn1 = cf.createConnection("john", "needle");
+ conn1 = cf.createConnection("guest", "guest");
}
finally
{
@@ -129,7 +129,7 @@
Connection conn1 = null;
try
{
- conn1 = cf.createConnection("john", "blobby");
+ conn1 = cf.createConnection("guest", "not.the.valid.password");
fail();
}
catch (JMSSecurityException e)
@@ -152,7 +152,7 @@
Connection conn1 = null;
try
{
- conn1 = cf.createConnection("osama", "blah");
+ conn1 = cf.createConnection("not.the.valid.user", "not.the.valid.password");
fail();
}
catch (JMSSecurityException e)
@@ -180,7 +180,7 @@
bindings.add("preConfcf");
deployConnectionFactory("dilbert-id", "preConfcf", bindings);
ConnectionFactory cf = (ConnectionFactory)getInitialContext().lookup("preConfcf");
- conn = cf.createConnection("dilbert", "dogbert");
+ conn = cf.createConnection("guest", "guest");
String clientID = conn.getClientID();
assertEquals("Invalid ClientID", "dilbert-id", clientID);
}
@@ -224,7 +224,7 @@
bindings.add("preConfcf");
deployConnectionFactory("dilbert-id", "preConfcf", bindings);
ConnectionFactory cf = (ConnectionFactory)getInitialContext().lookup("preConfcf");
- conn = cf.createConnection("dilbert", "dogbert");
+ conn = cf.createConnection("guest", "guest");
conn.setClientID("myID");
fail();
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java 2009-04-27 14:01:51 UTC (rev 6578)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java 2009-04-27 14:27:29 UTC (rev 6579)
@@ -296,7 +296,7 @@
tempQueue.delete();
conn.close();
- conn = cf.createConnection("nobody", "nobody");
+ conn = cf.createConnection("guest", "guest");
try
{
producer.send(m);
More information about the jboss-cvs-commits
mailing list