[jboss-cvs] JBoss Messaging SVN: r5536 - in trunk: examples/jms/src/org/jboss/jms/example and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 17 08:10:38 EST 2008
Author: ataylor
Date: 2008-12-17 08:10:38 -0500 (Wed, 17 Dec 2008)
New Revision: 5536
Added:
trunk/examples/jms/src/org/jboss/jms/example/ClusteredQueueExample.java
trunk/src/config/jbm-cluster-configuration.xml
trunk/src/config/jbm-cluster-standalone-beans.xml
Modified:
trunk/build-messaging.xml
trunk/build.xml
trunk/src/config/jbm-jms.xml
trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java
trunk/src/main/org/jboss/messaging/integration/bootstrap/JBMBootstrapServer.java
trunk/src/main/org/jboss/messaging/integration/transports/mina/TransportConstants.java
Log:
added a cluster configuration
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2008-12-15 15:40:01 UTC (rev 5535)
+++ trunk/build-messaging.xml 2008-12-17 13:10:38 UTC (rev 5536)
@@ -101,6 +101,12 @@
<property name="build.distro.examples.dir" value="${build.distro.dir}/examples"/>
<property name="build.distro.licenses.dir" value="${build.distro.dir}/licenses"/>
+ <!--default clustering server settings-->
+ <property name="jbm.remoting.netty.port" value="5445"/>
+ <property name="jbm.remoting.mina.port" value="5600"/>
+ <property name="jnp.port" value="1099"/>
+ <property name="jnp.rmiPort" value="1098"/>
+ <property name="jbm.data.dir" value="data1"/>
<!-- ======================================================================================== -->
<!-- Thirdparty Dependency Definitions -->
<!-- ======================================================================================== -->
@@ -1146,6 +1152,30 @@
</java>
</target>
+ <target name="runClusteredServer" depends="jar">
+ <java classname="org.jboss.messaging.integration.bootstrap.JBMBootstrapServer" fork="true">
+ <jvmarg value="-XX:+UseParallelGC"/>
+ <jvmarg value="-Xms512M"/>
+ <jvmarg value="-Xmx2048M"/>
+ <jvmarg value="-XX:+AggressiveOpts"/>
+ <jvmarg value="-XX:+UseFastAccessorMethods"/>
+ <jvmarg value="-Dcom.sun.management.jmxremote"/>
+ <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
+ <jvmarg
+ value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
+ <jvmarg value="-Djava.library.path=${native.bin.dir}"/>
+ <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>
+ <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"/>
+ <jvmarg value="-Djbm.remoting.netty.port=${jbm.remoting.netty.port}"/>
+ <jvmarg value="-Djbm.remoting.mina.port=${jbm.remoting.mina.port}"/>
+ <jvmarg value="-Djnp.port=${jnp.port}"/>
+ <jvmarg value="-Djnp.rmiPort=${jnp.rmiPort}"/>
+ <jvmarg value="-Djbm.data.dir=${jbm.data.dir}"/>
+ <arg line="jbm-cluster-standalone-beans.xml"/>
+ <classpath refid="jms.standalone.server.classpath"/>
+ </java>
+ </target>
+
<target name="debugServer" depends="jar">
<java classname="org.jboss.messaging.integration.bootstrap.JBMBootstrapServer" fork="true">
<jvmarg value="-XX:+UseParallelGC"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-12-15 15:40:01 UTC (rev 5535)
+++ trunk/build.xml 2008-12-17 13:10:38 UTC (rev 5536)
@@ -226,6 +226,10 @@
<ant antfile="build-messaging.xml" target="runServer"/>
</target>
+ <target name="runClusteredServer" depends="createthirdparty">
+ <ant antfile="build-messaging.xml" target="runClusteredServer"/>
+ </target>
+
<target name="debugServer" depends="createthirdparty">
<ant antfile="build-messaging.xml" target="debugServer"/>
</target>
Copied: trunk/examples/jms/src/org/jboss/jms/example/ClusteredQueueExample.java (from rev 5530, trunk/examples/jms/src/org/jboss/jms/example/QueueExample.java)
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/ClusteredQueueExample.java (rev 0)
+++ trunk/examples/jms/src/org/jboss/jms/example/ClusteredQueueExample.java 2008-12-17 13:10:38 UTC (rev 5536)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jms.example;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import org.jboss.messaging.core.logging.Logger;
+
+import java.util.Hashtable;
+
+/**
+ * A simple JMS Queue example that creates a producer and consumer on a queue and sends a message.
+ *
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public class ClusteredQueueExample
+{
+ final static Logger log = Logger.getLogger(ClusteredQueueExample.class);
+
+ public static void main(final String[] args)
+ {
+ Connection connection = null;
+ Connection connection2 = null;
+ try
+ {
+ Hashtable<Object, Object> server1 = new Hashtable<Object, Object>();
+ server1.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
+ server1.put("java.naming.provider.url", "jnp://localhost:1099");
+ server1.put("java.naming.factory.url.pkg", "org.jboss.naming:org.jnp.interfaces");
+ InitialContext initialContext1 = new InitialContext(server1);
+ Hashtable<Object, Object> server2 = new Hashtable<Object, Object>();
+ server2.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
+ server2.put("java.naming.provider.url", "jnp://localhost:1097");
+ server2.put("java.naming.factory.url.pkg", "org.jboss.naming:org.jnp.interfaces");
+ InitialContext initialContext2 = new InitialContext(server2);
+ Queue queue = (Queue) initialContext1.lookup("/queue/testDistributedQueue");
+ ConnectionFactory cf = (ConnectionFactory) initialContext1.lookup("/ClusteredConnectionFactory");
+ ConnectionFactory cf2 = (ConnectionFactory) initialContext2.lookup("/ClusteredConnectionFactory");
+
+ connection = cf.createConnection();
+ connection2 = cf2.createConnection();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session session2 = connection2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer = session.createProducer(queue);
+ Message message = session.createTextMessage("This is a text message!");
+
+ log.info("sending message to queue");
+ producer.send(message);
+
+ MessageConsumer messageConsumer = session2.createConsumer(queue);
+ connection.start();
+ TextMessage message2 = (TextMessage) messageConsumer.receive(5000);
+ log.info("message received from queue");
+ log.info("message = " + message2.getText());
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ finally
+ {
+ if(connection != null)
+ {
+ try
+ {
+ connection.close();
+ }
+ catch (JMSException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ if(connection2 != null)
+ {
+ try
+ {
+ connection2.close();
+ }
+ catch (JMSException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/examples/jms/src/org/jboss/jms/example/ClusteredQueueExample.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/src/config/jbm-cluster-configuration.xml (from rev 5529, trunk/src/config/jbm-configuration.xml)
===================================================================
--- trunk/src/config/jbm-cluster-configuration.xml (rev 0)
+++ trunk/src/config/jbm-cluster-configuration.xml 2008-12-17 13:10:38 UTC (rev 5536)
@@ -0,0 +1,201 @@
+<deployment>
+ <configuration>
+
+ <clustered>true</clustered>
+
+ <!-- Clustering configuration -->
+
+ <broadcast-group name="bg-group1">
+ <local-bind-address>localhost</local-bind-address>
+ <local-bind-port>1234</local-bind-port>
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>5000</broadcast-period>
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ </broadcast-group>
+
+ <discovery-group name="dg-group1">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+
+ <message-flow name="jms-distributed-queues">
+ <address>jmsqueues.testDistributedQueue</address>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </message-flow>
+
+ <message-flow name="jms-distributed-topics">
+ <address>jmstopics.#</address>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ <fanout>true</fanout>
+ </message-flow>
+
+ <!--<message-flow name="example-static-connectors">
+ <address>jmstopics.#</address>
+ <connector-ref connector-name="connector1" backup-connector-name="backup-connector1"/>
+ <connector-ref connector-name="connector2"/>
+ <connector-ref connector-name="connector3"/>
+ <fanout>true</fanout>
+ </message-flow>-->
+
+ <!-- Maximum number of threads to use for scheduled deliveries -->
+ <scheduled-max-pool-size>30</scheduled-max-pool-size>
+
+ <require-destinations>true</require-destinations>
+
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
+
+ <wild-card-routing-enabled>true</wild-card-routing-enabled>
+
+ <management-address>admin.management</management-address>
+ <management-notification-address>admin.notification</management-notification-address>
+
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
+
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
+ <connection-scan-period>10000</connection-scan-period>
+
+ <!--how long before timing a transaction out-->
+ <transaction-timeout>60000</transaction-timeout>
+ <!--how often to scan for timedout transactions-->
+ <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
+
+ <!-- how often do we scan the queues for expired messages-->
+ <message-expiry-scan-period>30000</message-expiry-scan-period>
+ <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
+ <message-expiry-thread-priority>3</message-expiry-thread-priority>
+
+ <!-- Example interceptors
+ <remoting-interceptors>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
+ </remoting-interceptors>
+ -->
+
+ <backup>false</backup>
+
+ <queue-activation-timeout>30000</queue-activation-timeout>
+
+ <!--
+ <backup-connector connector-name="backup-connector"/>
+ -->
+
+ <!-- Connectors -->
+
+ <connector name="netty-backup">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
+ </connector>
+
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
+
+ <connector name="netty-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </connector>
+
+ <connector name="netty-http">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
+ <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
+ </connector>
+
+ <connector name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+
+ <!-- Acceptors -->
+
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
+ <!-- Netty standard TCP acceptor -->
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </acceptor>
+ <!-- Netty SSL Acceptor
+ <acceptor name="netty-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </acceptor>
+ -->
+ <!--Netty HTTP Acceptor-->
+ <!--<acceptor name-"netty-http">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
+ <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
+ </acceptor>-->
+
+ <!-- Mina Acceptor -->
+ <acceptor name="mina">
+ <factory-class>org.jboss.messaging.integration.transports.mina.MinaAcceptorFactory</factory-class>
+ <param key="jbm.remoting.mina.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.mina.port" value="${jbm.remoting.mina.port}" type="Integer"/>
+ </acceptor>
+
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>${jbm.data.dir}/paging</paging-directory>
+
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
+
+ <!-- Storage configuration -->
+
+ <bindings-directory>${jbm.data.dir}/bindings</bindings-directory>
+
+ <create-bindings-dir>true</create-bindings-dir>
+
+ <journal-directory>${jbm.data.dir}/journal</journal-directory>
+
+ <create-journal-dir>true</create-journal-dir>
+
+ <journal-type>ASYNCIO</journal-type>
+
+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+ Set this to -1 to disable this feature -->
+ <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
+
+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+ <journal-sync-transactional>true</journal-sync-transactional>
+
+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
+
+ <!-- 10 MB journal file size -->
+ <journal-file-size>10485760</journal-file-size>
+
+ <journal-min-files>15</journal-min-files>
+
+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+ (parameter ignored on NIO)
+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+ -->
+ <journal-max-aio>10000</journal-max-aio>
+
+ </configuration>
+
+</deployment>
Property changes on: trunk/src/config/jbm-cluster-configuration.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/src/config/jbm-cluster-standalone-beans.xml (from rev 5529, trunk/src/config/jbm-standalone-beans.xml)
===================================================================
--- trunk/src/config/jbm-cluster-standalone-beans.xml (rev 0)
+++ trunk/src/config/jbm-cluster-standalone-beans.xml 2008-12-17 13:10:38 UTC (rev 5536)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">${jnp.port}</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">${jnp.rmiPort}</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <bean name="DeploymentManager" class="org.jboss.messaging.core.deployers.impl.FileDeploymentManager">
+ <constructor>
+ <!-- The scan time in milliseconds -->
+ <parameter>5000</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
+ <property name="configurationUrl">jbm-cluster-configuration.xml</property>
+ </bean>
+
+ <!--<bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBossASSecurityManager"/>-->
+
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <constructor>
+ <parameter>false</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="BasicSecurityDeployer" class="org.jboss.messaging.core.deployers.impl.BasicSecurityDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="DeploymentManager"/>
+ </parameter>
+ </constructor>
+ <property name="jbmSecurityManager">
+ <inject bean="JBMSecurityManager"/>
+ </property>
+ </bean>
+
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <depends>QueueSettingsDeployer</depends>
+ <property name="storageManager">
+ <inject bean="StorageManager"/>
+ </property>
+ <property name="remotingService">
+ <inject bean="RemotingService"/>
+ </property>
+ <property name="configuration">
+ <inject bean="Configuration"/>
+ </property>
+ <property name="securityManager">
+ <inject bean="JBMSecurityManager"/>
+ </property>
+ <property name="managementService">
+ <inject bean="ManagementService"/>
+ </property>
+ </bean>
+
+ <bean name="StorageManager" class="org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager">
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="RemotingService" class="org.jboss.messaging.core.remoting.impl.RemotingServiceImpl">
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ </constructor>
+ <property name="managementService">
+ <inject bean="ManagementService"/>
+ </property>
+ </bean>
+
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer" property="serverManagement"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="postOffice"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="storageManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="queueSettingsRepository"/>
+ </parameter>
+ <parameter>
+ <inject bean="JMSManagementService"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JMSServerDeployer" class="org.jboss.messaging.jms.server.impl.JMSServerDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="DeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ </constructor>
+ <property name="jmsServerManager">
+ <inject bean="JMSServerManager"/>
+ </property>
+ </bean>
+
+ <bean name="QueueSettingsDeployer" class="org.jboss.messaging.core.deployers.impl.QueueSettingsDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="DeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="queueSettingsRepository" state="Configured"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="SecurityDeployer" class="org.jboss.messaging.core.deployers.impl.SecurityDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="DeploymentManager"/>
+ </parameter>
+ <parameter>
+ <inject bean="MessagingServer" property="securityRepository"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="ManagementService" class="org.jboss.messaging.core.management.impl.ManagementServiceImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="Configuration" property="JMXManagementEnabled" />
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JMSManagementService" class="org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl">
+ <constructor>
+ <parameter>
+ <inject bean="ManagementService"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+</deployment>
\ No newline at end of file
Property changes on: trunk/src/config/jbm-cluster-standalone-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/src/config/jbm-jms.xml
===================================================================
--- trunk/src/config/jbm-jms.xml 2008-12-15 15:40:01 UTC (rev 5535)
+++ trunk/src/config/jbm-jms.xml 2008-12-17 13:10:38 UTC (rev 5536)
@@ -156,7 +156,7 @@
<entry name="/topic/TopicWithOwnRedeliveryDelay"/>
</topic>
<queue name="testDistributedQueue">
- <entry name="/topic/testDistributedQueue"/>
+ <entry name="/queue/testDistributedQueue"/>
</queue>
<topic name="testDistributedTopic">
<entry name="/topic/testDistributedTopic"/>
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java 2008-12-15 15:40:01 UTC (rev 5535)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java 2008-12-17 13:10:38 UTC (rev 5536)
@@ -35,7 +35,7 @@
*/
public class QueueSettingsDeployer extends XmlDeployer
{
- private static final String CLUSTERED_NODE_NAME = "manageConfirmations";
+ private static final String CLUSTERED_NODE_NAME = "clustered";
private static final String DEAD_LETTER_ADDRESS_NODE_NAME = "dead-letter-address";
Modified: trunk/src/main/org/jboss/messaging/integration/bootstrap/JBMBootstrapServer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/bootstrap/JBMBootstrapServer.java 2008-12-15 15:40:01 UTC (rev 5535)
+++ trunk/src/main/org/jboss/messaging/integration/bootstrap/JBMBootstrapServer.java 2008-12-17 13:10:38 UTC (rev 5536)
@@ -98,8 +98,6 @@
public JBMBootstrapServer(final String[] args, KernelConfig kernelConfig) throws Exception
{
super(kernelConfig);
- //System.setProperty("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
- //System.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
this.args = args;
}
Modified: trunk/src/main/org/jboss/messaging/integration/transports/mina/TransportConstants.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/mina/TransportConstants.java 2008-12-15 15:40:01 UTC (rev 5535)
+++ trunk/src/main/org/jboss/messaging/integration/transports/mina/TransportConstants.java 2008-12-17 13:10:38 UTC (rev 5536)
@@ -53,7 +53,7 @@
public static final String DEFAULT_HOST = "localhost";
- public static final int DEFAULT_PORT = 5445;
+ public static final int DEFAULT_PORT = 5600;
public static final String DEFAULT_KEYSTORE_PATH = "messaging.keystore";
More information about the jboss-cvs-commits
mailing list