[hornetq-commits] JBoss hornetq SVN: r10040 - in trunk/src: main/org/hornetq/jms/server/config and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Dec 15 10:39:37 EST 2010
Author: ataylor
Date: 2010-12-15 10:39:37 -0500 (Wed, 15 Dec 2010)
New Revision: 10040
Modified:
trunk/src/config/common/schema/hornetq-jms.xsd
trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java
trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java
trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java
trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
Log:
added jmx-domain to jms config
Modified: trunk/src/config/common/schema/hornetq-jms.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-jms.xsd 2010-12-13 23:18:50 UTC (rev 10039)
+++ trunk/src/config/common/schema/hornetq-jms.xsd 2010-12-15 15:39:37 UTC (rev 10040)
@@ -10,6 +10,7 @@
<xsd:element name="configuration">
<xsd:complexType>
<xsd:sequence>
+ <xsd:element ref="jmx-domain" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="connection-factory"
maxOccurs="unbounded" minOccurs="0">
</xsd:element>
@@ -23,6 +24,8 @@
</xsd:complexType>
</xsd:element>
+ <xsd:element name="jmx-domain" type="xsd:string"/>
+
<xsd:element name="connection-factory">
<xsd:complexType>
<xsd:all>
Modified: trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-12-13 23:18:50 UTC (rev 10039)
+++ trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-12-15 15:39:37 UTC (rev 10040)
@@ -35,4 +35,6 @@
List<TopicConfiguration> getTopicConfigurations();
List<ConnectionFactoryConfiguration> getConnectionFactoryConfigurations();
+
+ String getDomain();
}
Modified: trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-12-13 23:18:50 UTC (rev 10039)
+++ trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-12-15 15:39:37 UTC (rev 10040)
@@ -18,6 +18,7 @@
import javax.naming.Context;
+import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
import org.hornetq.jms.server.config.JMSConfiguration;
import org.hornetq.jms.server.config.JMSQueueConfiguration;
@@ -40,6 +41,8 @@
private final List<TopicConfiguration> topicConfigurations = new ArrayList<TopicConfiguration>();
+ private final String domain;
+
private Context context = null;
// Constants -----------------------------------------------------
@@ -52,15 +55,18 @@
public JMSConfigurationImpl()
{
+ domain = null;
}
public JMSConfigurationImpl(final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations,
final List<JMSQueueConfiguration> queueConfigurations,
- final List<TopicConfiguration> topicConfigurations)
+ final List<TopicConfiguration> topicConfigurations,
+ final String domain)
{
this.connectionFactoryConfigurations.addAll(connectionFactoryConfigurations);
this.queueConfigurations.addAll(queueConfigurations);
this.topicConfigurations.addAll(topicConfigurations);
+ this.domain = domain;
}
// JMSConfiguration implementation -------------------------------
@@ -90,6 +96,11 @@
this.context = context;
}
+ public String getDomain()
+ {
+ return domain;
+ }
+
// Public --------------------------------------------------------
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-12-13 23:18:50 UTC (rev 10039)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-12-15 15:39:37 UTC (rev 10040)
@@ -25,6 +25,7 @@
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.jms.JMSFactoryType;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.config.impl.Validators;
import org.hornetq.core.logging.Logger;
import org.hornetq.jms.server.JMSServerConfigParser;
@@ -90,6 +91,7 @@
ArrayList<JMSQueueConfiguration> queues = new ArrayList<JMSQueueConfiguration>();
ArrayList<TopicConfiguration> topics = new ArrayList<TopicConfiguration>();
ArrayList<ConnectionFactoryConfiguration> cfs = new ArrayList<ConnectionFactoryConfiguration>();
+ String domain = ConfigurationImpl.DEFAULT_JMX_DOMAIN;
Element e = (Element)rootnode;
@@ -97,7 +99,7 @@
String elements[] = new String[] { JMSServerDeployer.QUEUE_NODE_NAME,
JMSServerDeployer.TOPIC_NODE_NAME,
- JMSServerDeployer.CONNECTION_FACTORY_NODE_NAME };
+ JMSServerDeployer.CONNECTION_FACTORY_NODE_NAME};
for (String element : elements)
{
NodeList children = e.getElementsByTagName(element);
@@ -126,8 +128,11 @@
}
}
- JMSConfiguration value = newConfig(queues, topics, cfs);
+ domain = XMLConfigurationUtil.getString(e, JMSServerDeployer.JMX_DOMAIN_NAME, ConfigurationImpl.DEFAULT_JMX_DOMAIN, Validators.NO_CHECK);
+
+ JMSConfiguration value = newConfig(queues, topics, cfs, domain);
+
return value;
}
@@ -521,13 +526,14 @@
* @param queues
* @param topics
* @param cfs
+ * @param domain
* @return
*/
protected JMSConfiguration newConfig(final ArrayList<JMSQueueConfiguration> queues,
final ArrayList<TopicConfiguration> topics,
- final ArrayList<ConnectionFactoryConfiguration> cfs)
+ final ArrayList<ConnectionFactoryConfiguration> cfs, String domain)
{
- JMSConfiguration value = new JMSConfigurationImpl(cfs, queues, topics);
+ JMSConfiguration value = new JMSConfigurationImpl(cfs, queues, topics, domain);
return value;
}
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-12-13 23:18:50 UTC (rev 10039)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-12-15 15:39:37 UTC (rev 10040)
@@ -54,6 +54,8 @@
protected static final String TOPIC_NODE_NAME = "topic";
+ protected static final String JMX_DOMAIN_NAME = "jmx-domain";
+
protected static final boolean DEFAULT_QUEUE_DURABILITY = true;
public JMSServerDeployer(final JMSServerManager jmsServerManager,
More information about the hornetq-commits
mailing list