[jboss-cvs] JBoss Messaging SVN: r6744 - in trunk: examples/javaee/hajndi/config and 78 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 12 12:06:45 EDT 2009
Author: ataylor
Date: 2009-05-12 12:06:44 -0400 (Tue, 12 May 2009)
New Revision: 6744
Added:
trunk/examples/jms/application-layer-failover/server0/jbm-jboss-beans.xml
trunk/examples/jms/application-layer-failover/server1/jbm-jboss-beans.xml
trunk/examples/jms/automatic-failover/server0/jbm-jboss-beans.xml
trunk/examples/jms/automatic-failover/server1/jbm-jboss-beans.xml
trunk/examples/jms/bridge/server0/jbm-jboss-beans.xml
trunk/examples/jms/bridge/server1/jbm-jboss-beans.xml
trunk/examples/jms/browser/server0/jbm-jboss-beans.xml
trunk/examples/jms/client-kickoff/server0/jbm-jboss-beans.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-jboss-beans.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-jboss-beans.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-jboss-beans.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-jboss-beans.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-jboss-beans.xml
trunk/examples/jms/clustered-queue/server0/jbm-jboss-beans.xml
trunk/examples/jms/clustered-queue/server1/jbm-jboss-beans.xml
trunk/examples/jms/clustered-topic/server0/jbm-jboss-beans.xml
trunk/examples/jms/clustered-topic/server1/jbm-jboss-beans.xml
trunk/examples/jms/consumer-rate-limit/server0/jbm-jboss-beans.xml
trunk/examples/jms/dead-letter/server0/jbm-jboss-beans.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-jboss-beans.xml
trunk/examples/jms/divert/server0/jbm-jboss-beans.xml
trunk/examples/jms/divert/server1/jbm-jboss-beans.xml
trunk/examples/jms/durable-subscription/server0/jbm-jboss-beans.xml
trunk/examples/jms/expiry/server0/jbm-jboss-beans.xml
trunk/examples/jms/http-transport/server0/jbm-jboss-beans.xml
trunk/examples/jms/instantiate-connection-factory/server0/jbm-jboss-beans.xml
trunk/examples/jms/interceptor/server0/jbm-jboss-beans.xml
trunk/examples/jms/jmx/server0/jbm-jboss-beans.xml
trunk/examples/jms/large-message/server0/jbm-jboss-beans.xml
trunk/examples/jms/last-value-queue/server0/jbm-jboss-beans.xml
trunk/examples/jms/management-notifications/server0/jbm-jboss-beans.xml
trunk/examples/jms/management/server0/jbm-jboss-beans.xml
trunk/examples/jms/message-counters/server0/jbm-jboss-beans.xml
trunk/examples/jms/message-group/server0/jbm-jboss-beans.xml
trunk/examples/jms/message-priority/server0/jbm-jboss-beans.xml
trunk/examples/jms/no-consumer-buffering/server0/jbm-jboss-beans.xml
trunk/examples/jms/paging/server0/jbm-jboss-beans.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-jboss-beans.xml
trunk/examples/jms/producer-rate-limit/server0/jbm-jboss-beans.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-jboss-beans.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-jboss-beans.xml
trunk/examples/jms/queue-requestor/server0/jbm-jboss-beans.xml
trunk/examples/jms/queue-selector/server0/jbm-jboss-beans.xml
trunk/examples/jms/queue/server0/jbm-jboss-beans.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-jboss-beans.xml
trunk/examples/jms/request-reply/server0/jbm-jboss-beans.xml
trunk/examples/jms/scheduled-message/server0/jbm-jboss-beans.xml
trunk/examples/jms/security/server0/jbm-jboss-beans.xml
trunk/examples/jms/ssl-enabled/server0/jbm-jboss-beans.xml
trunk/examples/jms/static-selector/server0/jbm-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-jboss-beans.xml
trunk/examples/jms/temp-queue/server0/jbm-jboss-beans.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-jboss-beans.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-jboss-beans.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-jboss-beans.xml
trunk/examples/jms/topic/server0/jbm-jboss-beans.xml
trunk/examples/jms/transactional/server0/jbm-jboss-beans.xml
trunk/examples/jms/xa-heuristic/server0/jbm-jboss-beans.xml
trunk/examples/jms/xa-receive/server0/jbm-jboss-beans.xml
trunk/examples/jms/xa-send/server0/jbm-jboss-beans.xml
trunk/examples/jms/xa-with-jta/server0/jbm-jboss-beans.xml
trunk/src/config/jboss-as/clustered/jbm-jms.xml
trunk/src/config/jboss-as/non-clustered/jbm-jms.xml
trunk/src/config/stand-alone/clustered/jbm-jboss-beans.xml
trunk/src/config/stand-alone/non-clustered/jbm-jboss-beans.xml
trunk/tests/jms-tests/config/jbm-jboss-beans.xml
Removed:
trunk/examples/jms/application-layer-failover/server0/jbm-standalone-beans.xml
trunk/examples/jms/application-layer-failover/server1/jbm-standalone-beans.xml
trunk/examples/jms/automatic-failover/server0/jbm-standalone-beans.xml
trunk/examples/jms/automatic-failover/server1/jbm-standalone-beans.xml
trunk/examples/jms/bridge/server0/jbm-standalone-beans.xml
trunk/examples/jms/bridge/server1/jbm-standalone-beans.xml
trunk/examples/jms/browser/server0/jbm-standalone-beans.xml
trunk/examples/jms/client-kickoff/server0/jbm-standalone-beans.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-standalone-beans.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-standalone-beans.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-standalone-beans.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-standalone-beans.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-standalone-beans.xml
trunk/examples/jms/clustered-queue/server0/jbm-standalone-beans.xml
trunk/examples/jms/clustered-queue/server1/jbm-standalone-beans.xml
trunk/examples/jms/clustered-topic/server0/jbm-standalone-beans.xml
trunk/examples/jms/clustered-topic/server1/jbm-standalone-beans.xml
trunk/examples/jms/consumer-rate-limit/server0/jbm-standalone-beans.xml
trunk/examples/jms/dead-letter/server0/jbm-standalone-beans.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-standalone-beans.xml
trunk/examples/jms/divert/server0/jbm-standalone-beans.xml
trunk/examples/jms/divert/server1/jbm-standalone-beans.xml
trunk/examples/jms/durable-subscription/server0/jbm-standalone-beans.xml
trunk/examples/jms/expiry/server0/jbm-standalone-beans.xml
trunk/examples/jms/http-transport/server0/jbm-standalone-beans.xml
trunk/examples/jms/instantiate-connection-factory/server0/jbm-standalone-beans.xml
trunk/examples/jms/interceptor/server0/jbm-standalone-beans.xml
trunk/examples/jms/jmx/server0/jbm-standalone-beans.xml
trunk/examples/jms/large-message/server0/jbm-standalone-beans.xml
trunk/examples/jms/last-value-queue/server0/jbm-standalone-beans.xml
trunk/examples/jms/management-notifications/server0/jbm-standalone-beans.xml
trunk/examples/jms/management/server0/jbm-standalone-beans.xml
trunk/examples/jms/message-counters/server0/jbm-standalone-beans.xml
trunk/examples/jms/message-group/server0/jbm-standalone-beans.xml
trunk/examples/jms/message-priority/server0/jbm-standalone-beans.xml
trunk/examples/jms/no-consumer-buffering/server0/jbm-standalone-beans.xml
trunk/examples/jms/paging/server0/jbm-standalone-beans.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml
trunk/examples/jms/producer-rate-limit/server0/jbm-standalone-beans.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-standalone-beans.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-standalone-beans.xml
trunk/examples/jms/queue-requestor/server0/jbm-standalone-beans.xml
trunk/examples/jms/queue-selector/server0/jbm-standalone-beans.xml
trunk/examples/jms/queue/server0/jbm-standalone-beans.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-standalone-beans.xml
trunk/examples/jms/request-reply/server0/jbm-standalone-beans.xml
trunk/examples/jms/scheduled-message/server0/jbm-standalone-beans.xml
trunk/examples/jms/security/server0/jbm-standalone-beans.xml
trunk/examples/jms/ssl-enabled/server0/jbm-standalone-beans.xml
trunk/examples/jms/static-selector/server0/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml
trunk/examples/jms/temp-queue/server0/jbm-standalone-beans.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-standalone-beans.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-standalone-beans.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-standalone-beans.xml
trunk/examples/jms/topic/server0/jbm-standalone-beans.xml
trunk/examples/jms/transactional/server0/jbm-standalone-beans.xml
trunk/examples/jms/xa-heuristic/server0/jbm-standalone-beans.xml
trunk/examples/jms/xa-receive/server0/jbm-standalone-beans.xml
trunk/examples/jms/xa-send/server0/jbm-standalone-beans.xml
trunk/examples/jms/xa-with-jta/server0/jbm-standalone-beans.xml
trunk/src/bin/run
trunk/src/bin/runclient
trunk/src/bin/runcolocated
trunk/src/bin/runexample
trunk/src/bin/runmain
trunk/src/bin/runserver
trunk/src/bin/stressruntest
trunk/src/config/stand-alone/clustered/jbm-queues.xml
trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml
trunk/src/config/stand-alone/non-clustered/jbm-queues.xml
trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml
trunk/tests/jms-tests/config/jbm-standalone-beans.xml
Modified:
trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml
trunk/examples/javaee/hajndi/config/jbm-jms.xml
trunk/examples/javaee/jca-config/server-config/jbm-jms.xml
trunk/examples/javaee/jms-bridge/config/jbm-jms.xml
trunk/examples/javaee/mdb/config/jbm-jms.xml
trunk/examples/javaee/xarecovery/config/jbm-jms.xml
trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml
trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml
trunk/examples/jms/automatic-failover/server0/jbm-jms.xml
trunk/examples/jms/automatic-failover/server1/jbm-jms.xml
trunk/examples/jms/bridge/server0/jbm-jms.xml
trunk/examples/jms/bridge/server1/jbm-jms.xml
trunk/examples/jms/browser/server0/jbm-jms.xml
trunk/examples/jms/client-kickoff/server0/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml
trunk/examples/jms/clustered-queue/server0/jbm-jms.xml
trunk/examples/jms/clustered-queue/server1/jbm-jms.xml
trunk/examples/jms/clustered-topic/server0/jbm-jms.xml
trunk/examples/jms/clustered-topic/server1/jbm-jms.xml
trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java
trunk/examples/jms/dead-letter/server0/jbm-jms.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml
trunk/examples/jms/durable-subscription/server0/jbm-jms.xml
trunk/examples/jms/expiry/server0/jbm-jms.xml
trunk/examples/jms/http-transport/server0/jbm-jms.xml
trunk/examples/jms/interceptor/server0/jbm-jms.xml
trunk/examples/jms/jmx/server0/jbm-jms.xml
trunk/examples/jms/large-message/server0/jbm-jms.xml
trunk/examples/jms/last-value-queue/server0/jbm-jms.xml
trunk/examples/jms/management-notifications/server0/jbm-jms.xml
trunk/examples/jms/management/server0/jbm-jms.xml
trunk/examples/jms/message-counters/server0/jbm-jms.xml
trunk/examples/jms/message-group/server0/jbm-jms.xml
trunk/examples/jms/message-priority/server0/jbm-jms.xml
trunk/examples/jms/paging/server0/jbm-jms.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml
trunk/examples/jms/queue-requestor/server0/jbm-jms.xml
trunk/examples/jms/queue-selector/server0/jbm-jms.xml
trunk/examples/jms/queue/server0/jbm-jms.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
trunk/examples/jms/request-reply/server0/jbm-jms.xml
trunk/examples/jms/scheduled-message/server0/jbm-jms.xml
trunk/examples/jms/security/readme.html
trunk/examples/jms/security/server0/jbm-jms.xml
trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml
trunk/examples/jms/static-selector/server0/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml
trunk/examples/jms/temp-queue/server0/jbm-jms.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml
trunk/examples/jms/topic/server0/jbm-jms.xml
trunk/examples/jms/transactional/server0/jbm-jms.xml
trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml
trunk/examples/jms/xa-receive/server0/jbm-jms.xml
trunk/examples/jms/xa-send/server0/jbm-jms.xml
trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml
trunk/src/bin/run.bat
trunk/src/bin/run.sh
trunk/src/config/jboss-as/clustered/jbm-configuration.xml
trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
trunk/src/config/stand-alone/clustered/jbm-configuration.xml
trunk/src/config/stand-alone/clustered/jbm-jms.xml
trunk/src/config/stand-alone/clustered/jbm-users.xml
trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
trunk/src/config/stand-alone/non-clustered/jbm-users.xml
Log:
config cleanup
Modified: trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,10 +6,7 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
</entries>
</connection-factory>
Modified: trunk/examples/javaee/hajndi/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/hajndi/config/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/javaee/hajndi/config/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,10 +6,7 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
</entries>
</connection-factory>
</deployment>
\ No newline at end of file
Modified: trunk/examples/javaee/jca-config/server-config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/jca-config/server-config/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/javaee/jca-config/server-config/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -5,10 +5,7 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
</entries>
</connection-factory>
Modified: trunk/examples/javaee/jms-bridge/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/config/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/javaee/jms-bridge/config/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,10 +6,7 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
</entries>
</connection-factory>
Modified: trunk/examples/javaee/mdb/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/mdb/config/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/javaee/mdb/config/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,10 +6,7 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
</entries>
</connection-factory>
Modified: trunk/examples/javaee/xarecovery/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/xarecovery/config/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/javaee/xarecovery/config/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,10 +6,7 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
</entries>
</connection-factory>
Copied: trunk/examples/jms/application-layer-failover/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/application-layer-failover/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/application-layer-failover/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/application-layer-failover/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/application-layer-failover/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/application-layer-failover/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/automatic-failover/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/automatic-failover/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/automatic-failover/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/automatic-failover/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/automatic-failover/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/automatic-failover/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/automatic-failover/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/automatic-failover/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/automatic-failover/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/automatic-failover/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/automatic-failover/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/automatic-failover/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/automatic-failover/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/automatic-failover/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/bridge/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/bridge/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/bridge/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/bridge/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/bridge/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/bridge/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/bridge/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/bridge/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/bridge/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/bridge/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/bridge/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/bridge/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/bridge/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/bridge/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/browser/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/browser/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/browser/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/browser/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Property changes on: trunk/examples/jms/browser/server0/jbm-jboss-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/examples/jms/browser/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/browser/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/browser/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/browser/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/client-kickoff/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/client-kickoff/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/client-kickoff/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/client-kickoff/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/client-kickoff/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/client-kickoff/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/client-kickoff/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/client-side-load-balancing/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/client-side-load-balancing/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/client-side-load-balancing/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/client-side-load-balancing/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/client-side-load-balancing/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/client-side-load-balancing/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/client-side-load-balancing/server2/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/client-side-load-balancing/server2/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">3099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">3098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/client-side-load-balancing/server2/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">3099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">3098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/clustered-durable-subscription/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/clustered-durable-subscription/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/clustered-durable-subscription/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/clustered-durable-subscription/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/clustered-durable-subscription/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/clustered-durable-subscription/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/clustered-queue/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/clustered-queue/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/clustered-queue/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/clustered-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-queue/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/clustered-queue/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-queue/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/clustered-queue/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/clustered-queue/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/clustered-queue/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/clustered-queue/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-queue/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/clustered-queue/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-queue/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/clustered-topic/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/clustered-topic/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/clustered-topic/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/clustered-topic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-topic/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/clustered-topic/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-topic/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/clustered-topic/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/clustered-topic/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/clustered-topic/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/clustered-topic/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-topic/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/clustered-topic/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/clustered-topic/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Modified: trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java
===================================================================
--- trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java 2009-05-12 16:06:44 UTC (rev 6744)
@@ -21,15 +21,14 @@
*/
package org.jboss.jms.example;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.naming.InitialContext;
import java.io.File;
import java.io.FileInputStream;
import java.util.Properties;
import java.util.logging.Logger;
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.naming.InitialContext;
-
/**
* a baee class for examples. This takes care of starting and stopping the server as well as deploying any queue needed.
*
@@ -189,7 +188,7 @@
"STARTED::",
"FAILED::",
config,
- "jbm-standalone-beans.xml");
+ "jbm-jboss-beans.xml");
}
private void startServers() throws Exception
Copied: trunk/examples/jms/consumer-rate-limit/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/consumer-rate-limit/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Deleted: trunk/examples/jms/consumer-rate-limit/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/dead-letter/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/dead-letter/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/dead-letter/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/dead-letter/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/dead-letter/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/dead-letter/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/dead-letter/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/delayed-redelivery/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/delayed-redelivery/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/delayed-redelivery/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/divert/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/divert/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/divert/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/divert/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Deleted: trunk/examples/jms/divert/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/divert/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/divert/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/divert/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/divert/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/divert/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Deleted: trunk/examples/jms/divert/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/divert/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/durable-subscription/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/durable-subscription/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/durable-subscription/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/durable-subscription/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/durable-subscription/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/durable-subscription/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/durable-subscription/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/expiry/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/expiry/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/expiry/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/expiry/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/expiry/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/expiry/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/expiry/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/http-transport/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/http-transport/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/http-transport/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/http-transport/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/http-transport/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/http-transport/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/http-transport/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/instantiate-connection-factory/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/instantiate-connection-factory/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Deleted: trunk/examples/jms/instantiate-connection-factory/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/interceptor/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/interceptor/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/interceptor/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/interceptor/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/interceptor/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/interceptor/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/interceptor/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/jmx/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/jmx/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/jmx/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/jmx/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/jmx/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/jmx/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/jmx/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/large-message/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/large-message/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/large-message/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/large-message/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/large-message/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/large-message/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/large-message/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/last-value-queue/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/last-value-queue/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/last-value-queue/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/last-value-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/last-value-queue/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/last-value-queue/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/last-value-queue/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/management/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/management/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/management/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/management/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/management/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/management/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/management/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/management/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/management-notifications/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/management-notifications/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/management-notifications/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/management-notifications/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/management-notifications/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/management-notifications/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/management-notifications/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/message-counters/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/message-counters/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/message-counters/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/message-counters/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/message-counters/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/message-counters/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/message-counters/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/message-group/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/message-group/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/message-group/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/message-group/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/message-group/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/message-group/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/message-group/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/message-priority/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/message-priority/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/message-priority/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/message-priority/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/message-priority/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/message-priority/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/message-priority/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/no-consumer-buffering/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/no-consumer-buffering/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Deleted: trunk/examples/jms/no-consumer-buffering/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/paging/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/paging/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/paging/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/paging/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/paging/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/paging/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/paging/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/paging/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/pre-acknowledge/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Deleted: trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/producer-rate-limit/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/producer-rate-limit/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Deleted: trunk/examples/jms/producer-rate-limit/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/queue/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/queue/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/queue/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/queue/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/queue/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/queue-message-redistribution/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/queue-message-redistribution/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/queue-message-redistribution/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
Copied: trunk/examples/jms/queue-message-redistribution/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/queue-message-redistribution/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/queue-message-redistribution/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/queue-requestor/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/queue-requestor/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/queue-requestor/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/queue-requestor/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue-requestor/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/queue-requestor/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue-requestor/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/queue-selector/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/queue-selector/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/queue-selector/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/queue-selector/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue-selector/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/queue-selector/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/queue-selector/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/reconnect-same-node/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/reconnect-same-node/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -8,9 +8,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
<!-- Pause 1 second between connect attempts -->
Deleted: trunk/examples/jms/reconnect-same-node/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/request-reply/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/request-reply/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/request-reply/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/request-reply/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/request-reply/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/request-reply/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/request-reply/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/scheduled-message/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/scheduled-message/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/scheduled-message/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/scheduled-message/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/scheduled-message/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/scheduled-message/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/scheduled-message/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Modified: trunk/examples/jms/security/readme.html
===================================================================
--- trunk/examples/jms/security/readme.html 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/security/readme.html 2009-05-12 16:06:44 UTC (rev 6744)
@@ -104,7 +104,7 @@
jms.topic.news.europe.#' wild-cards, and topic 'news.us.usTopic' matches 'jms.topic.news.us.#'.</p>
<p>With JBoss Messaging, the security manager is also configurable. You can use JAASSecurityManager or JBossASSecurityManager based on you need. Please
- check out the jbm-standalone-beans.xml for how to do. In this example we just use the basic JBMSecurityManagerImpl which reads users/roles/passwords from the xml
+ check out the jbm-jboss-beans.xml for how to do. In this example we just use the basic JBMSecurityManagerImpl which reads users/roles/passwords from the xml
file <code>jbm-users.xml</code>.
<br>
Copied: trunk/examples/jms/security/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/security/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/security/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/security/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/security/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/security/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -8,9 +8,6 @@
<send-np-messages-synchronously>true</send-np-messages-synchronously>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/security/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/security/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/ssl-enabled/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/ssl-enabled/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-ssl-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/ssl-enabled/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/static-selector/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/static-selector/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/static-selector/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/static-selector/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/static-selector/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/static-selector/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/static-selector/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/symmetric-cluster/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
\ No newline at end of file
Modified: trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -8,9 +8,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
\ No newline at end of file
Copied: trunk/examples/jms/symmetric-cluster/server1/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">2099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">2098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -8,9 +8,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">2099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">2098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: trunk/examples/jms/symmetric-cluster/server2/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">3099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">3098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -8,9 +8,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">3099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">3098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: trunk/examples/jms/symmetric-cluster/server3/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">4099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">4098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
\ No newline at end of file
Modified: trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -8,9 +8,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">4099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">4098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
\ No newline at end of file
Copied: trunk/examples/jms/symmetric-cluster/server4/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">5099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">5098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -8,9 +8,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">5099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">5098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: trunk/examples/jms/symmetric-cluster/server5/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?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">6099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">6098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -8,9 +8,6 @@
<discovery-group-ref discovery-group-name="my-discovery-group"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">6099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">6098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: trunk/examples/jms/temp-queue/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/temp-queue/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/temp-queue/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/temp-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/temp-queue/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/temp-queue/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/temp-queue/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/topic/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/topic/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/topic/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/topic/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/topic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/topic/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/topic/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/topic/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/topic-hierarchies/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/topic-hierarchies/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/topic-hierarchies/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/topic-selector-example1/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/topic-selector-example1/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/topic-selector-example1/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/topic-selector-example2/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/topic-selector-example2/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/topic-selector-example2/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/transactional/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/transactional/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/transactional/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/transactional/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/transactional/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,9 +6,6 @@
<connector-ref connector-name="netty-connector"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/transactional/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/transactional/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/xa-heuristic/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/xa-heuristic/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -5,10 +5,7 @@
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
<entries>
- <entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/xa-heuristic/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/xa-receive/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/xa-receive/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/xa-receive/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/xa-receive/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/xa-receive/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -5,10 +5,7 @@
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
<entries>
- <entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/xa-receive/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/xa-receive/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/xa-send/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/xa-send/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/xa-send/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/xa-send/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/xa-send/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -5,10 +5,7 @@
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
<entries>
- <entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/xa-send/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/xa-send/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/examples/jms/xa-with-jta/server0/jbm-jboss-beans.xml (from rev 6737, trunk/examples/jms/xa-with-jta/server0/jbm-standalone-beans.xml)
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-jboss-beans.xml (rev 0)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Modified: trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -5,10 +5,7 @@
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
<entries>
- <entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
Deleted: trunk/examples/jms/xa-with-jta/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Deleted: trunk/src/bin/run
===================================================================
--- trunk/src/bin/run 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/run 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# bash script for running various JBoss Messaging command line tools
-#
-#
-
-reldir=`dirname $0`
-
-JGROUPS_LIB=$reldir/../../../thirdparty/javagroups-javagroups/lib/jgroups.jar
-#JGROUPS_LIB=$reldir/../resources/jgroups-core.jar
-
-CLESTER_HOME=/work/clester/dist
-
-TARGET_CLASS=org.jboss.messaging.core.tools.ReplicatorClient
-TARGET_CLASS=org.jboss.messaging.jms.tools.InteractiveJMSClient
-
-cygwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-esac
-
-if [ $cygwin = true ]; then
- SEP=";"
-else
- SEP=":"
-fi
-
-#for i in `ls $JBOSS_HOME/client/*.jar`; do
-# JBOSS_CLASSPATH=$i${SEP}$JBOSS_CLASSPATH
-#done
-
-while [ "$1" != "" ]; do
- if [ "$1" = "-debug" ]; then
- if [ $cygwin = false ]; then
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=12348"
- else
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=mess"
- fi
- fi
- shift
-done
-
-
-java $JAVA_OPTS -cp \
-$reldir/../../src/etc${SEP}\
-$reldir/../../output/classes${SEP}\
-$reldir/../../../thirdparty/apache-log4j/lib/log4j.jar${SEP}\
-$reldir/../../../thirdparty/apache-commons/lib/commons-logging.jar${SEP}\
-$reldir/../../../thirdparty/oswego-concurrent/lib/concurrent.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-common.jar${SEP}\
-$reldir/../../../j2ee/output/lib/jboss-j2ee.jar${SEP}\
-$reldir/../../../aop/output/lib/jboss-aop.jar${SEP}\
-${JGROUPS_LIB}${SEP}\
-${CLESTER_HOME}/clester.jar \
-org.clester.Main $TARGET_CLASS
-
Modified: trunk/src/bin/run.bat
===================================================================
--- trunk/src/bin/run.bat 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/run.bat 2009-05-12 16:06:44 UTC (rev 6744)
@@ -10,9 +10,9 @@
)
echo ***********************************************************************************
-echo "java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-standalone-beans.xml"
+echo "java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-jboss-beans.xml"
echo ***********************************************************************************
-java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-standalone-beans.xml
+java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-jboss-beans.xml
Modified: trunk/src/bin/run.sh
===================================================================
--- trunk/src/bin/run.sh 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/run.sh 2009-05-12 16:06:44 UTC (rev 6744)
@@ -3,7 +3,7 @@
# By default, the server is started in the non-clustered standalone configuration
if [ a"$1" = a ]; then CONFIG_DIR=$JBM_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1"; fi
-if [ a"$2" = a ]; then FILENAME=jbm-standalone-beans.xml; else FILENAME="$2"; fi
+if [ a"$2" = a ]; then FILENAME=jbm-jboss-beans.xml; else FILENAME="$2"; fi
export CLASSPATH=$CONFIG_DIR:$JBM_HOME/schemas/
export JVM_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.util.logging.config.file=$CONFIG_DIR/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=."
Deleted: trunk/src/bin/runclient
===================================================================
--- trunk/src/bin/runclient 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/runclient 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# Interactive command line JMS client.
-#
-
-reldir=`dirname $0`
-
-#REMOTING_LIB=$reldir/../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar
-REMOTING_LIB=$reldir/../resources/jboss-remoting.jar
-
-cygwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-esac
-
-if [ $cygwin = true ]; then
- SEP=";"
-else
- SEP=":"
-fi
-
-while [ "$1" != "" ]; do
- if [ "$1" = "-debug" ]; then
- if [ $cygwin = false ]; then
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=12348"
- else
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=jmsclient"
- fi
- fi
- shift
-done
-
-java $JAVA_OPTS -cp \
-$reldir/../../src/etc${SEP}\
-$reldir/../../output/classes${SEP}\
-$reldir/../../src/resources/clester.jar${SEP}\
-${REMOTING_LIB}${SEP}\
-$reldir/../../../j2ee/output/lib/jboss-j2ee.jar${SEP}\
-$reldir/../../../j2se/output/lib/jboss-j2se.jar${SEP}\
-$reldir/../../../naming/output/lib/jnp-client.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-common.jar${SEP}\
-$reldir/../../../aop/output/lib/jboss-aop.jar${SEP}\
-$reldir/../../../server/output/lib/jboss.jar${SEP}\
-$reldir/../../../aspects/output/lib/jboss-aspect-library.jar${SEP}\
-$reldir/../../../thirdparty/oswego-concurrent/lib/concurrent.jar${SEP}\
-$reldir/../../../thirdparty/apache-commons/lib/commons-httpclient.jar${SEP}\
-$reldir/../../../thirdparty/apache-log4j/lib/log4j.jar \
-org.clester.Main org.jboss.test.messaging.tools.client.Client
-
-
-
-
-
Deleted: trunk/src/bin/runcolocated
===================================================================
--- trunk/src/bin/runcolocated 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/runcolocated 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# Interactive command line JMS client.
-#
-
-reldir=`dirname $0`
-
-#REMOTING_LIB=$reldir/../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar
-REMOTING_LIB=$reldir/../resources/jboss-remoting.jar
-
-
-cygwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-esac
-
-if [ $cygwin = true ]; then
- SEP=";"
-else
- SEP=":"
-fi
-
-while [ "$1" != "" ]; do
- if [ "$1" = "-debug" ]; then
- if [ $cygwin = false ]; then
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=12348"
- else
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=colocated"
- fi
- fi
- shift
-done
-
-java $JAVA_OPTS -cp \
-$reldir/../../src/etc${SEP}\
-$reldir/../../output/classes${SEP}\
-$reldir/../../src/resources/clester.jar${SEP}\
-${REMOTING_LIB}${SEP}\
-$reldir/../../../j2ee/output/lib/jboss-j2ee.jar${SEP}\
-$reldir/../../../j2se/output/lib/jboss-j2se.jar${SEP}\
-$reldir/../../../jmx/output/lib/jboss-jmx.jar${SEP}\
-$reldir/../../../mbeans/output/lib/jboss-mbeans.jar${SEP}\
-$reldir/../../../naming/output/lib/jnp-client.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-common.jar${SEP}\
-$reldir/../../../aop/output/lib/jboss-aop.jar${SEP}\
-$reldir/../../../aspects/output/lib/jboss-aspect-library.jar${SEP}\
-$reldir/../../../thirdparty/oswego-concurrent/lib/concurrent.jar${SEP}\
-$reldir/../../../thirdparty/apache-commons/lib/commons-httpclient.jar${SEP}\
-$reldir/../../../thirdparty/javassist/lib/javassist.jar${SEP}\
-$reldir/../../../thirdparty/trove/lib/trove.jar${SEP}\
-$reldir/../../../thirdparty/dom4j-dom4j/lib/dom4j.jar${SEP}\
-$reldir/../../../thirdparty/sun-servlet/lib/servlet-api.jar${SEP}\
-$reldir/../../../system/output/lib/jboss-system.jar${SEP}\
-$reldir/../../../transaction/output/lib/jboss-transaction.jar${SEP}\
-$reldir/../../../thirdparty/apache-log4j/lib/log4j.jar \
-org.clester.Main org.jboss.test.messaging.tools.client.Colocated
-
-
-
-
-
Deleted: trunk/src/bin/runexample
===================================================================
--- trunk/src/bin/runexample 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/runexample 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-#
-# The classpath builder for org.jboss.messaging.tools.jmx.Example
-#
-
-reldir=`dirname $0`
-
-#REMOTING_LIB=$reldir/../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar
-REMOTING_LIB=$reldir/../resources/jboss-remoting.jar
-
-cygwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-esac
-
-if [ $cygwin = true ]; then
- SEP=";"
-else
- SEP=":"
-fi
-
-#for i in `ls $JBOSS_HOME/client/*.jar`; do
-# JBOSS_CLASSPATH=$i${SEP}$JBOSS_CLASSPATH
-#done
-
-while [ "$1" != "" ]; do
- if [ "$1" = "-debug" ]; then
- if [ $cygwin = false ]; then
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=12348"
- else
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=unittest"
- fi
- fi
- shift
-done
-
-java $JAVA_OPTS -cp \
-$reldir/../../tests/etc${SEP}\
-$reldir/../../src/etc${SEP}\
-$reldir/../../tests/output/classes${SEP}\
-$reldir/../../output/classes${SEP}\
-${REMOTING_LIB}${SEP}\
-$reldir/../../../j2ee/output/lib/jboss-j2ee.jar${SEP}\
-$reldir/../../../j2se/output/lib/jboss-j2se.jar${SEP}\
-$reldir/../../../jmx/output/lib/jboss-jmx.jar${SEP}\
-$reldir/../../../mbeans/output/lib/jboss-mbeans.jar${SEP}\
-$reldir/../../../aop/output/lib/jboss-aop.jar${SEP}\
-$reldir/../../../thirdparty/apache-log4j/lib/log4j.jar${SEP}\
-$reldir/../../../thirdparty/apache-commons/lib/commons-logging.jar${SEP}\
-$reldir/../../../thirdparty/junit-junit/lib/junit.jar${SEP}\
-$reldir/../../../thirdparty/oswego-concurrent/lib/concurrent.jar${SEP}\
-$reldir/../../../thirdparty/javassist/lib/javassist.jar${SEP}\
-$reldir/../../../thirdparty/trove/lib/trove.jar${SEP}\
-$reldir/../../../thirdparty/apache-commons/lib/commons-httpclient.jar${SEP}\
-$reldir/../../../thirdparty/dom4j-dom4j/lib/dom4j.jar${SEP}\
-$reldir/../../../thirdparty/sun-servlet/lib/servlet-api.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-common.jar${SEP}\
-$reldir/../../../system/output/lib/jboss-system.jar${SEP}\
-$reldir/../../../transaction/output/lib/jboss-transaction.jar${SEP}\
-$reldir/../../src/resources/hsqldb.jar${SEP}\
-$reldir/../../../server/output/lib/jboss.jar${SEP}\
-$reldir/../../../connector/output/lib/jboss-common-jdbc-wrapper.jar${SEP}\
-$reldir/../../../connector/output/lib/jboss-local-jdbc.jar${SEP}\
-$reldir/../../../connector/output/lib/jboss-jca.jar${SEP}\
- org.jboss.messaging.tools.jmx.Example
Deleted: trunk/src/bin/runmain
===================================================================
--- trunk/src/bin/runmain 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/runmain 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# bash script for running various JBoss Messaging command line tools
-#
-#
-
-reldir=`dirname $0`
-
-JGROUPS_LIB=$reldir/../../../thirdparty/javagroups-javagroups/lib/jgroups.jar
-#JGROUPS_LIB=$reldir/../resources/jgroups-core.jar
-
-CLESTER_HOME=/work/clester/dist
-
-TARGET_CLASS=org.jboss.messaging.jms.tools.JMSClient
-
-cygwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-esac
-
-if [ $cygwin = true ]; then
- SEP=";"
-else
- SEP=":"
-fi
-
-#for i in `ls $JBOSS_HOME/client/*.jar`; do
-# JBOSS_CLASSPATH=$i${SEP}$JBOSS_CLASSPATH
-#done
-
-while [ "$1" != "" ]; do
- if [ "$1" = "-debug" ]; then
- if [ $cygwin = false ]; then
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=12348"
- else
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=mess"
- fi
- fi
- shift
-done
-
-java $JAVA_OPTS -cp \
-$reldir/../../src/etc${SEP}\
-$reldir/../../output/classes${SEP}\
-$reldir/../../../thirdparty/apache-log4j/lib/log4j.jar${SEP}\
-$reldir/../../../thirdparty/apache-commons/lib/commons-logging.jar${SEP}\
-$reldir/../../../thirdparty/oswego-concurrent/lib/concurrent.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-common.jar${SEP}\
-$reldir/../../../j2ee/output/lib/jboss-j2ee.jar${SEP}\
-$reldir/../../../aop/output/lib/jboss-aop.jar${SEP}\
-${JGROUPS_LIB}${SEP}\
-
-$TARGET_CLASS
-
Deleted: trunk/src/bin/runserver
===================================================================
--- trunk/src/bin/runserver 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/runserver 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Server bootstrap script.
-#
-
-reldir=`dirname $0`
-
-JGROUPS_LIB=$reldir/../../../thirdparty/javagroups-javagroups/lib/jgroups.jar
-#JGROUPS_LIB=$reldir/../resources/jgroups-core.jar
-
-
-cygwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-esac
-
-if [ $cygwin = true ]; then
- SEP=";"
-else
- SEP=":"
-fi
-
-while [ "$1" != "" ]; do
- if [ "$1" = "-debug" ]; then
- if [ $cygwin = false ]; then
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=12348"
- else
- JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=jmsserver"
- fi
- fi
- shift
-done
-
-java $JAVA_OPTS -cp \
-$reldir/../../src/etc${SEP}\
-$reldir/../../output/classes${SEP}\
-$reldir/../../src/resources/clester.jar${SEP}\
-$reldir/../../../aop/output/lib/jboss-aop.jar${SEP}\
-$reldir/../../../aspects/output/lib/jboss-aspect-library.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-common.jar${SEP}\
-$reldir/../../../j2ee/output/lib/jboss-j2ee.jar${SEP}\
-$reldir/../../../j2se/output/lib/jboss-j2se.jar${SEP}\
-$reldir/../../../naming/output/lib/jnp-client.jar${SEP}\
-$reldir/../../../thirdparty/javassist/lib/javassist.jar${SEP}\
-$reldir/../../../thirdparty/trove/lib/trove.jar${SEP}\
-$reldir/../../../thirdparty/oswego-concurrent/lib/concurrent.jar${SEP}\
-$reldir/../../../thirdparty/apache-commons/lib/commons-httpclient.jar${SEP}\
-${JGROUPS_LIB}${SEP}\
-$reldir/../../../thirdparty/apache-log4j/lib/log4j.jar \
-org.clester.Main org.jboss.jms.tools.ServerWrapper
-
-
Deleted: trunk/src/bin/stressruntest
===================================================================
--- trunk/src/bin/stressruntest 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/bin/stressruntest 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-while ./runtest; do
- echo "SUCCESS"
-done
Modified: trunk/src/config/jboss-as/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,75 +1,30 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+<configuration xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
<clustered>true</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
-
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
-
- <management-address>admin.management</management-address>
- <management-notification-address>admin.notification</management-notification-address>
-
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
-
- <!-- by default, message counter is disabled -->
- <message-counter-enabled>false</message-counter-enabled>
-
- <connection-scan-period>10000</connection-scan-period>
-
- <!--how long before timing a transaction out-->
- <transaction-timeout>60000</transaction-timeout>
- <!--how often to scan for timedout transactions-->
- <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
-
- <!-- how often do we scan the queues for expired messages-->
- <message-expiry-scan-period>30000</message-expiry-scan-period>
- <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
- <message-expiry-thread-priority>3</message-expiry-thread-priority>
-
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
- <queue-activation-timeout>30000</queue-activation-timeout>
-
- <backup>false</backup>
-
<!-- Connectors -->
<connectors>
+ <connector name="netty-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-connector">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
<param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
</connector>
-
- <!-- <connector name="netty-connector-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.ssl.port}" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector> -->
-
<connector name="in-vm-connector">
<factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
-
</connectors>
<!-- Acceptors -->
<acceptors>
<!-- In VM acceptor -->
- <acceptor name="in-vm-acceptor">
+ <acceptor name="in-vm-acceptor">
<factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
<param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
</acceptor>
@@ -80,17 +35,8 @@
<param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
<param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
</acceptor>
-
- <!-- Netty In VM Acceptor -->
- <!--
- <acceptor name="netty-invm">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>
- -->
</acceptors>
-
+
<!-- Clustering configuration -->
<broadcast-groups>
<broadcast-group name="my-broadcast-group">
@@ -100,7 +46,7 @@
<connector-ref connector-name="netty-connector"/>
</broadcast-group>
</broadcast-groups>
-
+
<discovery-groups>
<discovery-group name="my-discovery-group">
<group-address>231.7.7.7</group-address>
@@ -108,7 +54,7 @@
<refresh-timeout>10000</refresh-timeout>
</discovery-group>
</discovery-groups>
-
+
<cluster-connections>
<cluster-connection name="my-cluster">
<address>jms</address>
@@ -120,50 +66,27 @@
</cluster-connection>
</cluster-connections>
-
- <!-- Large Messages configuration -->
-
- <large-messages-directory>${jboss.server.data.dir}/messaging/largemessages</large-messages-directory>
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>${jboss.server.data.dir}/messsaging/paging</paging-directory>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
- <bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
-
- <create-bindings-dir>true</create-bindings-dir>
-
- <journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
-
- <create-journal-dir>true</create-journal-dir>
-
- <journal-type>ASYNCIO</journal-type>
-
- <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
- Set this to -1 to disable this feature -->
- <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
-
- <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
- <journal-sync-transactional>true</journal-sync-transactional>
-
- <!-- Does the journal sync to disk for every non transactional persistent operation? -->
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
-
- <!-- 10 MB journal file size -->
- <journal-file-size>10485760</journal-file-size>
-
- <journal-min-files>15</journal-min-files>
-
- <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
- (parameter ignored on NIO)
- You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
- -->
- <journal-max-aio>10000</journal-max-aio>
-
</configuration>
Copied: trunk/src/config/jboss-as/clustered/jbm-jms.xml (from rev 6737, trunk/src/config/stand-alone/clustered/jbm-jms.xml)
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-jms.xml (rev 0)
+++ trunk/src/config/jboss-as/clustered/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,30 @@
+<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="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ </entries>j
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactory">
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+
+</deployment>
\ No newline at end of file
Modified: trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,55 +1,7 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <clustered>false</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
+<configuration xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
-
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
-
- <management-address>jbm.management</management-address>
- <management-notification-address>jbm.notifications</management-notification-address>
-
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
-
- <!-- by default, message counter is disabled -->
- <message-counter-enabled>false</message-counter-enabled>
-
- <connection-scan-period>10000</connection-scan-period>
-
- <!--how long before timing a transaction out-->
- <transaction-timeout>60000</transaction-timeout>
- <!--how often to scan for timedout transactions-->
- <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
-
- <!-- how often do we scan the queues for expired messages-->
- <message-expiry-scan-period>30000</message-expiry-scan-period>
- <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
- <message-expiry-thread-priority>3</message-expiry-thread-priority>
-
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
- <queue-activation-timeout>30000</queue-activation-timeout>
-
- <backup>false</backup>
-
- <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
-
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
-
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
@@ -57,13 +9,6 @@
<param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
<param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
</connector>
-
- <!-- <connector name="netty-connector-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.ssl.port}" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector> -->
<connector name="in-vm-connector">
<factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
@@ -74,7 +19,7 @@
<!-- Acceptors -->
<acceptors>
<!-- In VM acceptor -->
- <acceptor name="in-vm-acceptor">
+ <acceptor name="in-vm-acceptor">
<factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
<param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
</acceptor>
@@ -85,62 +30,30 @@
<param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
<param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
</acceptor>
-
- <!-- Netty In VM Acceptor -->
- <!--
- <acceptor name="netty-invm">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>
- -->
+
</acceptors>
-
- <!-- Large Messages configuration -->
-
- <large-messages-directory>${jboss.server.data.dir}/messaging/largemessages</large-messages-directory>
-
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>${jboss.server.data.dir}/messaging/paging</paging-directory>
-
- <paging-global-watermark-size>10485760</paging-global-watermark-size>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
- <bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <create-bindings-dir>true</create-bindings-dir>
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
- <journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
-
- <create-journal-dir>true</create-journal-dir>
-
- <journal-type>ASYNCIO</journal-type>
-
- <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
- Set this to -1 to disable this feature -->
- <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
-
- <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
- <journal-sync-transactional>true</journal-sync-transactional>
-
- <!-- Does the journal sync to disk for every non transactional persistent operation? -->
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
-
- <!-- 10 MB journal file size -->
- <journal-file-size>10485760</journal-file-size>
-
- <journal-min-files>15</journal-min-files>
-
- <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
- (parameter ignored on NIO)
- You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
- -->
- <journal-max-aio>10000</journal-max-aio>
-
</configuration>
Copied: trunk/src/config/jboss-as/non-clustered/jbm-jms.xml (from rev 6737, trunk/src/config/stand-alone/clustered/jbm-jms.xml)
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-jms.xml (rev 0)
+++ trunk/src/config/jboss-as/non-clustered/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,20 @@
+<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="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+
+</deployment>
\ No newline at end of file
Modified: trunk/src/config/stand-alone/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,91 +1,28 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+<configuration xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
<clustered>true</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
-
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
-
- <management-address>admin.management</management-address>
- <management-notification-address>admin.notification</management-notification-address>
-
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
-
- <!-- by default, message counter is disabled -->
- <message-counter-enabled>false</message-counter-enabled>
-
- <connection-scan-period>10000</connection-scan-period>
-
- <!--how long before timing a transaction out-->
- <transaction-timeout>60000</transaction-timeout>
- <!--how often to scan for timedout transactions-->
- <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
-
- <!-- how often do we scan the queues for expired messages-->
- <message-expiry-scan-period>30000</message-expiry-scan-period>
- <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
- <message-expiry-thread-priority>3</message-expiry-thread-priority>
-
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
- <queue-activation-timeout>30000</queue-activation-timeout>
-
- <backup>false</backup>
-
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
-
<!-- Connectors -->
<connectors>
<connector name="netty-backup">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="jbm.remoting.netty.host" value="localhost" type="String"/>
<param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
</connector>
-
<connector name="netty">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
</connector>
-
- <connector name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector>
-
- <connector name="netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
- <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
- </connector>
-
<connector name="in-vm">
<factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
</connectors>
-
+
<!-- Acceptors -->
<acceptors>
<!-- In VM acceptor -->
- <acceptor name="in-vm">
+ <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>
@@ -93,95 +30,49 @@
<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>-->
+ </acceptor>
</acceptors>
-
- <!-- Clustering configuration -->
+
+ <!-- Clustering configuration -->
<broadcast-groups>
<broadcast-group name="bg-group1">
- <local-bind-port>1234</local-bind-port>
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>5000</broadcast-period>
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ <local-bind-port>1234</local-bind-port>
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>5000</broadcast-period>
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
</broadcast-group>
</broadcast-groups>
-
+
<discovery-groups>
<discovery-group name="dg-group1">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
</discovery-group>
</discovery-groups>
-
- <!--
- <bridges>
- <bridge name="foo">
- <queue-name>toto</queue-name>
- <forwarding-address>blah</forwarding-address>
- <filter string="color > 1"/>
- <connector-ref connector-name="netty"/>
- </bridge>
- </bridges>
- -->
-
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>${jbm.data.dir}/paging</paging-directory>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
- <bindings-directory>${jbm.data.dir}/bindings</bindings-directory>
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <create-bindings-dir>true</create-bindings-dir>
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
- <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>
Copied: trunk/src/config/stand-alone/clustered/jbm-jboss-beans.xml (from rev 6737, trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml)
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-jboss-beans.xml (rev 0)
+++ trunk/src/config/stand-alone/clustered/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">${jnp.port}</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">${jnp.rmiPort}</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
+ </bean>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+
+</deployment>
\ No newline at end of file
Modified: trunk/src/config/stand-alone/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/clustered/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,10 +6,7 @@
<connector-ref connector-name="netty"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
</entries>
</connection-factory>
@@ -23,49 +20,6 @@
</entries>
</connection-factory>
- <!-- example connection factory -->
- <!-- <connection-factory name="MyExampleConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="/MyExampleConnectionFactory"/>
- <entry name="/acme/MyExampleConnectionFactoryDupe"/>
- <entry name="java:/xyz/CF1"/>
- <entry name="java:/connectionfactories/acme/connection_factory"/>
- </entries>
- <ping-period>5000</ping-period>
- <call-timeout>30000</call-timeout>
- --><!-- This is the window size in bytes to use when using consumer window based flow control --><!--
- <consumer-window-size>1048576</consumer-window-size>
- --><!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control --><!--
- <consumer-max-rate>5000</consumer-max-rate>
- --><!-- This is the send window size in bytes --><!--
- <producer-window-size>1048576</producer-window-size>
- --><!-- This is the maximum producer send rate that will be applied when using rate based producer flow control --><!--
- <producer-max-rate>100</producer-max-rate>
- --><!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets --><!--
- <min-large-message-size>10240</min-large-message-size>
- --><!-- You can specify the default Client ID to use for connections created using this factory --><!--
- <client-id>MyClientID</client-id>
- --><!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode --><!--
- <dups-ok-batch-size>1048576</dups-ok-batch-size>
- --><!-- The batch size in bytes to use when using transactional sessions --><!--
- <transaction-batch-size>1048576</transaction-batch-size>
- --><!--Whether or not we use a blocking call when acknowledging a message--><!--
- <block-on-acknowledge>false</block-on-acknowledge>
- --><!--Whether we send non persistent messages synchronously--><!--
- <send-np-messages-synchronously>true</send-np-messages-synchronously>
- --><!--Whether we send persistent messages synchronously--><!--
- <send-p-messages-synchronously>true</send-p-messages-synchronously>
- --><!--If true, any connections will automatically set a unique group id (per producer) on every message sent--><!--
- <auto-group-id>true</auto-group-id>
- --><!--if true then the server will pre ack any message before delivery to a consumer--><!--
- <pre-acknowledge>false</pre-acknowledge>
- </connection-factory>
--->
-
- <queue name="MyQueue">
- <entry name="MyQueue"/>
- </queue>
<queue name="DLQ">
<entry name="/queue/DLQ"/>
</queue>
Deleted: trunk/src/config/stand-alone/clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-queues.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/clustered/jbm-queues.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,68 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
-
- <security-settings>
- <!-- manangement address -->
- <security-setting match="jbm.management">
- <!-- only the admin role can interact with the management address -->
- <permission type="consume" roles="admin"/>
- <permission type="send" roles="admin"/>
- <permission type="manage" roles="admin"/>
- </security-setting>
-
- <!--example queue or topic configuration-->
- <!--<security-setting match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security-setting>-->
- <!--<security-setting match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security-setting>-->
-
- <!-- example temp queue or topic configuration -->
- <!--<security-setting match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
-
- <security-setting match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>-->
-
-
- <!--default security to catch all-->
- <security-setting match="#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
-
- </security-settings>
-
- <address-settings>
-
- <!--default for catch all-->
- <address-setting match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
-
- </address-settings>
-
-</configuration>
Deleted: trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/clustered/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">${jnp.port}</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">${jnp.rmiPort}</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
- </bean>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-
-</deployment>
\ No newline at end of file
Modified: trunk/src/config/stand-alone/clustered/jbm-users.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-users.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/clustered/jbm-users.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -4,7 +4,4 @@
<defaultuser name="guest" password="guest">
<role name="guest"/>
</defaultuser>
- <!--<user name="admin" password="admin">
- <role name="admin"/>
- </user>-->
</deployment>
\ No newline at end of file
Modified: trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,212 +1,55 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../schemas/jbm-configuration.xsd">
+<configuration xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../../../schemas/jbm-configuration.xsd">
- <clustered>false</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
+ <connector name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
+ </connectors>
- <management-address>jbm.management</management-address>
- <management-notification-address>jbm.notifications</management-notification-address>
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
+ <!-- Netty TCP Acceptor -->
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
- <!-- 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>
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!-- 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>
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
- <backup>false</backup>
-
- <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
-
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-backup">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
- </connector>
-
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </connector>
-
- <connector name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector>
- <connector name="netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
- <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
- </connector>
-
- <connector name="netty-servlet">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
- <param key="jbm.remoting.netty.useservlet" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.servletpath" value="/jms-servlet/JBMServlet" type="String"/>
- </connector>
-
- <connector name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
-
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <!-- In VM acceptor -->
- <acceptor name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
-
- <!-- Netty TCP Acceptor -->
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
-
- <!-- Netty Servlet Acceptor -->
- <!--
- <acceptor name="netty-servlet">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>
- -->
-
- <!-- Netty SSL Acceptor -->
- <!--
- <acceptor name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </acceptor>
- -->
-
- <!--Netty HTTP Acceptor-->
- <!--
- <acceptor name-"netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
- <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
- </acceptor>
-
- -->
- <!-- Netty In VM Acceptor, needed for the servlet transport-->
- <!--
- <acceptor name="netty-invm">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>
- -->
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <local-bind-port>1234</local-bind-port>
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>5000</broadcast-period>
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>data/paging</paging-directory>
-
- <paging-global-watermark-size>10485760</paging-global-watermark-size>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
-
- <bindings-directory>data/bindings</bindings-directory>
-
- <create-bindings-dir>true</create-bindings-dir>
-
- <journal-directory>data/journal</journal-directory>
-
- <create-journal-dir>true</create-journal-dir>
-
- <journal-type>ASYNCIO</journal-type>
-
- <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
- Set this to -1 to disable this feature -->
- <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
-
- <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
- <journal-sync-transactional>true</journal-sync-transactional>
-
- <!-- Does the journal sync to disk for every non transactional persistent operation? -->
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
-
- <!-- 10 MB journal file size -->
- <journal-file-size>10485760</journal-file-size>
-
- <journal-min-files>15</journal-min-files>
-
- <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
- (parameter ignored on NIO)
- You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
- -->
- <journal-max-aio>10000</journal-max-aio>
-
</configuration>
Copied: trunk/src/config/stand-alone/non-clustered/jbm-jboss-beans.xml (from rev 6737, trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml)
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-jboss-beans.xml (rev 0)
+++ trunk/src/config/stand-alone/non-clustered/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
+ </bean>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -6,59 +6,14 @@
<connector-ref connector-name="netty"/>
<entries>
<entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
</entries>
</connection-factory>
-
- <!-- example connection factory-->
- <!--<connection-factory name="MyExampleConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="/MyExampleConnectionFactory"/>
- <entry name="/acme/MyExampleConnectionFactoryDupe"/>
- <entry name="java:/xyz/CF1"/>
- <entry name="java:/connectionfactories/acme/connection_factory"/>
- </entries>
- <ping-period>5000</ping-period>
- <call-timeout>30000</call-timeout>
- --><!-- This is the window size in bytes to use when using consumer window based flow control --><!--
- <consumer-window-size>1048576</consumer-window-size>
- --><!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control --><!--
- <consumer-max-rate>5000</consumer-max-rate>
- --><!-- This is the send window size in bytes --><!--
- <producer-window-size>1048576</producer-window-size>
- --><!-- This is the maximum producer send rate that will be applied when using rate based producer flow control --><!--
- <producer-max-rate>100</producer-max-rate>
- --><!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets --><!--
- <min-large-message-size>10240</min-large-message-size>
- --><!-- You can specify the default Client ID to use for connections created using this factory --><!--
- <client-id>MyClientID</client-id>
- --><!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode --><!--
- <dups-ok-batch-size>1048576</dups-ok-batch-size>
- --><!-- The batch size in bytes to use when using transactional sessions --><!--
- <transaction-batch-size>1048576</transaction-batch-size>
- --><!--Whether or not we use a blocking call when acknowledging a message--><!--
- <block-on-acknowledge>false</block-on-acknowledge>
- --><!--Whether we send non persistent messages synchronously--><!--
- <send-np-messages-synchronously>true</send-np-messages-synchronously>
- --><!--Whether we send persistent messages synchronously--><!--
- <send-p-messages-synchronously>true</send-p-messages-synchronously>
- --><!--If true, any connections will automatically set a unique group id (per producer) on every message sent--><!--
- <auto-group-id>true</auto-group-id>
- --><!--if true then the server will pre ack any message before delivery to a consumer--><!--
- <pre-acknowledge>false</pre-acknowledge>
- </connection-factory>-->
-
- <queue name="MyQueue">
- <entry name="MyQueue"/>
- </queue>
<queue name="DLQ">
<entry name="/queue/DLQ"/>
</queue>
+
<queue name="ExpiryQueue">
<entry name="/queue/ExpiryQueue"/>
</queue>
Deleted: trunk/src/config/stand-alone/non-clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-queues.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/non-clustered/jbm-queues.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,66 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../../schemas/jbm-configuration.xsd ">
-
- <security-settings>
- <!-- management address -->
- <security-setting match="jbm.management">
- <!-- only the admin role can interact with the management address -->
- <permission type="consume" roles="admin"/>
- <permission type="send" roles="admin"/>
- <permission type="manage" roles="admin"/>
- </security-setting>
-
- <!--example queue or topic configuration-->
- <!--<security-setting match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security-setting>-->
- <!--<security-setting match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security-setting>-->
-
- <!-- example temp queue or topic configuration -->
- <!--<security-setting match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
-
- <security-setting match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>-->
-
- <!--default security to catch all-->
- <security-setting match="#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
- <address-settings>
-
- <!--default for catch all-->
- <address-setting match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
-
- </address-settings>
-
-</configuration>
Deleted: trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/non-clustered/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
- </bean>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
Modified: trunk/src/config/stand-alone/non-clustered/jbm-users.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-users.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/src/config/stand-alone/non-clustered/jbm-users.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -4,7 +4,4 @@
<defaultuser name="guest" password="guest">
<role name="guest"/>
</defaultuser>
- <!--<user name="admin" password="admin">
- <role name="admin"/>
- </user>-->
</deployment>
\ No newline at end of file
Copied: trunk/tests/jms-tests/config/jbm-jboss-beans.xml (from rev 6737, trunk/tests/jms-tests/config/jbm-standalone-beans.xml)
===================================================================
--- trunk/tests/jms-tests/config/jbm-jboss-beans.xml (rev 0)
+++ trunk/tests/jms-tests/config/jbm-jboss-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
+ </bean>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Property changes on: trunk/tests/jms-tests/config/jbm-jboss-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/tests/jms-tests/config/jbm-standalone-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-standalone-beans.xml 2009-05-12 15:24:30 UTC (rev 6743)
+++ trunk/tests/jms-tests/config/jbm-standalone-beans.xml 2009-05-12 16:06:44 UTC (rev 6744)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
-
- <!-- JNDI server. Disable this if you don't want JNDI -->
- <bean name="JNDIServer" class="org.jnp.server.Main">
- <property name="namingInfo">
- <inject bean="Naming"/>
- </property>
- <property name="port">1099</property>
- <property name="bindAddress">localhost</property>
- <property name="rmiPort">1098</property>
- <property name="rmiBindAddress">localhost</property>
- </bean>
-
- <!-- MBean server -->
- <bean name="MBeanServer" class="javax.management.MBeanServer">
- <constructor factoryClass="java.lang.management.ManagementFactory"
- factoryMethod="getPlatformMBeanServer"/>
- </bean>
-
- <!-- The core configuration -->
- <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
- </bean>
-
- <!-- The security manager -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- </bean>
-
- <!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
- <start ignored="true"/>
- <stop ignored="true"/>
- <constructor>
- <parameter>
- <inject bean="Configuration"/>
- </parameter>
- <parameter>
- <inject bean="MBeanServer"/>
- </parameter>
- <parameter>
- <inject bean="JBMSecurityManager"/>
- </parameter>
- </constructor>
- </bean>
-
- <!-- The JMS server -->
- <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
- <constructor>
- <parameter>
- <inject bean="MessagingServer"/>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list