[jboss-cvs] JBoss Messaging SVN: r6921 - in trunk/src: main/org/jboss/messaging/jms/server and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 20 09:52:02 EDT 2009
Author: timfox
Date: 2009-05-20 09:52:02 -0400 (Wed, 20 May 2009)
New Revision: 6921
Removed:
trunk/src/schemas/
Modified:
trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
Log:
removed old schema directory - it's not used
Modified: trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2009-05-20 13:51:11 UTC (rev 6920)
+++ trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2009-05-20 13:52:02 UTC (rev 6921)
@@ -54,14 +54,14 @@
* The name of the queue to create
* @param jndiBinding
* the name of the binding for JNDI
- * @param filterString
+ * @param selectorString
* @param durable
* @return true if the queue is created or if it existed and was added to
* JNDI
* @throws Exception
* if problems were encountered creating the queue.
*/
- boolean createQueue(String queueName, String jndiBinding, String filterString, boolean durable) throws Exception;
+ boolean createQueue(String queueName, String jndiBinding, String selectorString, boolean durable) throws Exception;
/**
* Creates a JMS Topic
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-05-20 13:51:11 UTC (rev 6920)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-05-20 13:52:02 UTC (rev 6921)
@@ -68,7 +68,7 @@
private static final String SEND_P_MESSAGES_SYNCHRONOUSLY_ELEMENT = "send-p-messages-synchronously";
- private static final String AUTO_GROUP_ID_ELEMENT = "auto-group-id";
+ private static final String AUTO_GROUP_ELEMENT = "auto-group";
private static final String MAX_CONNECTIONS_ELEMENT = "max-connections";
@@ -81,13 +81,13 @@
private static final String RECONNECT_ATTEMPTS = "reconnect-attempts";
private static final String FAILOVER_ON_SERVER_SHUTDOWN = "failover-on-server-shutdown";
-
+
private static final String USE_GLOBAL_POOLS = "use-global-pools";
-
+
private static final String SCHEDULED_THREAD_POOL_MAX_SIZE = "scheduled-thread-pool-max-size";
-
- private static final String THREAD_POOL_MAX_SIZE = "thread-pool-max-size";
+ private static final String THREAD_POOL_MAX_SIZE = "thread-pool-max-size";
+
private static final String CONNECTOR_LINK_ELEMENT = "connector-ref";
private static final String DISCOVERY_GROUP_ELEMENT = "discovery-group-ref";
@@ -100,7 +100,7 @@
private static final String QUEUE_NODE_NAME = "queue";
- private static final String QUEUE_FILTER_NODE_NAME = "filter";
+ private static final String QUEUE_SELECTOR_NODE_NAME = "selector";
private static final String QUEUE_DURABLE_NODE_NAME = "durable";
@@ -255,7 +255,7 @@
{
blockOnPersistentSend = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);
}
- else if (AUTO_GROUP_ID_ELEMENT.equals(child.getNodeName()))
+ else if (AUTO_GROUP_ELEMENT.equals(child.getNodeName()))
{
autoGroup = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);
}
@@ -437,7 +437,7 @@
{
NamedNodeMap atts = node.getAttributes();
String queueName = atts.getNamedItem(getKeyAttribute()).getNodeValue();
- String filterString = null;
+ String selectorString = null;
boolean durable = DEFAULT_QUEUE_DURABILITY;
NodeList children = node.getChildNodes();
ArrayList<String> jndiNames = new ArrayList<String>();
@@ -450,21 +450,23 @@
String jndiName = child.getAttributes().getNamedItem("name").getNodeValue();
jndiNames.add(jndiName);
}
- else if(QUEUE_DURABLE_NODE_NAME.equals(children.item(i).getNodeName()))
+ else if (QUEUE_DURABLE_NODE_NAME.equals(children.item(i).getNodeName()))
{
Node durableNode = children.item(i);
- durable = durableNode.getNodeValue() == null ? DEFAULT_QUEUE_DURABILITY:durableNode.getNodeValue().equalsIgnoreCase(Boolean.FALSE.toString());
+ durable = durableNode.getNodeValue() == null ? DEFAULT_QUEUE_DURABILITY
+ : durableNode.getNodeValue()
+ .equalsIgnoreCase(Boolean.FALSE.toString());
}
- else if(QUEUE_FILTER_NODE_NAME.equals(children.item(i).getNodeName()))
+ else if (QUEUE_SELECTOR_NODE_NAME.equals(children.item(i).getNodeName()))
{
- Node filterNode = children.item(i);
- Node attNode = filterNode.getAttributes().getNamedItem("string");
- filterString = attNode.getNodeValue();
+ Node selectorNode = children.item(i);
+ Node attNode = selectorNode.getAttributes().getNamedItem("string");
+ selectorString = attNode.getNodeValue();
}
}
for (String jndiName : jndiNames)
{
- jmsServerControl.createQueue(queueName, jndiName, filterString, durable);
+ jmsServerControl.createQueue(queueName, jndiName, selectorString, durable);
}
}
else if (node.getNodeName().equals(TOPIC_NODE_NAME))
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-05-20 13:51:11 UTC (rev 6920)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-05-20 13:52:02 UTC (rev 6921)
@@ -32,10 +32,12 @@
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.JBossTopic;
import org.jboss.messaging.jms.client.JBossConnectionFactory;
+import org.jboss.messaging.jms.client.SelectorTranslator;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.jms.server.management.JMSManagementService;
import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
import org.jboss.messaging.utils.Pair;
+import org.jboss.messaging.utils.SimpleString;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -191,12 +193,21 @@
return server.getMessagingServerControl().getVersion();
}
- public synchronized boolean createQueue(final String queueName, final String jndiBinding, final String filterString, boolean durable) throws Exception
+ public synchronized boolean createQueue(final String queueName, final String jndiBinding, final String selectorString, boolean durable) throws Exception
{
checkInitialised();
JBossQueue jBossQueue = new JBossQueue(queueName);
- server.getMessagingServerControl().deployQueue(jBossQueue.getAddress(), jBossQueue.getAddress(), filterString, durable);
+ //Convert from JMS selector to core filter
+ String coreFilterString = null;
+
+ if (selectorString != null)
+ {
+ coreFilterString = SelectorTranslator.convertToJBMFilterString(selectorString);
+ }
+
+ server.getMessagingServerControl().deployQueue(jBossQueue.getAddress(), jBossQueue.getAddress(), coreFilterString, durable);
+
boolean added = bindToJndi(jndiBinding, jBossQueue);
if (added)
More information about the jboss-cvs-commits
mailing list