[jboss-cvs] JBossAS SVN: r84253 - in branches/Branch_5_x_JBM2: messaging-2 and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 16 10:22:53 EST 2009
Author: ataylor
Date: 2009-02-16 10:22:52 -0500 (Mon, 16 Feb 2009)
New Revision: 84253
Added:
branches/Branch_5_x_JBM2/messaging-2/
branches/Branch_5_x_JBM2/messaging-2/build.xml
branches/Branch_5_x_JBM2/messaging-2/pom.xml
branches/Branch_5_x_JBM2/messaging-2/src/
branches/Branch_5_x_JBM2/messaging-2/src/config/
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-cluster-configuration.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-configuration.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-configuration.xsd
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jboss-beans.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jms.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jms.xsd
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-queues.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-queues.xsd
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-security.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-security.xsd
branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-standalone-beans.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/log4j.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/logging.properties
branches/Branch_5_x_JBM2/messaging-2/src/config/login-config.xml
branches/Branch_5_x_JBM2/messaging-2/src/config/messaging-roles.properties
branches/Branch_5_x_JBM2/messaging-2/src/config/messaging-users.properties
branches/Branch_5_x_JBM2/messaging-2/src/config/version.properties
Log:
messaging-2 new profile first pass
Added: branches/Branch_5_x_JBM2/messaging-2/build.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/build.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/build.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: build.xml 81998 2008-12-03 06:46:29Z scott.stark at jboss.org $ -->
+
+<project default="main" name="JBoss/Messaging Integration">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Include the common Buildmagic elements.
+ |
+ | This defines several different targets, properties and paths.
+ | It also sets up the basic extention tasks amoung other things.
+ -->
+
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+
+ &buildmagic;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Configure the build system.
+ |
+ | This target is invoked by the Buildmagic initialization logic and
+ | should contain module specific configuration elements.
+ -->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+ &libraries;
+ <!-- The combined library classpath -->
+
+ <!-- ======= -->
+ <!-- Modules -->
+ <!-- ======= -->
+ &modules;
+ <!-- Where source files live -->
+ <property name="source.config" value="${module.source}/config"/>
+
+ <!-- Where build generated files will go -->
+ <property name="build.resources" value="${module.output}/resources"/>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <property name="jar.prefix" value="jboss-messaging-int"/>
+
+ <call target="_default:task-init"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+ <target name="compile"
+ description="Compile all source files.">
+ <mkdir dir="${build.resources}"/>
+ <copy todir="${build.resources}" filtering="yes">
+ <fileset dir="${source.config}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars">
+
+ <!-- Server and client jars -->
+ <call target="sar" />
+ </target>
+
+ <target name="sar">
+ </target>
+</project>
Added: branches/Branch_5_x_JBM2/messaging-2/pom.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/pom.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/pom.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-messaging-2</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Application Server Messaging</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server (messaging-2 module)</description>
+
+</project>
\ No newline at end of file
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-cluster-configuration.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-cluster-configuration.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-cluster-configuration.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,191 @@
+<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>
+
+ <require-destinations>true</require-destinations>
+
+ <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 -->
+
+ <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>
+
+ <!-- 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>-->
+
+ <!-- Mina Acceptor -->
+ <acceptor name="mina">
+ <factory-class>org.jboss.messaging.integration.transports.mina.MinaAcceptorFactory</factory-class>
+ <param key="jbm.remoting.mina.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.mina.port" value="${jbm.remoting.mina.port}" type="Integer"/>
+ </acceptor>
+
+ <!-- Clustering configuration -->
+
+ <broadcast-group name="bg-group1">
+ <local-bind-address>localhost</local-bind-address>
+ <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>
+
+ <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>
+
+<bridge name="foo">
+ <queue-name>toto</queue-name>
+ <forwarding-address>blah</forwarding-address>
+ <filter string="color > 1"/>
+ <connector-ref connector-name="netty"/>
+</bridge>
+
+ <!-- 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: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-configuration.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-configuration.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-configuration.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,185 @@
+<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>
+
+ <require-destinations>true</require-destinations>
+
+ <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 -->
+
+ <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>
+
+ <!-- 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>
+ </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>-->
+
+ <!-- Mina Acceptor -->
+ <acceptor name="mina">
+ <factory-class>org.jboss.messaging.integration.transports.mina.MinaAcceptorFactory</factory-class>
+ <param key="jbm.remoting.mina.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.mina.port" value="5600" type="Integer"/>
+ </acceptor>
+
+ <!-- Clustering configuration -->
+
+ <broadcast-group name="bg-group1">
+ <local-bind-address>localhost</local-bind-address>
+ <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>
+
+ <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>
+
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>data/paging</paging-directory>
+
+ <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>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>
\ No newline at end of file
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-configuration.xsd
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-configuration.xsd (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-configuration.xsd 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,438 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="urn:jboss:messaging" xmlns="urn:jboss:messaging"
+ elementFormDefault="qualified" attributeFormDefault="unqualified"
+ version="1.0">
+
+ <xsd:include schemaLocation="jbm-queues.xsd"></xsd:include>
+ <xsd:element name="deployment">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="configuration" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="settings" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="configuration">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="clustered" maxOccurs="1"
+ minOccurs="0" />
+ <xsd:element name="scheduled-max-pool-size"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Maximum number of threads to use for
+ scheduled deliveries
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="require-destinations"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="security-enabled" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="security-invalidation-interval"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="wild-card-routing-enabled"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="management-address" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="management-notification-address"
+ type="xsd:string" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="jmx-management-enabled"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-counter-enabled"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="connection-scan-period"
+ type="xsd:long" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="connection-ttl-override"
+ type="xsd:long" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="transaction-timeout" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="transaction-timeout-scan-period"
+ type="xsd:long" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-expiry-scan-period"
+ type="xsd:long" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-expiry-thread-priority"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="id-cache-size" type="xsd:int"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="persist-id-cache" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="remoting-interceptors" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element name="queue-activation-timeout"
+ type="xsd:long" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="backup" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="backup-connector-ref"
+ type="backup-connectorType" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="connector" type="connectorType"
+ minOccurs="0" maxOccurs="unbounded">
+ </xsd:element>
+ <xsd:element name="acceptor" type="acceptorType"
+ minOccurs="1" maxOccurs="unbounded">
+ </xsd:element>
+ <xsd:element ref="broadcast-group" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="discovery-group" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element name="divert" type="divertType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="queue" type="queueType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="bridge" type="bridgeType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="cluster-connection" type="clusterConnectionType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="paging-max-threads" type="xsd:int"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="paging-directory" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="paging-default-size" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="paging-max-global-size-bytes"
+ type="xsd:long" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="bindings-directory" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="create-bindings-dir"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-directory" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="create-journal-dir"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-type" type="journalType"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-buffer-reuse-size"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-sync-transactional"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-sync-non-transactional"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-file-size" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-min-files" type="xsd:int"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="journal-max-aio" type="xsd:int"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="large-messages-directory"
+ type="xsd:string" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="clustered" type="xsd:boolean"></xsd:element>
+
+ <xsd:element name="local-bind-address" type="xsd:string"></xsd:element>
+
+ <xsd:element name="local-bind-port" type="xsd:int"></xsd:element>
+
+ <xsd:element name="group-address" type="xsd:string"></xsd:element>
+
+ <xsd:element name="group-port" type="xsd:int"></xsd:element>
+
+ <xsd:element name="broadcast-period" type="xsd:int"></xsd:element>
+
+ <xsd:element name="connector-ref" type="connector-refType">
+ </xsd:element>
+
+ <xsd:element name="broadcast-group">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="local-bind-address" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="local-bind-port" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="group-address" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="group-port" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="broadcast-period" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="connector-ref" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="refresh-timeout" type="xsd:long"></xsd:element>
+
+ <xsd:element name="discovery-group">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="group-address" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="group-port" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="refresh-timeout" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="discovery-group-ref">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name"
+ type="xsd:IDREF">
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="connector-refType">
+ <xsd:attribute name="connector-name" type="xsd:IDREF"
+ use="required">
+ </xsd:attribute>
+ <xsd:attribute name="backup-connector-name" type="xsd:IDREF"
+ use="optional">
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:element name="remoting-interceptors">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="class-name" type="xsd:string"
+ maxOccurs="unbounded" minOccurs="1">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="paramType">
+ <xsd:attribute name="key" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="value" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="type" use="required">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="String"></xsd:enumeration>
+ <xsd:enumeration value="Integer"></xsd:enumeration>
+ <xsd:enumeration value="Long"></xsd:enumeration>
+ <xsd:enumeration value="Boolean"></xsd:enumeration>
+ <xsd:enumeration value="Float"></xsd:enumeration>
+ <xsd:enumeration value="Double"></xsd:enumeration>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="connectorType">
+ <xsd:sequence>
+ <xsd:element name="factory-class" type="xsd:string"
+ minOccurs="1" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="param" type="paramType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="acceptorType">
+ <xsd:sequence>
+ <xsd:element name="factory-class" type="xsd:string"
+ minOccurs="1" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="param" type="paramType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="optional"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="bridgeType">
+ <xsd:sequence>
+ <xsd:element name="queue-name" type="xsd:string"
+ maxOccurs="1" minOccurs="1">
+ </xsd:element>
+ <xsd:element name="forwarding-address" type="xsd:string"
+ maxOccurs="1" minOccurs="1">
+ </xsd:element>
+ <xsd:element name="filter" type="filterType" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-batch-size" type="xsd:int"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-batch-time" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="transformer-class-name" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="retry-interval" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="retry-interval-multiplier"
+ type="xsd:double" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-retries-before-failover"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-retries-after-failover"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="use-duplicate-detection"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:choice>
+ <xsd:element name="connector-ref"
+ type="connector-refType" minOccurs="1" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="disccovery-group-ref" minOccurs="1"
+ maxOccurs="1">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name"
+ type="xsd:IDREF" use="required">
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="clusterConnectionType">
+ <xsd:sequence>
+ <xsd:element name="address" type="xsd:string"
+ maxOccurs="1" minOccurs="1">
+ </xsd:element>
+ <xsd:element name="retry-interval" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="retry-interval-multiplier"
+ type="xsd:double" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-retries-before-failover"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-retries-after-failover"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="use-duplicate-detection"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="forward-when-no-consumers"
+ type="xsd:boolean" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-hops"
+ type="xsd:int" maxOccurs="1" minOccurs="0">
+ </xsd:element>
+
+ <xsd:choice>
+ <xsd:element name="connector-ref"
+ type="connector-refType" minOccurs="1" maxOccurs="unbounded">
+ </xsd:element>
+ <xsd:element name="discovery-group-ref" minOccurs="1"
+ maxOccurs="1">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name"
+ type="xsd:IDREF" use="required">
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="divertType">
+ <xsd:sequence>
+ <xsd:element name="routing-name" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="address" type="xsd:string" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element name="forwarding-address" type="xsd:string"
+ maxOccurs="1" minOccurs="1">
+ </xsd:element>
+ <xsd:element name="filter" type="filterType" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element name="transformer-class-name" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="exclusive" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:simpleType name="journalType">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="ASYNCIO"></xsd:enumeration>
+ <xsd:enumeration value="NIO"></xsd:enumeration>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="backup-connectorType">
+ <xsd:attribute name="connector-name" type="xsd:IDREF"
+ use="required">
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="filterType">
+ <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+</xsd:schema>
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jboss-beans.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jboss-beans.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jboss-beans.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <bean name="JBMDeploymentManager" class="org.jboss.messaging.core.deployers.impl.FileDeploymentManager">
+ <constructor>
+ <!-- The scan time in milliseconds -->
+ <parameter>5000</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.integration.security.JBossASSecurityManager">
+ <depends>JBossSecurityJNDIContextEstablishment</depends>
+ </bean>
+
+ <!-- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <constructor>
+ <parameter>false</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="BasicSecurityDeployer" class="org.jboss.messaging.core.deployers.impl.BasicSecurityDeployer">
+ <property name="jbmSecurityManager">
+ <inject bean="JBMSecurityManager"/>
+ </property>
+ <property name="messagingServer">
+ <inject bean="MessagingServer"/>
+ </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" property="serverManagement"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="postOffice"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="storageManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="addressSettingsRepository"/>
+ </parameter>
+ <parameter>
+ <inject bean="JMSManagementService"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JMSServerDeployer" class="org.jboss.messaging.jms.server.impl.JMSServerDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="JBMDeploymentManager"/>
+ </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="JBMDeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="addressSettingsRepository" state="Configured"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="QueueDeployer" class="org.jboss.messaging.core.deployers.impl.QueueDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="JBMDeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="SecurityDeployer" class="org.jboss.messaging.core.deployers.impl.SecurityDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="JBMDeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="securityRepository"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="ManagementService" class="org.jboss.messaging.core.management.impl.ManagementServiceImpl">
+ <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
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jms.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jms.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jms.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,170 @@
+<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"/>
+ <entry name="testConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="ServerAckConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entry name="ServerAckConnectionFactory"/>
+ <entry name="/ServerAckConnectionFactory"/>
+ <entry name="/ServerAckXAConnectionFactory"/>
+ <entry name="java:/ServerAckConnectionFactory"/>
+ <entry name="java:/ServerAckXAConnectionFactory"/>
+ <pre-acknowledge>true</pre-acknowledge>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactory">
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="MyExampleConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entry name="/MyExampleConnectionFactory"/>
+ <entry name="/acme/MyExampleConnectionFactoryDupe"/>
+ <entry name="java:/xyz/CF1"/>
+ <entry name="java:/connectionfactories/acme/connection_factory"/>
+ <ping-period>5000</ping-period>
+ <call-timeout>30000</call-timeout>
+ <!-- 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>
+ <!-- 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>
+ <!-- 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>
+ <!--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"/>
+ <entry name="/TestInVMConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="TestSSLConnectionFactory">
+ <connector-ref connector-name="netty-ssl"/>
+ <entry name="/TestSSLConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="TestHttpConnectionFactory">
+ <connector-ref connector-name="netty-http"/>
+ <entry name="/TestHttpConnectionFactory"/>
+ </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>
+ <topic name="testSoloTopic">
+ <entry name="/topic/testSoloTopic"/>
+ </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: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jms.xsd
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jms.xsd (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-jms.xsd 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="urn:jboss:messaging"
+ xmlns="urn:jboss:messaging"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <xsd:element name="deployment">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="connection-factory"
+ maxOccurs="unbounded" minOccurs="1">
+ </xsd:element>
+ <xsd:choice maxOccurs="unbounded" minOccurs="1">
+ <xsd:element ref="queue" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element ref="topic" maxOccurs="1" minOccurs="1"></xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="connection-factory">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:choice>
+ <xsd:element ref="connector-ref" maxOccurs="1"
+ minOccurs="1">
+ </xsd:element>
+ <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="1"></xsd:element>
+ </xsd:choice>
+ <xsd:element name="entry" type="entryType"
+ maxOccurs="unbounded" minOccurs="1">
+ </xsd:element>
+ <xsd:element name="ping-period" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="call-timeout" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="client-id" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="dups-ok-batch-size" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="transaction-batch-size" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="producer-window-size" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="producer-max-rate" type="xsd:int"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="consumer-window-size" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="consumer-max-rate" type="xsd:int"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="block-on-acknowledge" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="send-np-messages-synchronously" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="send-p-messages-synchronously" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="auto-group-id" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="pre-acknowledge" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="connector-ref" type="connector-refType"></xsd:element>
+
+ <xsd:complexType name="connector-refType">
+ <xsd:attribute name="connector-name" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="backup-connector-name" type="xsd:string" use="optional"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="entryType">
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="discovery-group-refType">
+ <xsd:attribute name="discovery-group-name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:element name="queue" type="destinationType"></xsd:element>
+
+
+
+ <xsd:complexType name="destinationType">
+ <xsd:sequence>
+ <xsd:element name="entry" type="entryType" maxOccurs="1" minOccurs="1"></xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:element name="topic" type="destinationType"></xsd:element>
+</xsd:schema>
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-queues.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-queues.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-queues.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,132 @@
+<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="admin.management">
+ <!-- only the admin role can interact with the admin.management address -->
+ <permission type="read" roles="admin"/>
+ <permission type="write" roles="admin"/>
+ </security>
+
+ <security match="topicjms.testTopic">
+ <permission type="create" roles="durpublisher"/>
+ <permission type="read" roles="guest,publisher,durpublisher"/>
+ <permission type="write" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="topicjms.securedTopic">
+ <permission type="write" roles="publisher"/>
+ <permission type="read" roles="publisher"/>
+ </security>
+
+ <security match="topicjms.testDurableTopic">
+ <permission type="create" roles="durpublisher"/>
+ <permission type="read" roles="guest,publisher,durpublisher"/>
+ <permission type="write" roles="guest,publisher,durpublisher"/>
+ </security>
+
+ <security match="queuejms.testQueue">
+ <permission type="read" roles="guest,publisher"/>
+ <permission type="write" roles="guest,publisher"/>
+ </security>
+
+ <security match="queuejms.NoSuchQueue">
+ <permission type="read" roles="guest,publisher"/>
+ <permission type="write" roles="guest,publisher"/>
+ </security>
+
+ <security match="topicjms.NoSuchTopic">
+ <permission type="read" roles="guest,publisher"/>
+ <permission type="write" roles="guest,publisher"/>
+ </security>
+
+ <security match="queuetempjms.*">
+ <permission type="create" roles="guest,def"/>
+ <permission type="read" roles="guest,def"/>
+ <permission type="write" roles="guest,def"/>
+ </security>
+
+ <security match="topictempjms.*">
+ <permission type="create" roles="guest,def"/>
+ <permission type="read" roles="guest,def"/>
+ <permission type="write" roles="guest,def"/>
+ </security>
+
+ <!--this will catch any word i.e. queuejms.anything-->
+ <!--<security match="queuejms.^">
+ <permission type="read" roles="guest,publisher"/>
+ <permission type="write" roles="guest,publisher"/>
+ </security>-->
+
+ <!--this will catch any word i.e. queuejms.anything-->
+ <!--<security match="topicjms.^">
+ <permission type="read" roles="guest,publisher"/>
+ <permission type="write" roles="guest,publisher"/>
+ </security>-->
+
+ <!--default security to catch all-->
+ <security match="*">
+ <permission type="create" roles="guest,def"/>
+ <permission type="read" roles="guest,def"/>
+ <permission type="write" roles="guest,def"/>
+ </security>
+
+ <address-settings match="queuejms.QueueWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>queuejms.PrivateDLQ</dead-letter-address>
+ <expiry-address>queuejms.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="topicjms.TopicWithOwnDLQAndExpiryQueue">
+ <dead-letter-address>queuejms.PrivateDLQ</dead-letter-address>
+ <expiry-address>queuejms.PrivateExpiryQueue</expiry-address>
+ </address-settings>
+
+ <address-settings match="queuejms.QueueWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="topicjms.TopicWithOwnRedeliveryDelay">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-settings>
+
+ <address-settings match="queuejms.testDistributedQueue">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="topicjms.testDistributedTopic">
+ <clustered>true</clustered>
+ </address-settings>
+
+ <address-settings match="queuejms.testPerfQueue">
+ <clustered>false</clustered>
+ </address-settings>
+
+ <address-settings match="queuejms.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="queuejms.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>
+
+ <address-settings match="topicjms.testSoloTopic">
+ <solo-queue>true</solo-queue>
+ </address-settings>
+
+ <!--default for catch all-->
+ <address-settings match="*">
+ <clustered>false</clustered>
+ <dead-letter-address>queuejms.DLQ</dead-letter-address>
+ <expiry-address>queuejms.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-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: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-queues.xsd
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-queues.xsd (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-queues.xsd 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,92 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="urn:jboss:messaging"
+ xmlns="urn:jboss:messaging"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <xsd:element name="settings">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="security" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="address-settings" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element ref="queue" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="permission">
+ <xsd:complexType>
+ <xsd:attribute name="type" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="roles" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="security">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="permission" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="match" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="address-settings" type="address-settingsType"></xsd:element>
+
+ <xsd:complexType name="address-settingsType">
+ <xsd:sequence>
+ <xsd:element name="clustered" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="dead-letter-address" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="expiry-address" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="redelivery-delay" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-size-bytes" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="page-size-bytes" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="drop-messages-when-full" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="distribution-policy-class" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-counter-history-day-limit" type="xsd:int"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="solo-queue" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="match" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:element name="queue" type="queueType"></xsd:element>
+
+ <xsd:complexType name="queueType">
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="address" type="xsd:string"
+ use="required">
+ </xsd:attribute>
+ <xsd:attribute name="filter" type="xsd:string" use="optional"></xsd:attribute>
+ <xsd:attribute name="durable" type="xsd:boolean"
+ use="optional">
+ </xsd:attribute>
+ </xsd:complexType>
+</xsd:schema>
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-security.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-security.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-security.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,5 @@
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-security.xsd ">
+ <user name="guest" password="guest">
+ <role name="guest"/>
+ </user>
+</deployment>
\ No newline at end of file
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-security.xsd
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-security.xsd (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-security.xsd 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="urn:jboss:messaging"
+ xmlns="urn:jboss:messaging"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <xsd:element name="deployment">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="role">
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="user">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="role" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ <xsd:attribute name="password" type="xsd:string"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-standalone-beans.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-standalone-beans.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/jbm-standalone-beans.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,177 @@
+<?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>
+
+ <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"/>
+
+ <!--<bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBossASSecurityManager"/>-->
+
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <constructor>
+ <parameter>false</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="BasicSecurityDeployer" class="org.jboss.messaging.core.deployers.impl.BasicSecurityDeployer">
+ <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>
+ <depends>QueueDeployer</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" property="serverManagement"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="postOffice"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="storageManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="addressSettingsRepository"/>
+ </parameter>
+ <parameter>
+ <inject bean="JMSManagementService"/>
+ </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="QueueDeployer" class="org.jboss.messaging.core.deployers.impl.QueueDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="DeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="Configuration"/>
+ </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">
+ <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
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/log4j.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/log4j.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/log4j.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -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: branches/Branch_5_x_JBM2/messaging-2/src/config/logging.properties
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/logging.properties (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/logging.properties 2009-02-16 15:22:52 UTC (rev 84253)
@@ -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: branches/Branch_5_x_JBM2/messaging-2/src/config/login-config.xml
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/login-config.xml (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/login-config.xml 2009-02-16 15:22:52 UTC (rev 84253)
@@ -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: branches/Branch_5_x_JBM2/messaging-2/src/config/messaging-roles.properties
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/messaging-roles.properties (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/messaging-roles.properties 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,4 @@
+#
+# user=role1,role2,...
+#
+guest=guest
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/messaging-users.properties
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/messaging-users.properties (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/messaging-users.properties 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,4 @@
+#
+# user=password
+#
+guest=guest
Added: branches/Branch_5_x_JBM2/messaging-2/src/config/version.properties
===================================================================
--- branches/Branch_5_x_JBM2/messaging-2/src/config/version.properties (rev 0)
+++ branches/Branch_5_x_JBM2/messaging-2/src/config/version.properties 2009-02-16 15:22:52 UTC (rev 84253)
@@ -0,0 +1,6 @@
+messaging.version.versionName=Stilton
+messaging.version.majorVersion=2
+messaging.version.minorVersion=0
+messaging.version.microVersion=0
+messaging.version.incrementingVersion=101
+messaging.version.versionSuffix=beta1
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list