[jboss-cvs] JBossAS SVN: r64526 - in branches/Branch_4_2: build and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 9 15:51:14 EDT 2007
Author: clebert.suconic at jboss.com
Date: 2007-08-09 15:51:14 -0400 (Thu, 09 Aug 2007)
New Revision: 64526
Added:
branches/Branch_4_2/messaging/src/etc/server-jbm/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml
branches/Branch_4_2/server/src/etc/conf/default/props/messaging-roles.properties
branches/Branch_4_2/server/src/etc/conf/default/props/messaging-users.properties
Removed:
branches/Branch_4_2/messaging/src/etc/server-jbm/default/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml
branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml
Modified:
branches/Branch_4_2/aspects/build-test50.xml
branches/Branch_4_2/build/build-distr.xml
branches/Branch_4_2/build/build-thirdparty.xml
branches/Branch_4_2/cluster/build.xml
branches/Branch_4_2/console/build.xml
branches/Branch_4_2/ejb3/build-from-5.xml
branches/Branch_4_2/ejb3/build-test.xml
branches/Branch_4_2/ejb3/build.xml
branches/Branch_4_2/ejb3/deprecated-build-test.xml
branches/Branch_4_2/server/src/etc/conf/default/login-config.xml
branches/Branch_4_2/testsuite/build.xml
branches/Branch_4_2/testsuite/deprecated-build.xml
branches/Branch_4_2/tools/etc/buildmagic/modules.ent
branches/Branch_4_2/tools/etc/buildmagic/modules.xml
branches/Branch_4_2/varia/build.xml
Log:
JBAS-4600 - Renaming mq variables on build and adding jboss-messaging into build-thirdparty
Modified: branches/Branch_4_2/aspects/build-test50.xml
===================================================================
--- branches/Branch_4_2/aspects/build-test50.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/aspects/build-test50.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -115,7 +115,7 @@
<path refid="jboss.security.classpath"/>
<!-- this is for the NonSerializableFactory -->
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.test.classpath"/>
</path>
Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/build/build-distr.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -526,8 +526,40 @@
</fileset>
</copy>
</target>
+
+ <target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation">
+
+ <property name="target" value="default"/>
+
+
+ <echo message="target = ${target} ${jboss.messaging.lib}"/>
+ <move todir="${install.server}/${target}/deploy" failonerror="no">
+ <fileset dir="${install.server}/${target}/deploy/jms">
+ <include name="hajndi-jms.xml"/>
+ <include name="jms-ds.xml"/>
+ <include name="jms-ra.rar"/>
+ </fileset>
+ </move>
+ <copy todir="${install.server}/${target}/lib" filtering="no">
+ <fileset dir="${jboss.messaging.lib}">
+ <include name="jboss-messaging.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.server}/${target}/deploy/jboss-messaging.sar" filtering="no">
+ <fileset dir="${project.root}/messaging/output/etc/server-jbm/default/deploy/jboss-messaging.sar">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+
+ <delete dir="${install.server}/${target}/deploy/jms"/>
+ <delete dir="${install.server}/${target}/deploy-hasingleton/jms"/>
+
+ </target>
+
+
<!-- === -->
<!-- JMX -->
<!-- === -->
Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/build/build-thirdparty.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -113,6 +113,7 @@
<componentref name="trove" version="1.0.2-brew"/>
<componentref name="woodstox" version="3.1.1-brew"/>
<componentref name="xdoclet" version="1.2.3-brew"/>
+ <componentref name="jboss/messaging" version="1.4.0.CR1"/>
</build>
<synchronizeinfo/>
Modified: branches/Branch_4_2/cluster/build.xml
===================================================================
--- branches/Branch_4_2/cluster/build.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/cluster/build.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -90,7 +90,7 @@
<path refid="jboss.common.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.naming.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.jmx.classpath"/>
Modified: branches/Branch_4_2/console/build.xml
===================================================================
--- branches/Branch_4_2/console/build.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/console/build.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -93,7 +93,7 @@
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.management.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.varia.classpath"/>
<path refid="jboss.aop.classpath"/>
Modified: branches/Branch_4_2/ejb3/build-from-5.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-from-5.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/ejb3/build-from-5.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -139,7 +139,7 @@
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.iiop.classpath"/>
</path>
Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/ejb3/build-test.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -189,7 +189,7 @@
<path refid="jboss.security.classpath"/>
<!-- this is for the NonSerializableFactory -->
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.test.classpath"/>
<path refid="jboss.ejb3.classpath"/>
<!--path refid="jboss.webservice.classpath"/-->
Modified: branches/Branch_4_2/ejb3/build.xml
===================================================================
--- branches/Branch_4_2/ejb3/build.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/ejb3/build.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -135,7 +135,7 @@
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.iiop.classpath"/>
</path>
Modified: branches/Branch_4_2/ejb3/deprecated-build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/deprecated-build-test.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/ejb3/deprecated-build-test.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -115,7 +115,7 @@
<path refid="jboss.security.classpath"/>
<!-- this is for the NonSerializableFactory -->
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.test.classpath"/>
<path refid="jboss.container.classpath"/>
<path refid="jboss.kernel.classpath"/>
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm)
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default)
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy)
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar)
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF)
Deleted: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF
===================================================================
--- branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF 2007-07-18 23:21:27 UTC (rev 64130)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF 2007-08-09 19:51:14 UTC (rev 64526)
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.2
-Created-By: 1.5.0_07-b03 (Sun Microsystems Inc.)
-Specification-Title: JBoss Messaging
-Specification-Version: 1.3.0.GA
-Specification-Vendor: JBoss Inc. (http://www.jboss.org/)
-Implementation-Title: JBoss Messaging
-Implementation-URL: http://www.jboss.org/
-Implementation-Version: 1.3.0.GA (build: CVSTag=JBossMessaging_1_3_0_G
- A date=200706111737)
-Implementation-Vendor: JBoss Inc. (http://www.jboss.org/)
-Implementation-Vendor-Id: http://www.jboss.org/
-
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF)
===================================================================
--- branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF (rev 0)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/MANIFEST.MF 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.6.2
+Created-By: 1.5.0_07-b03 (Sun Microsystems Inc.)
+Specification-Title: JBoss Messaging
+Specification-Version: 1.3.0.GA
+Specification-Vendor: JBoss Inc. (http://www.jboss.org/)
+Implementation-Title: JBoss Messaging
+Implementation-URL: http://www.jboss.org/
+Implementation-Version: 1.3.0.GA (build: CVSTag=JBossMessaging_1_3_0_G
+ A date=200706111737)
+Implementation-Vendor: JBoss Inc. (http://www.jboss.org/)
+Implementation-Vendor-Id: http://www.jboss.org/
+
Deleted: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml
===================================================================
--- branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml 2007-07-18 23:21:27 UTC (rev 64130)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Bootstrap - starts the messaging server peer
-
- $Id$
- -->
-
-<server>
-
- <mbean code="org.jboss.jms.server.Bootstrap"
- name="jboss.messaging:service=Bootstrap"
- xmbean-dd="xmdesc/Bootstrap-xmbean.xml">
- <depends>jboss.messaging:service=ServerPeer</depends>
- </mbean>
-
-</server>
\ No newline at end of file
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml)
===================================================================
--- branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml (rev 0)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/META-INF/jboss-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Bootstrap - starts the messaging server peer
+
+ $Id$
+ -->
+
+<server>
+
+ <mbean code="org.jboss.jms.server.Bootstrap"
+ name="jboss.messaging:service=Bootstrap"
+ xmbean-dd="xmdesc/Bootstrap-xmbean.xml">
+ <depends>jboss.messaging:service=ServerPeer</depends>
+ </mbean>
+
+</server>
\ No newline at end of file
Deleted: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml
===================================================================
--- branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml 2007-07-18 23:21:27 UTC (rev 64130)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Messaging Connection Factories deployment descriptor.
-
- $Id$
- -->
-
-<server>
-
- <!-- The default connection factory does not support automatic failover or load balancing-
- this is so we can maintain compatiblity with applications written for JBoss MQ which use this
- connection factory.
- -->
- <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
- name="jboss.messaging.connectionfactory:service=ConnectionFactory"
- xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
-
- <attribute name="JNDIBindings">
- <bindings>
- <binding>/ConnectionFactory</binding>
- <binding>/XAConnectionFactory</binding>
- <binding>java:/ConnectionFactory</binding>
- <binding>java:/XAConnectionFactory</binding>
- </bindings>
- </attribute>
- </mbean>
-
- <!-- A clustered connection factory that supports automatic failover and load balancing of created
- connections.
- This factory is not suitable to be used by MDBs.
- -->
- <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
- name="jboss.messaging.connectionfactory:service=ClusteredConnectionFactory"
- xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
-
- <attribute name="JNDIBindings">
- <bindings>
- <binding>/ClusteredConnectionFactory</binding>
- <binding>/ClusteredXAConnectionFactory</binding>
- <binding>java:/ClusteredConnectionFactory</binding>
- <binding>java:/ClusteredXAConnectionFactory</binding>
- </bindings>
- </attribute>
-
- <attribute name="SupportsFailover">true</attribute>
- <attribute name="SupportsLoadBalancing">true</attribute>
- </mbean>
-
- <!-- A connection factory with no JNDI bindings that is used in clustering to create the connections that
- pull messages from one node to another
- -->
- <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
- name="jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory"
- xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SupportsFailover">false</attribute>
- <attribute name="SupportsLoadBalancing">false</attribute>
- </mbean>
-
- <!-- An example connection factory with all attributes shown
-
- <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
- name="jboss.messaging.connectionfactory:service=MyExampleConnectionFactory"
- xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
-
- <constructor>
-
- <!- - You can specify the default Client ID to use for connections created using this factory - ->
-
- <arg type="java.lang.String" value="MyClientID"/>
-
- </constructor>
-
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-
- <!- - The transport to use - can be bisocket, sslbisocket or http - ->
-
- <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=http</depends>
-
- <depends>jboss.messaging:service=PostOffice</depends>
-
- <!- - PrefetchSize determines the approximate maximum number of messages the client consumer will buffer locally - ->
-
- <attribute name="PrefetchSize">150</attribute>
-
- <!- - Paging params to be used for temporary queues - ->
-
- <attribute name="DefaultTempQueueFullSize">200000</attribute>
-
- <attribute name="DefaultTempQueuePageSizeSize">2000</attribute>
-
- <attribute name="DefaultTempQueueDownCacheSize">2000</attribute>
-
- <!- - The batch size to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode - ->
-
- <attribute name="DupsOKBatchSize">5000</attribute>
-
- <!- - Does this connection factory support automatic failover? - ->
-
- <attribute name="SupportsFailover">false</attribute>
-
- <!- - Does this connection factory support automatic client side load balancing? - ->
-
- <attribute name="SupportsLoadBalancing">false</attribute>
-
- <!- - The class name of the factory used to create the load balancing policy to use on the client side - ->
-
- <attribute name="LoadBalancingFactory">org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</attribute>
-
- <!- - The connection factory will be bound in the following places in JNDI - ->
-
- <attribute name="JNDIBindings">
-
- <bindings>
-
- <binding>/acme/MyExampleConnectionFactory</binding>
-
- <binding>/acme/MyExampleConnectionFactoryDupe</binding>
-
- <binding>java:/xyz/CF1</binding>
-
- <binding>java:/connectionfactories/acme/connection_factory</binding>
-
- </bindings>
-
- </attribute>
-
- </mbean>
-
- -->
-
-</server>
\ No newline at end of file
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml)
===================================================================
--- branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml (rev 0)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/connection-factories-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Connection Factories deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <!-- The default connection factory does not support automatic failover or load balancing-
+ this is so we can maintain compatiblity with applications written for JBoss MQ which use this
+ connection factory.
+ -->
+ <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+ name="jboss.messaging.connectionfactory:service=ConnectionFactory"
+ xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+
+ <attribute name="JNDIBindings">
+ <bindings>
+ <binding>/ConnectionFactory</binding>
+ <binding>/XAConnectionFactory</binding>
+ <binding>java:/ConnectionFactory</binding>
+ <binding>java:/XAConnectionFactory</binding>
+ </bindings>
+ </attribute>
+ </mbean>
+
+ <!-- A clustered connection factory that supports automatic failover and load balancing of created
+ connections.
+ This factory is not suitable to be used by MDBs.
+ -->
+ <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+ name="jboss.messaging.connectionfactory:service=ClusteredConnectionFactory"
+ xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+
+ <attribute name="JNDIBindings">
+ <bindings>
+ <binding>/ClusteredConnectionFactory</binding>
+ <binding>/ClusteredXAConnectionFactory</binding>
+ <binding>java:/ClusteredConnectionFactory</binding>
+ <binding>java:/ClusteredXAConnectionFactory</binding>
+ </bindings>
+ </attribute>
+
+ <attribute name="SupportsFailover">true</attribute>
+ <attribute name="SupportsLoadBalancing">true</attribute>
+ </mbean>
+
+ <!-- A connection factory with no JNDI bindings that is used in clustering to create the connections that
+ pull messages from one node to another
+ -->
+ <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+ name="jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory"
+ xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SupportsFailover">false</attribute>
+ <attribute name="SupportsLoadBalancing">false</attribute>
+ </mbean>
+
+ <!-- An example connection factory with all attributes shown
+
+ <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+ name="jboss.messaging.connectionfactory:service=MyExampleConnectionFactory"
+ xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+
+ <constructor>
+
+ <!- - You can specify the default Client ID to use for connections created using this factory - ->
+
+ <arg type="java.lang.String" value="MyClientID"/>
+
+ </constructor>
+
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+
+ <!- - The transport to use - can be bisocket, sslbisocket or http - ->
+
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=http</depends>
+
+ <depends>jboss.messaging:service=PostOffice</depends>
+
+ <!- - PrefetchSize determines the approximate maximum number of messages the client consumer will buffer locally - ->
+
+ <attribute name="PrefetchSize">150</attribute>
+
+ <!- - Paging params to be used for temporary queues - ->
+
+ <attribute name="DefaultTempQueueFullSize">200000</attribute>
+
+ <attribute name="DefaultTempQueuePageSizeSize">2000</attribute>
+
+ <attribute name="DefaultTempQueueDownCacheSize">2000</attribute>
+
+ <!- - The batch size to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode - ->
+
+ <attribute name="DupsOKBatchSize">5000</attribute>
+
+ <!- - Does this connection factory support automatic failover? - ->
+
+ <attribute name="SupportsFailover">false</attribute>
+
+ <!- - Does this connection factory support automatic client side load balancing? - ->
+
+ <attribute name="SupportsLoadBalancing">false</attribute>
+
+ <!- - The class name of the factory used to create the load balancing policy to use on the client side - ->
+
+ <attribute name="LoadBalancingFactory">org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</attribute>
+
+ <!- - The connection factory will be bound in the following places in JNDI - ->
+
+ <attribute name="JNDIBindings">
+
+ <bindings>
+
+ <binding>/acme/MyExampleConnectionFactory</binding>
+
+ <binding>/acme/MyExampleConnectionFactoryDupe</binding>
+
+ <binding>java:/xyz/CF1</binding>
+
+ <binding>java:/connectionfactories/acme/connection_factory</binding>
+
+ </bindings>
+
+ </attribute>
+
+ </mbean>
+
+ -->
+
+</server>
\ No newline at end of file
Deleted: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml
===================================================================
--- branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml 2007-07-18 23:21:27 UTC (rev 64130)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Messaging Destinations deployment descriptor.
-
- $Id$
- -->
-
-<server>
-
- <!--
- The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
- -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=DLQ"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <!--
- The Default Expiry Queue.
- -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=ExpiryQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <!--
- Example destinations.
- -->
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=testTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="durpublisher" read="true" write="true" create="true"/>
- </security>
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=securedTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <security>
- <role name="publisher" read="true" write="true" create="false"/>
- </security>
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="durpublisher" read="true" write="true" create="true"/>
- </security>
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=testQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="noacc" read="false" write="false" create="false"/>
- </security>
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=A"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=B"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=C"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=D"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=ex"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <!-- It's possible for indiviual queues and topics to use a specific queue for
- an expiry or DLQ -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
- <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
- <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
- </mbean>
-
- <!-- Queues and Topics can also specify their own redelivery delay -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="RedeliveryDelay">5000</attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="RedeliveryDelay">5000</attribute>
- </mbean>
-
- <!--
- Example clustered destinations.
- -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=testDistributedQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="Clustered">true</attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="Clustered">true</attribute>
- </mbean>
-
-</server>
\ No newline at end of file
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml)
===================================================================
--- branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml (rev 0)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/destinations-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Destinations deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <!--
+ The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=DLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ The Default Expiry Queue.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ Example destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=securedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="publisher" read="true" write="true" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="noacc" read="false" write="false" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=A"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=B"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=C"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=D"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ex"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!-- It's possible for indiviual queues and topics to use a specific queue for
+ an expiry or DLQ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <!-- Queues and Topics can also specify their own redelivery delay -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <!--
+ Example clustered destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testDistributedQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Deleted: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml
===================================================================
--- branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml 2007-07-18 23:21:27 UTC (rev 64130)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Hypersonic persistence deployment descriptor.
-
- DO NOT USE HYPERSONIC IN PRODUCTION or in a clustered environment- Hypersonic does not have transaction isolation
-
- $Id$
- -->
-
-<server>
-
- <!-- Persistence Manager MBean configuration
- ======================================= -->
-
- <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
- name="jboss.messaging:service=PersistenceManager"
- xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
-
- <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-
- <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-
- <!-- The datasource to use for the persistence manager -->
-
- <attribute name="DataSource">java:/DefaultDS</attribute>
-
- <!-- If true will attempt to create tables and indexes on every start-up -->
-
- <attribute name="CreateTablesOnStartup">true</attribute>
-
- <!-- If true then will use JDBC batch updates -->
-
- <attribute name="UsingBatchUpdates">false</attribute>
-
- <!-- The maximum number of parameters to include in a prepared statement -->
-
- <attribute name="MaxParams">500</attribute>
- </mbean>
-
- <!-- Messaging Post Office MBean configuration
- ========================================= -->
-
- <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
- name="jboss.messaging:service=PostOffice"
- xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
-
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-
- <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-
- <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-
- <!-- The name of the post office -->
-
- <attribute name="PostOfficeName">JMS post office</attribute>
-
- <!-- The datasource used by the post office to access it's binding information -->
-
- <attribute name="DataSource">java:/DefaultDS</attribute>
-
- <!-- If true will attempt to create tables and indexes on every start-up -->
-
- <attribute name="CreateTablesOnStartup">true</attribute>
-
- <!-- This post office is NON CLUSTERED - do not use clustering with Hypersonic!! -->
-
- <attribute name="Clustered">false</attribute>
- </mbean>
-
- <!-- Messaging JMS User Manager MBean config
- ======================================= -->
-
- <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
- name="jboss.messaging:service=JMSUserManager"
- xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
-
- <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-
- <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
-
- <attribute name="DataSource">java:/DefaultDS</attribute>
-
- <attribute name="CreateTablesOnStartup">true</attribute>
-
- <attribute name="SqlProperties"><![CDATA[
-POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
- ]]></attribute>
- </mbean>
-
-</server>
\ No newline at end of file
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml)
===================================================================
--- branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml (rev 0)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Hypersonic persistence deployment descriptor.
+
+ DO NOT USE HYPERSONIC IN PRODUCTION or in a clustered environment- Hypersonic does not have transaction isolation
+
+ $Id$
+ -->
+
+<server>
+
+ <!-- Persistence Manager MBean configuration
+ ======================================= -->
+
+ <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
+ name="jboss.messaging:service=PersistenceManager"
+ xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
+
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+ <!-- The datasource to use for the persistence manager -->
+
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+
+ <!-- If true will attempt to create tables and indexes on every start-up -->
+
+ <attribute name="CreateTablesOnStartup">true</attribute>
+
+ <!-- If true then will use JDBC batch updates -->
+
+ <attribute name="UsingBatchUpdates">false</attribute>
+
+ <!-- The maximum number of parameters to include in a prepared statement -->
+
+ <attribute name="MaxParams">500</attribute>
+ </mbean>
+
+ <!-- Messaging Post Office MBean configuration
+ ========================================= -->
+
+ <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
+ name="jboss.messaging:service=PostOffice"
+ xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
+
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+ <!-- The name of the post office -->
+
+ <attribute name="PostOfficeName">JMS post office</attribute>
+
+ <!-- The datasource used by the post office to access it's binding information -->
+
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+
+ <!-- If true will attempt to create tables and indexes on every start-up -->
+
+ <attribute name="CreateTablesOnStartup">true</attribute>
+
+ <!-- This post office is NON CLUSTERED - do not use clustering with Hypersonic!! -->
+
+ <attribute name="Clustered">false</attribute>
+ </mbean>
+
+ <!-- Messaging JMS User Manager MBean config
+ ======================================= -->
+
+ <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+ name="jboss.messaging:service=JMSUserManager"
+ xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+
+ <attribute name="CreateTablesOnStartup">true</attribute>
+
+ <attribute name="SqlProperties"><![CDATA[
+POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
+ ]]></attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Deleted: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml
===================================================================
--- branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml 2007-07-18 23:21:27 UTC (rev 64130)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The JBoss Messaging service deployment descriptor.
-
- $Id$
- -->
-
-<server>
-
- <!-- ServerPeer MBean configuration
- ============================== -->
-
- <mbean code="org.jboss.jms.server.ServerPeer"
- name="jboss.messaging:service=ServerPeer"
- xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
-
- <!-- The unique id of the server peer - in a cluster each node MUST have a unique value - must be an integer -->
-
- <attribute name="ServerPeerID">0</attribute>
-
- <!-- The default JNDI context to use for queues when they are deployed without specifying one -->
-
- <attribute name="DefaultQueueJNDIContext">/queue</attribute>
-
- <!-- The default JNDI context to use for topics when they are deployed without specifying one -->
-
- <attribute name="DefaultTopicJNDIContext">/topic</attribute>
-
- <attribute name="PostOffice">jboss.messaging:service=PostOffice</attribute>
-
- <!-- The JAAS security domain to use for JBoss Messaging -->
-
- <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
-
- <!-- The default security configuration to apply to destinations - this can be overridden on a per destination basis -->
-
- <attribute name="DefaultSecurityConfig">
- <security>
- <role name="guest" read="true" write="true" create="true"/>
- </security>
- </attribute>
-
- <!-- The default Dead Letter Queue (DLQ) to use for destinations.
- This can be overridden on a per destinatin basis -->
-
- <attribute name="DefaultDLQ">jboss.messaging.destination:service=Queue,name=DLQ</attribute>
-
- <!-- The default maximum number of times to attempt delivery of a message before sending to the DLQ (if configured).
- This can be overridden on a per destinatin basis -->
-
- <attribute name="DefaultMaxDeliveryAttempts">10</attribute>
-
- <!-- The default Expiry Queue to use for destinations. This can be overridden on a per destinatin basis -->
-
- <attribute name="DefaultExpiryQueue">jboss.messaging.destination:service=Queue,name=ExpiryQueue</attribute>
-
- <!-- The default redelivery delay to impose. This can be overridden on a per destination basis -->
-
- <attribute name="DefaultRedeliveryDelay">0</attribute>
-
- <!-- The periodicity of the message counter manager enquiring on queues for statistics -->
-
- <attribute name="MessageCounterSamplePeriod">5000</attribute>
-
- <!-- The maximum amount of time for a client to wait for failover to start on the server side after
- it has detected failure -->
-
- <attribute name="FailoverStartTimeout">60000</attribute>
-
- <!-- The maximum amount of time for a client to wait for failover to complete on the server side after
- it has detected failure -->
-
- <attribute name="FailoverCompleteTimeout">300000</attribute>
-
- <!-- The maximum number of days results to maintain in the message counter history -->
-
- <attribute name="DefaultMessageCounterHistoryDayLimit">-1</attribute>
-
- <!-- The name of the connection factory to use for creating connections between nodes to pull messages -->
-
- <attribute name="ClusterPullConnectionFactoryName">jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory</attribute>
-
- <!-- Use XA when pulling persistent messages from a remote node to this one. -->
-
- <attribute name="UseXAForMessagePull">true</attribute>
-
- <!-- When redistributing messages in the cluster. Do we need to preserve the order of messages received
- by a particular consumer from a particular producer? -->
-
- <attribute name="DefaultPreserveOrdering">false</attribute>
-
- <!-- Max. time to hold previously delivered messages back waiting for clients to reconnect after failover -->
-
- <attribute name="RecoverDeliveriesTimeout">300000</attribute>
-
- <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
-
- <depends optional-attribute-name="JMSUserManager">jboss.messaging:service=JMSUserManager</depends>
-
- <depends>jboss.messaging:service=Connector,transport=bisocket</depends>
-
- </mbean>
-
-</server>
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml)
===================================================================
--- branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml (rev 0)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/messaging-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The JBoss Messaging service deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <!-- ServerPeer MBean configuration
+ ============================== -->
+
+ <mbean code="org.jboss.jms.server.ServerPeer"
+ name="jboss.messaging:service=ServerPeer"
+ xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
+
+ <!-- The unique id of the server peer - in a cluster each node MUST have a unique value - must be an integer -->
+
+ <attribute name="ServerPeerID">0</attribute>
+
+ <!-- The default JNDI context to use for queues when they are deployed without specifying one -->
+
+ <attribute name="DefaultQueueJNDIContext">/queue</attribute>
+
+ <!-- The default JNDI context to use for topics when they are deployed without specifying one -->
+
+ <attribute name="DefaultTopicJNDIContext">/topic</attribute>
+
+ <attribute name="PostOffice">jboss.messaging:service=PostOffice</attribute>
+
+ <!-- The JAAS security domain to use for JBoss Messaging -->
+
+ <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
+
+ <!-- The default security configuration to apply to destinations - this can be overridden on a per destination basis -->
+
+ <attribute name="DefaultSecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+
+ <!-- The default Dead Letter Queue (DLQ) to use for destinations.
+ This can be overridden on a per destinatin basis -->
+
+ <attribute name="DefaultDLQ">jboss.messaging.destination:service=Queue,name=DLQ</attribute>
+
+ <!-- The default maximum number of times to attempt delivery of a message before sending to the DLQ (if configured).
+ This can be overridden on a per destinatin basis -->
+
+ <attribute name="DefaultMaxDeliveryAttempts">10</attribute>
+
+ <!-- The default Expiry Queue to use for destinations. This can be overridden on a per destinatin basis -->
+
+ <attribute name="DefaultExpiryQueue">jboss.messaging.destination:service=Queue,name=ExpiryQueue</attribute>
+
+ <!-- The default redelivery delay to impose. This can be overridden on a per destination basis -->
+
+ <attribute name="DefaultRedeliveryDelay">0</attribute>
+
+ <!-- The periodicity of the message counter manager enquiring on queues for statistics -->
+
+ <attribute name="MessageCounterSamplePeriod">5000</attribute>
+
+ <!-- The maximum amount of time for a client to wait for failover to start on the server side after
+ it has detected failure -->
+
+ <attribute name="FailoverStartTimeout">60000</attribute>
+
+ <!-- The maximum amount of time for a client to wait for failover to complete on the server side after
+ it has detected failure -->
+
+ <attribute name="FailoverCompleteTimeout">300000</attribute>
+
+ <!-- The maximum number of days results to maintain in the message counter history -->
+
+ <attribute name="DefaultMessageCounterHistoryDayLimit">-1</attribute>
+
+ <!-- The name of the connection factory to use for creating connections between nodes to pull messages -->
+
+ <attribute name="ClusterPullConnectionFactoryName">jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory</attribute>
+
+ <!-- Use XA when pulling persistent messages from a remote node to this one. -->
+
+ <attribute name="UseXAForMessagePull">true</attribute>
+
+ <!-- When redistributing messages in the cluster. Do we need to preserve the order of messages received
+ by a particular consumer from a particular producer? -->
+
+ <attribute name="DefaultPreserveOrdering">false</attribute>
+
+ <!-- Max. time to hold previously delivered messages back waiting for clients to reconnect after failover -->
+
+ <attribute name="RecoverDeliveriesTimeout">300000</attribute>
+
+ <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
+
+ <depends optional-attribute-name="JMSUserManager">jboss.messaging:service=JMSUserManager</depends>
+
+ <depends>jboss.messaging:service=Connector,transport=bisocket</depends>
+
+ </mbean>
+
+</server>
Deleted: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml
===================================================================
--- branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml 2007-07-18 23:21:27 UTC (rev 64130)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Standard bisocket-based Remoting service deployment descriptor.
-
- $Id$
- -->
-
-<server>
-
- <!-- Standard bisocket connector - the bisocket transport only opens connection from client->server
- so can be used with firewalls where only outgoing connections are allowed.
- For examples of HTTP and SSL transports see docs/examples -->
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.messaging:service=Connector,transport=bisocket"
- display-name="Bisocket Transport Connector">
- <attribute name="Configuration">
- <config>
- <invoker transport="bisocket">
- <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4457</attribute>
- <attribute name="leasePeriod">10000</attribute>
- <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
- <attribute name="serverSocketClass" isParam="true">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
- <attribute name="numberOfRetries" isParam="true">1</attribute>
- <attribute name="numberOfCallRetries" isParam="true">1</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean>
-
-</server>
Copied: branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml (from rev 64130, branches/Branch_4_4/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml)
===================================================================
--- branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml (rev 0)
+++ branches/Branch_4_2/messaging/src/etc/server-jbm/default/deploy/jboss-messaging.sar/remoting-bisocket-service.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Standard bisocket-based Remoting service deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <!-- Standard bisocket connector - the bisocket transport only opens connection from client->server
+ so can be used with firewalls where only outgoing connections are allowed.
+ For examples of HTTP and SSL transports see docs/examples -->
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.messaging:service=Connector,transport=bisocket"
+ display-name="Bisocket Transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="bisocket">
+ <attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
+ <attribute name="dataType" isParam="true">jms</attribute>
+ <attribute name="socket.check_connection" isParam="true">false</attribute>
+ <attribute name="timeout" isParam="true">0</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">4457</attribute>
+ <attribute name="leasePeriod">10000</attribute>
+ <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
+ <attribute name="serverSocketClass" isParam="true">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
+ <attribute name="numberOfRetries" isParam="true">1</attribute>
+ <attribute name="numberOfCallRetries" isParam="true">1</attribute>
+ <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ </mbean>
+
+</server>
Modified: branches/Branch_4_2/server/src/etc/conf/default/login-config.xml
===================================================================
--- branches/Branch_4_2/server/src/etc/conf/default/login-config.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/server/src/etc/conf/default/login-config.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -134,6 +134,16 @@
</authentication>
</application-policy>
+ <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>
+
<!-- The default login configuration used by any security domain that
does not have a application-policy entry with a matching name
-->
Copied: branches/Branch_4_2/server/src/etc/conf/default/props/messaging-roles.properties (from rev 64130, branches/Branch_4_4/server/src/etc/conf/default/props/messaging-roles.properties)
===================================================================
--- branches/Branch_4_2/server/src/etc/conf/default/props/messaging-roles.properties (rev 0)
+++ branches/Branch_4_2/server/src/etc/conf/default/props/messaging-roles.properties 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,5 @@
+# messaging-roles.properties
+# Add roles as you like
+# user=role1,role2,...
+#
+guest=guest
\ No newline at end of file
Copied: branches/Branch_4_2/server/src/etc/conf/default/props/messaging-users.properties (from rev 64130, branches/Branch_4_4/server/src/etc/conf/default/props/messaging-users.properties)
===================================================================
--- branches/Branch_4_2/server/src/etc/conf/default/props/messaging-users.properties (rev 0)
+++ branches/Branch_4_2/server/src/etc/conf/default/props/messaging-users.properties 2007-08-09 19:51:14 UTC (rev 64526)
@@ -0,0 +1,7 @@
+# messaging-users.properties
+
+# Add users as you like
+# user=password
+#
+guest=guest
+
\ No newline at end of file
Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/testsuite/build.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -167,7 +167,7 @@
<path refid="jboss.jca.classpath"/>
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.management.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.naming.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
Modified: branches/Branch_4_2/testsuite/deprecated-build.xml
===================================================================
--- branches/Branch_4_2/testsuite/deprecated-build.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/testsuite/deprecated-build.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -153,7 +153,7 @@
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.management.classpath"/>
<path refid="jboss.media.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.naming.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
Modified: branches/Branch_4_2/tools/etc/buildmagic/modules.ent
===================================================================
--- branches/Branch_4_2/tools/etc/buildmagic/modules.ent 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/tools/etc/buildmagic/modules.ent 2007-08-09 19:51:14 UTC (rev 64526)
@@ -108,10 +108,10 @@
</path>
<!-- Messaging -->
- <property name="jboss.messaging.root" value="${project.root}/messaging/output"/>
- <property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
- <path id="jboss.messaging.classpath">
- <pathelement path="${jboss.messaging.lib}/jbossmq.jar"/>
+ <property name="jboss.messaging-mq.root" value="${project.root}/messaging/output"/>
+ <property name="jboss.messaging-mq.lib" value="${jboss.messaging-mq.root}/lib"/>
+ <path id="jboss.messaging-mq.classpath">
+ <pathelement path="${jboss.messaging-mq.lib}/jbossmq.jar"/>
</path>
<!-- Naming -->
Modified: branches/Branch_4_2/tools/etc/buildmagic/modules.xml
===================================================================
--- branches/Branch_4_2/tools/etc/buildmagic/modules.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/tools/etc/buildmagic/modules.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -107,10 +107,10 @@
</path>
<!-- Messaging -->
- <property name="jboss.messaging.root" value="${project.root}/messaging/output"/>
- <property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
- <path id="jboss.messaging.classpath">
- <pathelement path="${jboss.messaging.lib}/jbossmq.jar"/>
+ <property name="jboss.messaging-mq.root" value="${project.root}/messaging/output"/>
+ <property name="jboss.messaging-mq.lib" value="${jboss.messaging-mq.root}/lib"/>
+ <path id="jboss.messaging-mq.classpath">
+ <pathelement path="${jboss.messaging-mq.lib}/jbossmq.jar"/>
</path>
<!-- Naming -->
Modified: branches/Branch_4_2/varia/build.xml
===================================================================
--- branches/Branch_4_2/varia/build.xml 2007-08-09 16:37:55 UTC (rev 64525)
+++ branches/Branch_4_2/varia/build.xml 2007-08-09 19:51:14 UTC (rev 64526)
@@ -109,7 +109,7 @@
<path refid="jboss.server.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.transaction.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.serialization.classpath"/>
</path>
More information about the jboss-cvs-commits
mailing list