JBoss hornetq SVN: r9091 - in trunk: tests/src/org/hornetq/tests/integration/client and 1 other directory.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-04-10 06:47:48 -0400 (Sat, 10 Apr 2010)
New Revision: 9091
Modified:
trunk/src/main/org/hornetq/utils/PriorityLinkedListImpl.java
trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
Log:
fixed consumer round robin test
Modified: trunk/src/main/org/hornetq/utils/PriorityLinkedListImpl.java
===================================================================
--- trunk/src/main/org/hornetq/utils/PriorityLinkedListImpl.java 2010-04-10 09:40:22 UTC (rev 9090)
+++ trunk/src/main/org/hornetq/utils/PriorityLinkedListImpl.java 2010-04-10 10:47:48 UTC (rev 9091)
@@ -62,20 +62,16 @@
public int addFirst(final T t, final int priority)
{
- int refs = size.incrementAndGet();
-
levels[priority].addFirst(t);
- return refs;
+ return size.incrementAndGet();
}
public int addLast(final T t, final int priority)
{
- int refs = size.incrementAndGet();
-
levels[priority].addLast(t);
- return refs;
+ return size.incrementAndGet();
}
public T removeFirst()
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2010-04-10 09:40:22 UTC (rev 9090)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2010-04-10 10:47:48 UTC (rev 9091)
@@ -20,6 +20,7 @@
import org.hornetq.api.core.client.ClientProducer;
import org.hornetq.api.core.client.ClientSession;
import org.hornetq.api.core.client.ClientSessionFactory;
+import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
@@ -28,10 +29,26 @@
*/
public class ConsumerRoundRobinTest extends ServiceTestBase
{
+ private static final Logger log = Logger.getLogger(QueueBrowserTest.class);
+
public final SimpleString addressA = new SimpleString("addressA");
public final SimpleString queueA = new SimpleString("queueA");
+ public void test() throws Exception
+ {
+ for (int i = 0; i < 100000; i++)
+ {
+ log.info("**** ITER " + i + "\n\n\n\n\n\n");
+
+ this.testConsumersRoundRobinCorrectly();
+
+ tearDown();
+
+ setUp();
+ }
+ }
+
public void testConsumersRoundRobinCorrectly() throws Exception
{
HornetQServer server = createServer(false);
@@ -53,7 +70,6 @@
consumers[3] = session.createConsumer(queueA);
consumers[4] = session.createConsumer(queueA);
- // ClientSession sendSession = cf.createSession(false, true, true);
ClientProducer cp = session.createProducer(addressA);
int numMessage = 100;
for (int i = 0; i < numMessage; i++)
@@ -70,9 +86,10 @@
ClientMessage cm = consumers[j].receive(5000);
Assert.assertNotNull(cm);
Assert.assertEquals(currMessage++, cm.getBodyBuffer().readInt());
+ cm.acknowledge();
}
}
- // sendSession.close();
+ log.info("closing session");
session.close();
}
finally
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9090 - in trunk/tests/src/org/hornetq/tests/integration: remoting and 1 other directory.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-04-10 05:40:22 -0400 (Sat, 10 Apr 2010)
New Revision: 9090
Modified:
trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java
trunk/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java
Log:
fixed test and added a new browser test
Modified: trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-04-09 20:15:18 UTC (rev 9089)
+++ trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-04-10 09:40:22 UTC (rev 9090)
@@ -355,5 +355,51 @@
sf.close();
}
+
+ public void testBrowseWithZeroConsumerWindowSize() throws Exception
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setConsumerWindowSize(0);
+ ClientSession session = sf.createSession(false, true, true);
+
+ session.createQueue(QUEUE, QUEUE, null, false);
+
+ ClientProducer producer = session.createProducer(QUEUE);
+
+ final int numMessages = 100;
+
+ byte[] bytes = new byte[240];
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message = session.createMessage(false);
+
+ message.getBodyBuffer().writeBytes(bytes);
+
+ message.putIntProperty("foo", i);
+
+ producer.send(message);
+ }
+
+ //Create a normal non browsing consumer
+ ClientConsumer consumer = session.createConsumer(QUEUE);
+
+ session.start();
+
+ ClientConsumer browser = session.createConsumer(QUEUE, true);
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message2 = browser.receive(1000);
+
+ assertEquals(i, message2.getIntProperty("foo").intValue());
+ }
+
+ session.close();
+
+ sf.close();
+ }
+
}
Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java 2010-04-09 20:15:18 UTC (rev 9089)
+++ trunk/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java 2010-04-10 09:40:22 UTC (rev 9090)
@@ -157,20 +157,12 @@
ClientMessage msg = session.createMessage(false);
- long start = System.currentTimeMillis();
-
prod.send(msg);
msg = cons.receive(10000);
assertNotNull(msg);
- long end = System.currentTimeMillis();
-
- //This will be delayed
-
- assertTrue(end - start > DELAY);
-
msg.acknowledge();
sf.close();
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9089 - in trunk: tests/src/org/hornetq/tests/integration/jms/client and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-04-09 16:15:18 -0400 (Fri, 09 Apr 2010)
New Revision: 9089
Added:
trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java
Removed:
trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java
Modified:
trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-304 - fix on re-sending mapMessages after receiving
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2010-04-09 17:43:11 UTC (rev 9088)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2010-04-09 20:15:18 UTC (rev 9089)
@@ -52,7 +52,7 @@
private TypedProperties map = new TypedProperties();
- private boolean invalid = true;
+ private boolean invalid;
// Static --------------------------------------------------------
@@ -66,15 +66,23 @@
super(HornetQMapMessage.TYPE, session);
map = new TypedProperties();
+
+ invalid = true;
}
+ /*
+ * This constructor is used during reading
+ */
protected HornetQMapMessage(final ClientMessage message, final ClientSession session)
{
super(message, session);
+
+ invalid = false;
}
public HornetQMapMessage()
{
+ invalid = false;
}
/**
@@ -416,6 +424,8 @@
message.getBodyBuffer().resetWriterIndex();
map.encode(message.getBodyBuffer());
+
+ invalid = false;
}
super.doBeforeSend();
Deleted: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-04-09 17:43:11 UTC (rev 9088)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-04-09 20:15:18 UTC (rev 9089)
@@ -1,298 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.tests.integration.jms.client;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import junit.framework.Assert;
-
-import org.hornetq.api.core.Pair;
-import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.api.core.client.HornetQClient;
-import org.hornetq.api.jms.HornetQJMSConstants;
-import org.hornetq.tests.util.JMSTestBase;
-import org.hornetq.tests.util.UnitTestCase;
-
-/**
- * Receive Messages and resend them, like the bridge would do
- *
- * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- *
- *
- */
-public class ReSendLargeMessageTest extends JMSTestBase
-{
-
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private Queue queue;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- public void testResendMessage() throws Exception
- {
- Connection conn = cf.createConnection();
- try
- {
- conn.start();
-
- Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
- ArrayList<Message> msgs = new ArrayList<Message>();
-
- for (int i = 0; i < 10; i++)
- {
- BytesMessage bm = sess.createBytesMessage();
- bm.setObjectProperty(HornetQJMSConstants.JMS_HORNETQ_INPUT_STREAM,
- UnitTestCase.createFakeLargeStream(2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE));
- msgs.add(bm);
-
- MapMessage mm = sess.createMapMessage();
- mm.setBoolean("boolean", true);
- mm.setByte("byte", (byte)3);
- mm.setBytes("bytes", new byte[] { (byte)3, (byte)4, (byte)5 });
- mm.setChar("char", (char)6);
- mm.setDouble("double", 7.0);
- mm.setFloat("float", 8.0f);
- mm.setInt("int", 9);
- mm.setLong("long", 10l);
- mm.setObject("object", new String("this is an object"));
- mm.setShort("short", (short)11);
- mm.setString("string", "this is a string");
-
- msgs.add(mm);
- msgs.add(sess.createTextMessage("hello" + i));
- msgs.add(sess.createObjectMessage(new SomeSerializable("hello" + i)));
- }
-
- internalTestResend(msgs, sess);
-
- }
- finally
- {
- conn.close();
- }
-
- }
-
- public void internalTestResend(final ArrayList<Message> msgs, final Session sess) throws Exception
- {
- MessageProducer prod = sess.createProducer(queue);
-
- for (Message msg : msgs)
- {
- prod.send(msg);
- }
-
- sess.commit();
-
- MessageConsumer cons = sess.createConsumer(queue);
-
- for (int i = 0; i < msgs.size(); i++)
- {
- Message msg = cons.receive(5000);
- Assert.assertNotNull(msg);
-
- prod.send(msg);
- }
-
- Assert.assertNull(cons.receiveNoWait());
-
- sess.commit();
-
- for (Message originalMessage : msgs)
- {
- Message copiedMessage = cons.receive(5000);
- Assert.assertNotNull(copiedMessage);
-
- Assert.assertEquals(copiedMessage.getClass(), originalMessage.getClass());
-
- sess.commit();
-
- if (copiedMessage instanceof BytesMessage)
- {
- BytesMessage copiedBytes = (BytesMessage)copiedMessage;
-
- for (int i = 0; i < copiedBytes.getBodyLength(); i++)
- {
- Assert.assertEquals(UnitTestCase.getSamplebyte(i), copiedBytes.readByte());
- }
- }
- else if (copiedMessage instanceof MapMessage)
- {
- MapMessage copiedMap = (MapMessage)copiedMessage;
- MapMessage originalMap = (MapMessage)originalMessage;
- Assert.assertEquals(originalMap.getString("str"), copiedMap.getString("str"));
- Assert.assertEquals(originalMap.getLong("long"), copiedMap.getLong("long"));
- Assert.assertEquals(originalMap.getInt("int"), copiedMap.getInt("int"));
- Assert.assertEquals(originalMap.getObject("object"), copiedMap.getObject("object"));
- }
- else if (copiedMessage instanceof ObjectMessage)
- {
- Assert.assertNotSame(((ObjectMessage)originalMessage).getObject(),
- ((ObjectMessage)copiedMessage).getObject());
- Assert.assertEquals(((ObjectMessage)originalMessage).getObject(),
- ((ObjectMessage)copiedMessage).getObject());
- }
- else if (copiedMessage instanceof TextMessage)
- {
- Assert.assertEquals(((TextMessage)originalMessage).getText(), ((TextMessage)copiedMessage).getText());
- }
- }
-
- }
-
- public static class SomeSerializable implements Serializable
- {
- /**
- *
- */
- private static final long serialVersionUID = -8576054940441747312L;
-
- final String txt;
-
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + (txt == null ? 0 : txt.hashCode());
- return result;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(final Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- SomeSerializable other = (SomeSerializable)obj;
- if (txt == null)
- {
- if (other.txt != null)
- {
- return false;
- }
- }
- else if (!txt.equals(other.txt))
- {
- return false;
- }
- return true;
- }
-
- SomeSerializable(final String txt)
- {
- this.txt = txt;
- }
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
- @Override
- protected void createCF(final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- final String ... jndiBindings) throws Exception
- {
- int retryInterval = 1000;
- double retryIntervalMultiplier = 1.0;
- int reconnectAttempts = -1;
- boolean failoverOnServerShutdown = true;
- int callTimeout = 30000;
-
- jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest",
- connectorConfigs,
- null,
- HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
- HornetQClient.DEFAULT_CONNECTION_TTL,
- callTimeout,
- true,
- HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
- HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE,
- HornetQClient.DEFAULT_CONSUMER_MAX_RATE,
- HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE,
- HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE,
- HornetQClient.DEFAULT_PRODUCER_MAX_RATE,
- HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND,
- HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
- HornetQClient.DEFAULT_AUTO_GROUP,
- HornetQClient.DEFAULT_PRE_ACKNOWLEDGE,
- HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
- HornetQClient.DEFAULT_ACK_BATCH_SIZE,
- HornetQClient.DEFAULT_ACK_BATCH_SIZE,
- HornetQClient.DEFAULT_USE_GLOBAL_POOLS,
- HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE,
- HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE,
- retryInterval,
- retryIntervalMultiplier,
- HornetQClient.DEFAULT_MAX_RETRY_INTERVAL,
- reconnectAttempts,
- failoverOnServerShutdown,
- null,
- jndiBindings);
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- queue = createQueue("queue1");
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- queue = null;
- super.tearDown();
- }
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Copied: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java (from rev 9088, trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java)
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java 2010-04-09 20:15:18 UTC (rev 9089)
@@ -0,0 +1,351 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.tests.integration.jms.client;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import junit.framework.Assert;
+
+import org.hornetq.api.core.Pair;
+import org.hornetq.api.core.TransportConfiguration;
+import org.hornetq.api.core.client.HornetQClient;
+import org.hornetq.api.jms.HornetQJMSConstants;
+import org.hornetq.tests.util.JMSTestBase;
+import org.hornetq.tests.util.UnitTestCase;
+
+/**
+ * Receive Messages and resend them, like the bridge would do
+ *
+ * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
+ *
+ *
+ */
+public class ReSendMessageTest extends JMSTestBase
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private Queue queue;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testResendWithLargeMessage() throws Exception
+ {
+ Connection conn = cf.createConnection();
+ try
+ {
+ conn.start();
+
+ Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
+ ArrayList<Message> msgs = new ArrayList<Message>();
+
+ for (int i = 0; i < 10; i++)
+ {
+ BytesMessage bm = sess.createBytesMessage();
+ bm.setObjectProperty(HornetQJMSConstants.JMS_HORNETQ_INPUT_STREAM,
+ UnitTestCase.createFakeLargeStream(2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE));
+ msgs.add(bm);
+
+ MapMessage mm = sess.createMapMessage();
+ mm.setBoolean("boolean", true);
+ mm.setByte("byte", (byte)3);
+ mm.setBytes("bytes", new byte[] { (byte)3, (byte)4, (byte)5 });
+ mm.setChar("char", (char)6);
+ mm.setDouble("double", 7.0);
+ mm.setFloat("float", 8.0f);
+ mm.setInt("int", 9);
+ mm.setLong("long", 10l);
+ mm.setObject("object", new String("this is an object"));
+ mm.setShort("short", (short)11);
+ mm.setString("string", "this is a string");
+
+ msgs.add(mm);
+ msgs.add(sess.createTextMessage("hello" + i));
+ msgs.add(sess.createObjectMessage(new SomeSerializable("hello" + i)));
+ }
+
+ internalTestResend(msgs, sess);
+
+ }
+ finally
+ {
+ conn.close();
+ }
+
+ }
+
+ public void testResendWithMapMessagesOnly() throws Exception
+ {
+ Connection conn = cf.createConnection();
+ try
+ {
+ conn.start();
+
+ Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
+ ArrayList<Message> msgs = new ArrayList<Message>();
+
+ for (int i = 0; i < 1; i++)
+ {
+ MapMessage mm = sess.createMapMessage();
+ mm.setBoolean("boolean", true);
+ mm.setByte("byte", (byte)3);
+ mm.setBytes("bytes", new byte[] { (byte)3, (byte)4, (byte)5 });
+ mm.setChar("char", (char)6);
+ mm.setDouble("double", 7.0);
+ mm.setFloat("float", 8.0f);
+ mm.setInt("int", 9);
+ mm.setLong("long", 10l);
+ mm.setObject("object", new String("this is an object"));
+ mm.setShort("short", (short)11);
+ mm.setString("string", "this is a string");
+
+ msgs.add(mm);
+
+ MapMessage emptyMap = sess.createMapMessage();
+ msgs.add(emptyMap);
+ }
+
+ internalTestResend(msgs, sess);
+
+ }
+ finally
+ {
+ conn.close();
+ }
+
+ }
+
+ public void internalTestResend(final ArrayList<Message> msgs, final Session sess) throws Exception
+ {
+ MessageProducer prod = sess.createProducer(queue);
+
+ for (Message msg : msgs)
+ {
+ prod.send(msg);
+ }
+
+ sess.commit();
+
+ MessageConsumer cons = sess.createConsumer(queue);
+
+ for (int i = 0; i < msgs.size(); i++)
+ {
+ Message msg = cons.receive(5000);
+ Assert.assertNotNull(msg);
+
+ prod.send(msg);
+ }
+
+ Assert.assertNull(cons.receiveNoWait());
+
+ sess.commit();
+
+ for (Message originalMessage : msgs)
+ {
+ Message copiedMessage = cons.receive(5000);
+ Assert.assertNotNull(copiedMessage);
+
+ Assert.assertEquals(copiedMessage.getClass(), originalMessage.getClass());
+
+ sess.commit();
+
+ if (copiedMessage instanceof BytesMessage)
+ {
+ BytesMessage copiedBytes = (BytesMessage)copiedMessage;
+
+ for (int i = 0; i < copiedBytes.getBodyLength(); i++)
+ {
+ Assert.assertEquals(UnitTestCase.getSamplebyte(i), copiedBytes.readByte());
+ }
+ }
+ else if (copiedMessage instanceof MapMessage)
+ {
+ MapMessage copiedMap = (MapMessage)copiedMessage;
+ MapMessage originalMap = (MapMessage)originalMessage;
+ if (originalMap.getString("str") != null)
+ {
+ Assert.assertEquals(originalMap.getString("str"), copiedMap.getString("str"));
+ }
+ if (originalMap.getObject("long") != null)
+ {
+ Assert.assertEquals(originalMap.getLong("long"), copiedMap.getLong("long"));
+ }
+ if (originalMap.getObject("int") != null)
+ {
+ Assert.assertEquals(originalMap.getInt("int"), copiedMap.getInt("int"));
+ }
+ if (originalMap.getObject("object") != null)
+ {
+ Assert.assertEquals(originalMap.getObject("object"), copiedMap.getObject("object"));
+ }
+ }
+ else if (copiedMessage instanceof ObjectMessage)
+ {
+ Assert.assertNotSame(((ObjectMessage)originalMessage).getObject(),
+ ((ObjectMessage)copiedMessage).getObject());
+ Assert.assertEquals(((ObjectMessage)originalMessage).getObject(),
+ ((ObjectMessage)copiedMessage).getObject());
+ }
+ else if (copiedMessage instanceof TextMessage)
+ {
+ Assert.assertEquals(((TextMessage)originalMessage).getText(), ((TextMessage)copiedMessage).getText());
+ }
+ }
+
+ }
+
+ public static class SomeSerializable implements Serializable
+ {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8576054940441747312L;
+
+ final String txt;
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (txt == null ? 0 : txt.hashCode());
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(final Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ SomeSerializable other = (SomeSerializable)obj;
+ if (txt == null)
+ {
+ if (other.txt != null)
+ {
+ return false;
+ }
+ }
+ else if (!txt.equals(other.txt))
+ {
+ return false;
+ }
+ return true;
+ }
+
+ SomeSerializable(final String txt)
+ {
+ this.txt = txt;
+ }
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+ @Override
+ protected void createCF(final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
+ final String ... jndiBindings) throws Exception
+ {
+ int retryInterval = 1000;
+ double retryIntervalMultiplier = 1.0;
+ int reconnectAttempts = -1;
+ boolean failoverOnServerShutdown = true;
+ int callTimeout = 30000;
+
+ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest",
+ connectorConfigs,
+ null,
+ HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
+ HornetQClient.DEFAULT_CONNECTION_TTL,
+ callTimeout,
+ true,
+ HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+ HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE,
+ HornetQClient.DEFAULT_CONSUMER_MAX_RATE,
+ HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE,
+ HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE,
+ HornetQClient.DEFAULT_PRODUCER_MAX_RATE,
+ HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
+ HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
+ HornetQClient.DEFAULT_AUTO_GROUP,
+ HornetQClient.DEFAULT_PRE_ACKNOWLEDGE,
+ HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
+ HornetQClient.DEFAULT_ACK_BATCH_SIZE,
+ HornetQClient.DEFAULT_ACK_BATCH_SIZE,
+ HornetQClient.DEFAULT_USE_GLOBAL_POOLS,
+ HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE,
+ HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE,
+ retryInterval,
+ retryIntervalMultiplier,
+ HornetQClient.DEFAULT_MAX_RETRY_INTERVAL,
+ reconnectAttempts,
+ failoverOnServerShutdown,
+ null,
+ jndiBindings);
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ queue = createQueue("queue1");
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ queue = null;
+ super.tearDown();
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9088 - in trunk: src/main/org/hornetq/jms/client and 2 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-04-09 13:43:11 -0400 (Fri, 09 Apr 2010)
New Revision: 9088
Modified:
trunk/src/main/org/hornetq/api/jms/HornetQJMSConstants.java
trunk/src/main/org/hornetq/jms/client/HornetQMessage.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/JMSCorrelationIDHeaderTest.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/SimpleJMSMessage.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/foreign/ForeignMessageTest.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-356
Modified: trunk/src/main/org/hornetq/api/jms/HornetQJMSConstants.java
===================================================================
--- trunk/src/main/org/hornetq/api/jms/HornetQJMSConstants.java 2010-04-09 16:35:58 UTC (rev 9087)
+++ trunk/src/main/org/hornetq/api/jms/HornetQJMSConstants.java 2010-04-09 17:43:11 UTC (rev 9088)
@@ -31,4 +31,7 @@
public static final String JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST = "HQ_BRIDGE_MSG_ID_LIST";
public static final int PRE_ACKNOWLEDGE = 100;
+
+ public static final String JMS_HORNETQ_ENABLE_BYTE_ARRAY_JMS_CORRELATION_ID_PROPERTY_NAME =
+ "hq.jms.support-bytes-id";
}
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-04-09 16:35:58 UTC (rev 9087)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-04-09 17:43:11 UTC (rev 9088)
@@ -99,8 +99,7 @@
for (Map.Entry<String, Object> entry : coreMessage.entrySet())
{
- if (entry.getKey().equals("type") ||
- entry.getKey().equals("durable") ||
+ if (entry.getKey().equals("type") || entry.getKey().equals("durable") ||
entry.getKey().equals("expiration") ||
entry.getKey().equals("timestamp") ||
entry.getKey().equals("priority"))
@@ -270,15 +269,36 @@
this(type, session);
setJMSTimestamp(foreign.getJMSTimestamp());
+
+ String value = System.getProperty(HornetQJMSConstants.JMS_HORNETQ_ENABLE_BYTE_ARRAY_JMS_CORRELATION_ID_PROPERTY_NAME);
- try
+ boolean supportBytesId = !"false".equals(value);
+
+ if (supportBytesId)
{
- byte[] corrIDBytes = foreign.getJMSCorrelationIDAsBytes();
- setJMSCorrelationIDAsBytes(corrIDBytes);
+ try
+ {
+ byte[] corrIDBytes = foreign.getJMSCorrelationIDAsBytes();
+ setJMSCorrelationIDAsBytes(corrIDBytes);
+ }
+ catch (JMSException e)
+ {
+ // specified as String
+ String corrIDString = foreign.getJMSCorrelationID();
+ if (corrIDString != null)
+ {
+ setJMSCorrelationID(corrIDString);
+ }
+ }
}
- catch (JMSException e)
+ else
{
- // specified as String
+ // Some providers, like WSMQ do automatic conversions between native byte[] correlation id
+ // and String correlation id. This makes it impossible for HQ to guarantee to return the correct
+ // type as set by the user
+ // So we allow the behaviour to be overridden by a system property
+ // https://jira.jboss.org/jira/browse/HORNETQ-356
+ // https://jira.jboss.org/jira/browse/HORNETQ-332
String corrIDString = foreign.getJMSCorrelationID();
if (corrIDString != null)
{
@@ -311,7 +331,7 @@
if (msgID == null)
{
SimpleString uid = message.getUserID();
-
+
msgID = uid == null ? null : uid.toString();
}
return msgID;
@@ -328,7 +348,7 @@
msgID = jmsMessageID;
}
-
+
public long getJMSTimestamp() throws JMSException
{
return message.getTimestamp();
@@ -382,7 +402,14 @@
{
if (jmsCorrelationID == null)
{
- jmsCorrelationID = message.getStringProperty(HornetQMessage.CORRELATIONID_HEADER_NAME);
+ try
+ {
+ jmsCorrelationID = message.getStringProperty(HornetQMessage.CORRELATIONID_HEADER_NAME);
+ }
+ catch (PropertyConversionException e)
+ {
+ jmsCorrelationID = null;
+ }
}
return jmsCorrelationID;
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/JMSCorrelationIDHeaderTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/JMSCorrelationIDHeaderTest.java 2010-04-09 16:35:58 UTC (rev 9087)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/JMSCorrelationIDHeaderTest.java 2010-04-09 17:43:11 UTC (rev 9088)
@@ -67,6 +67,7 @@
}
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/SimpleJMSMessage.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/SimpleJMSMessage.java 2010-04-09 16:35:58 UTC (rev 9087)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/SimpleJMSMessage.java 2010-04-09 17:43:11 UTC (rev 9088)
@@ -125,10 +125,7 @@
public String getJMSCorrelationID() throws JMSException
{
- if (isCorrelationIDBytes)
- {
- throw new JMSException("CorrelationID is a byte[] for this message");
- }
+
return correlationIDString;
}
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/foreign/ForeignMessageTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/foreign/ForeignMessageTest.java 2010-04-09 16:35:58 UTC (rev 9087)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/foreign/ForeignMessageTest.java 2010-04-09 17:43:11 UTC (rev 9088)
@@ -16,6 +16,7 @@
import javax.jms.Message;
import javax.jms.TextMessage;
+import org.hornetq.api.jms.HornetQJMSConstants;
import org.hornetq.jms.tests.message.MessageTestBase;
import org.hornetq.jms.tests.message.SimpleJMSMessage;
import org.hornetq.jms.tests.message.SimpleJMSTextMessage;
@@ -69,5 +70,69 @@
ProxyAssertSupport.assertNotNull(tm);
ProxyAssertSupport.assertEquals("hello from Brazil!", txt.getText());
}
+
+
+
+ public void testForeignMessageCorrelationIDBytesDisabled() throws Exception
+ {
+ System.setProperty(HornetQJMSConstants.JMS_HORNETQ_ENABLE_BYTE_ARRAY_JMS_CORRELATION_ID_PROPERTY_NAME, "false");
+
+ SimpleJMSMessage msg = new SimpleJMSMessage();
+
+ msg.setJMSCorrelationID("mycorrelationid");
+ byte[] bytes = new byte[] { 1, 4, 3, 6, 8};
+ msg.setJMSCorrelationIDAsBytes(bytes);
+ queueProd.send(msg);
+
+ Message rec = queueCons.receive();
+ ProxyAssertSupport.assertNotNull(rec);
+
+ assertNull(rec.getJMSCorrelationIDAsBytes());
+
+ assertEquals("mycorrelationid", msg.getJMSCorrelationID());
+ }
+
+ public void testForeignMessageCorrelationID() throws Exception
+ {
+ System.setProperty(HornetQJMSConstants.JMS_HORNETQ_ENABLE_BYTE_ARRAY_JMS_CORRELATION_ID_PROPERTY_NAME, "true");
+
+ SimpleJMSMessage msg = new SimpleJMSMessage();
+
+ msg.setJMSCorrelationID("mycorrelationid");
+ byte[] bytes = new byte[] { 1, 4, 3, 6, 8};
+ msg.setJMSCorrelationIDAsBytes(bytes);
+
+ queueProd.send(msg);
+
+ Message rec = queueCons.receive();
+ ProxyAssertSupport.assertNotNull(rec);
+
+ //Bytes correlation id takes precedence
+ byte[] bytesrec = rec.getJMSCorrelationIDAsBytes();
+
+ assertByteArraysEqual(bytes, bytesrec);
+
+ assertNull(rec.getJMSCorrelationID());
+ }
+
+ private void assertByteArraysEqual(final byte[] bytes1, final byte[] bytes2)
+ {
+ if (bytes1 == null | bytes2 == null)
+ {
+ ProxyAssertSupport.fail();
+ }
+
+ if (bytes1.length != bytes2.length)
+ {
+ ProxyAssertSupport.fail();
+ }
+
+ for (int i = 0; i < bytes1.length; i++)
+ {
+ ProxyAssertSupport.assertEquals(bytes1[i], bytes2[i]);
+ }
+
+ }
+
}
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9087 - trunk/examples/jms/send-acknowledgements/server0.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-04-09 12:35:58 -0400 (Fri, 09 Apr 2010)
New Revision: 9087
Modified:
trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml
Log:
https://jira.jboss.org/jira/browse/HORNETQ-272
Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml 2010-04-09 16:31:00 UTC (rev 9086)
+++ trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml 2010-04-09 16:35:58 UTC (rev 9087)
@@ -9,6 +9,7 @@
<entries>
<entry name="ConnectionFactory"/>
</entries>
+ <confirmation-window-size>1048576</confirmation-window-size>
</connection-factory>
<!--the queue used by the example-->
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9086 - in trunk: tests/jms-tests/src/org/hornetq/jms/tests/message and 1 other directory.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-04-09 12:31:00 -0400 (Fri, 09 Apr 2010)
New Revision: 9086
Modified:
trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageTestBase.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-304
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2010-04-09 14:36:35 UTC (rev 9085)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2010-04-09 16:31:00 UTC (rev 9086)
@@ -52,6 +52,8 @@
private TypedProperties map = new TypedProperties();
+ private boolean invalid = true;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -107,60 +109,70 @@
{
checkName(name);
map.putBooleanProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setByte(final String name, final byte value) throws JMSException
{
checkName(name);
map.putByteProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setShort(final String name, final short value) throws JMSException
{
checkName(name);
map.putShortProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setChar(final String name, final char value) throws JMSException
{
checkName(name);
map.putCharProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setInt(final String name, final int value) throws JMSException
{
checkName(name);
map.putIntProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setLong(final String name, final long value) throws JMSException
{
checkName(name);
map.putLongProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setFloat(final String name, final float value) throws JMSException
{
checkName(name);
map.putFloatProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setDouble(final String name, final double value) throws JMSException
{
checkName(name);
map.putDoubleProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setString(final String name, final String value) throws JMSException
{
checkName(name);
map.putSimpleStringProperty(new SimpleString(name), value == null ? null : new SimpleString(value));
+ invalid = true;
}
public void setBytes(final String name, final byte[] value) throws JMSException
{
checkName(name);
map.putBytesProperty(new SimpleString(name), value);
+ invalid = true;
}
public void setBytes(final String name, final byte[] value, final int offset, final int length) throws JMSException
@@ -173,6 +185,7 @@
byte[] newBytes = new byte[length];
System.arraycopy(value, offset, newBytes, 0, length);
map.putBytesProperty(new SimpleString(name), newBytes);
+ invalid = true;
}
public void setObject(final String name, final Object value) throws JMSException
@@ -223,6 +236,7 @@
{
throw new MessageFormatException("Invalid object type.");
}
+ invalid = true;
}
public boolean getBoolean(final String name) throws JMSException
@@ -390,12 +404,19 @@
super.clearBody();
map.clear();
+
+ invalid = true;
}
@Override
public void doBeforeSend() throws Exception
{
- map.encode(message.getBodyBuffer());
+ if (invalid)
+ {
+ message.getBodyBuffer().resetWriterIndex();
+
+ map.encode(message.getBodyBuffer());
+ }
super.doBeforeSend();
}
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageTestBase.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageTestBase.java 2010-04-09 14:36:35 UTC (rev 9085)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageTestBase.java 2010-04-09 16:31:00 UTC (rev 9086)
@@ -140,7 +140,40 @@
ProxyAssertSupport.assertNull(queueCons.receive(100));
}
+
+ public void testSendMoreThanOnce() throws Exception
+ {
+ prepareMessage(message);
+ session.close();
+ session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ queueProd = session.createProducer(HornetQServerTestCase.queue1);
+ queueProd.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ queueCons = session.createConsumer(HornetQServerTestCase.queue1);
+
+ queueProd.send(message);
+ queueProd.send(message);
+ queueProd.send(message);
+
+ Message r = queueCons.receive(500);
+
+ assertEquivalent(r, DeliveryMode.NON_PERSISTENT);
+
+ r = queueCons.receive(500);
+
+ assertEquivalent(r, DeliveryMode.NON_PERSISTENT);
+
+ r = queueCons.receive(500);
+
+ assertEquivalent(r, DeliveryMode.NON_PERSISTENT);
+
+ queueCons.close();
+ session.close();
+
+
+ }
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9085 - branches/HnetQ_323_cn/docs/user-manual/zh.
by do-not-reply＠jboss.org
Author: gaohoward
Date: 2010-04-09 10:36:35 -0400 (Fri, 09 Apr 2010)
New Revision: 9085
Modified:
branches/HnetQ_323_cn/docs/user-manual/zh/last-value-queues.xml
branches/HnetQ_323_cn/docs/user-manual/zh/message-grouping.xml
branches/HnetQ_323_cn/docs/user-manual/zh/queue-attributes.xml
branches/HnetQ_323_cn/docs/user-manual/zh/scheduled-messages.xml
Log:
done
Modified: branches/HnetQ_323_cn/docs/user-manual/zh/last-value-queues.xml
===================================================================
--- branches/HnetQ_323_cn/docs/user-manual/zh/last-value-queues.xml 2010-04-09 14:04:00 UTC (rev 9084)
+++ branches/HnetQ_323_cn/docs/user-manual/zh/last-value-queues.xml 2010-04-09 14:36:35 UTC (rev 9085)
@@ -17,30 +17,26 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
<chapter id="last-value-queues">
- <title>Last-Value Queues</title>
- <para>Last-Value queues are special queues which discard any messages when a newer message with
- the same value for a well-defined Last-Value property is put in the queue. In other words, a
- Last-Value queue only retains the last value.</para>
- <para>A typical example for Last-Value queue is for stock prices, where you are only interested
- by the latest value for a particular stock.</para>
+ <title>最新值队列（Last-Value Queues）</title>
+ <para>最新值队列是一种特殊的队列。当一个新消息到达一个最新值队列时，它会将所有与该消息定义的Last-Value相同的旧消息
+ 抛弃。换句话说，只有最新的消息被保留下来。</para>
+ <para>一个典型的用例是股价信息，通常你只关心一支股票的最新价格。</para>
<section>
- <title>Configuring Last-Value Queues</title>
- <para>Last-value queues are defined in the address-setting configuration:</para>
+ <title>最新值队列的配置</title>
+ <para>最新值队列的配置在address-setting内：</para>
<programlisting>
<address-setting match="jms.queue.lastValueQueue">
<last-value-queue>true</last-value-queue>
</address-setting>
</programlisting>
- <para>By default, <literal>last-value-queue</literal> is false. Address wildcards can be used
- to configure Last-Value queues for a set of addresses (see <xref linkend="wildcard-syntax"
- />).</para>
+ <para>默认的<literal>last-value-queue</literal>值是false。可以使用通配符来匹配地址。
+ （参见 <xref linkend="wildcard-syntax"/>）。</para>
</section>
<section>
- <title>Using Last-Value Property</title>
- <para>The property name used to identify the last value is <literal>"_HQ_LVQ_NAME"</literal>
- (or the constant <literal>Message.HDR_LAST_VALUE_NAME</literal> from the Core API).</para>
- <para>For example, if two messages with the same value for the Last-Value property are sent to
- a Last-Value queue, only the latest message will be kept in the queue:</para>
+ <title>使用Last-Value参数</title>
+ <para>用来标识最新值的参数名是<literal>"_HQ_LVQ_NAME"</literal>
+ （相当于核心API中定义的常量<literal>Message.HDR_LAST_VALUE_NAME</literal>）。</para>
+ <para>如果两个消息具有相同的Last-Value值，那么较新的消息就会保留，另外一个被丢弃：</para>
<programlisting>
// send 1st message with Last-Value property set to STOCK_NAME
TextMessage message =
@@ -63,8 +59,8 @@
</programlisting>
</section>
<section>
- <title>Example</title>
- <para>See <xref linkend="examples.last-value-queue"/> for an example which shows how last
- value queues are configured and used with JMS.</para>
+ <title>例子</title>
+ <para>参见<xref linkend="examples.last-value-queue"/>。它展示的是在JMS应用中来配置和使用
+ 最新值队列。</para>
</section>
</chapter>
Modified: branches/HnetQ_323_cn/docs/user-manual/zh/message-grouping.xml
===================================================================
--- branches/HnetQ_323_cn/docs/user-manual/zh/message-grouping.xml 2010-04-09 14:04:00 UTC (rev 9084)
+++ branches/HnetQ_323_cn/docs/user-manual/zh/message-grouping.xml 2010-04-09 14:36:35 UTC (rev 9085)
@@ -17,41 +17,31 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
<chapter id="message-grouping">
- <title>Message Grouping</title>
- <para>Message groups are sets of messages that have the following characteristics:</para>
+ <title>消息分组</title>
+ <para>消息组是具有下列特性的消息集合：</para>
<itemizedlist>
<listitem>
- <para>Messages in a message group share the same group id, i.e. they have same group
- identifier property (<literal>JMSXGroupID</literal> for JMS, <literal
- >_HQ_GROUP_ID</literal> for HornetQ Core API).</para>
+ <para>在一个消息组中的消息有相同的组标识（id），即它们的<literal>JMSXGroupID</literal>（JMS）或
+ <literal>_HQ_GROUP_ID</literal>（HornetQ核心）的值相同。</para>
</listitem>
<listitem>
- <para>Messages in a message group are always consumed by the same consumer, even if there
- are many consumers on a queue. They pin all messages with the same group id to the same
- consumer. If that consumer closes another consumer is chosen and will receive all
- messages with the same group id.</para>
+ <para>不管存在多少个接收者（consumer），一个消息组的所有消息总是被同一个接收者所接收。一个组id总是
+ 与同一个接收者相关联。如果这个接收者被关闭，另外一个接收者就被选中来代替它接收该消息组的消息。</para>
</listitem>
</itemizedlist>
- <para>Message groups are useful when you want all messages for a certain value of the property to
- be processed serially by the same consumer.</para>
- <para>An example might be orders for a certain stock. You may want orders for any particular
- stock to be processed serially by the same consumer. To do this you can create a pool of
- consumers (perhaps one for each stock, but less will work too), then set the stock name as the
- value of the _HQ_GROUP_ID property.</para>
- <para>This will ensure that all messages for a particular stock will always be processed by the
- same consumer.</para>
+ <para>消息组在需要同一个接收者按顺序处理某类消息的时候很有用。</para>
+ <para>一支股票的订购就是一个例子。某支股票的订单需要同一个接收者按顺序处理。于是可以每支股票有一个接收者
+ 来处理（也可以用少一些的接收者），然后将每支股票的名字设在消息的_HQ_GROUP_ID参数中。</para>
+ <para>这样可以保证一支股票的消息只被同一个接收者处理。</para>
<section>
- <title>Using Core API</title>
- <para>The property name used to identify the message group is <literal
- >"_HQ_GROUP_ID""</literal> (or the constant <literal
- >MessageImpl.HDR_GROUP_ID</literal>). Alternatively, you can set <literal
- >autogroup</literal> to true on the <literal>SessionFactory</literal> which will pick a
- random unique id. </para>
+ <title>使用核心接口</title>
+ <para>用来标识一个消息组的参数是 <literal>"_HQ_GROUP_ID""</literal> （或者相应的常量<literal
+ >MessageImpl.HDR_GROUP_ID</literal>）。另一种方法是在<literal>SessionFactory</literal>
+ 中将<literal>autogroup</literal>设置为true。这样做的话组id是随机给出的。</para>
</section>
<section id="message-grouping.jmsconfigure">
- <title>Using JMS</title>
- <para>The property name used to identify the message group is <literal
- >JMSXGroupID</literal>.</para>
+ <title>使用JMS</title>
+ <para>用来标识一个消息组的参数是<literal>JMSXGroupID</literal>。</para>
<programlisting>
// send 2 messages in the same group to ensure the same
// consumer will receive both
@@ -63,9 +53,8 @@
message.setStringProperty("JMSXGroupID", "Group-0");
producer.send(message);
</programlisting>
- <para>Alternatively, you can set <literal>autogroup</literal> to true on the <literal
- >HornetQConnectonFactory</literal> which will pick a random unique id. This can also be
- set in the <literal>hornetq-jms.xml</literal> file like this:</para>
+ <para>另一个方法是将<literal>HornetQConnectonFactory</literal>的<literal>autogroup</literal>
+ 属性设为true，或者在<literal>hornetq-jms.xml</literal>文件中进行配置：</para>
<programlisting><connection-factory name="ConnectionFactory">
<connectors>
<connector-ref connector-name="netty-connector"/>
@@ -75,11 +64,9 @@
</entries>
<autogroup>true</autogroup>
</connection-factory></programlisting>
- <para>Alternatively you can set the group id via the connection factory. All messages sent
- with producers created via this connection factory will set the <literal
- >JMSXGroupID</literal> to the specified value on all messages sent. To configure the
- group id set it on the connection factory in the <literal>hornetq-jms.xml</literal> config
- file as follows
+ <para>还可以通过连接工厂来设置组id。来自这个连接工厂的所有的发送者（producer）发送的消息的<literal
+ >JMSXGroupID</literal>将具有指定的值。这种方法需要在<literal>hornetq-jms.xml</literal>
+ 文件中作如下配置：
<programlisting>
<connection-factory name="ConnectionFactory">
<connectors>
@@ -93,32 +80,27 @@
</programlisting></para>
</section>
<section>
- <title>Example</title>
- <para>See <xref linkend="examples.message-group"/> for an example which shows how message
- groups are configured and used with JMS.</para>
+ <title>例子</title>
+ <para>参见<xref linkend="examples.message-group"/>。这个例子展示的是在JMS中如何配置与使用消息组。</para>
</section>
<section>
- <title>Example</title>
- <para>See <xref linkend="examples.message-group2"/> for an example which shows how message
- groups are configured via a connection factory.</para>
+ <title>例子</title>
+ <para><xref linkend="examples.message-group2"/>是另外一个消息组的例子，在这个例子中通过配置连接工厂
+ 来使用消息组。</para>
</section>
<section>
- <title> Clustered Grouping</title>
- <para>Using message groups in a cluster is a bit more complex. This is because messages with a
- particular group id can arrive on any node so each node needs to know about which group
- id's are bound to which consumer on which node. The consumer handling messages for a
- particular group id may be on a different node of the cluster, so each node needs to know
- this information so it can route the message correctly to the node which has that consumer. </para>
- <para>To solve this there is the notion of a grouping handler. Each node will have its own
- grouping handler and when a messages is sent with a group id assigned, the handlers will
- decide between them which route the message should take.</para>
- <para>There are 2 types of handlers; Local and Remote. Each cluster should choose 1 node to
- have a local grouping handler and all the other nodes should have remote handlers- it's the
- local handler that actually makes the decsion as to what route should be used, all the
- other remote handlers converse with this. Here is a sample config for both types of
- handler, this should be configured in the <emphasis role="italic"
- >hornetq-configuration.xml</emphasis>
- file.<programlisting> <grouping-handler name="my-grouping-handler">
+ <title>集群中的消息组</title>
+ <para>在集群中使用消息组是相对比较复杂的。这是因在在集群中，一个消息组中的消息有可能被送到集群中的任一全节点，
+ 这就要求每个节点都要知道这个消息是属于哪个节点上的哪个接收者（consumer）。一个消息组的消息往往会被发送到
+ 集群中的一个节点，而该消息组的接收者在另一个节点上。每个节点都要知道这些细节以便能将消息正确路由到所属接收
+ 者所在的节点上。</para>
+ <para>为了解决上述问题，我们使用了消息组处理器。每个节点都有一个自己的消息组处理器。当一个带有组id的消息收到时，
+ 这些节点的消息组处理器就会协同作出决定该如何对这个消息进行路由。</para>
+ <para>消息组处理器有两种：本地消息组处理器和远程消息组处理器。在一个集群中要选择一个节点作为本地消息组处理器的
+ 节点，集群中所有其它的节点都持有远程消息组处理器。在集群中由本地消息组处理器最終决定消息怎样路由，其它的远程
+ 处理器配合本地处理器完成决策。消息组处理器的配置在<emphasis role="italic">hornetq-configuration.xml</emphasis>
+ 文件中，下面就是一个例子：
+<programlisting> <grouping-handler name="my-grouping-handler">
<type>LOCAL</type>
<address>jms</address>
<timeout>5000</timeout>
@@ -129,57 +111,39 @@
<address>jms</address>
<timeout>5000</timeout>
</grouping-handler></programlisting></para>
- <para>The <emphasis role="italic">address</emphasis> attribute refers to a cluster connection
- and the address it uses, refer to the clustering section on how to configure clusters. The
- <emphasis role="italic">timeout</emphasis> attribute referes to how long to wait for a
- decision to be made, an exception will be thrown during the send if this timeout is
- reached, this ensures that strict ordering is kept.</para>
- <para>The decision as to where a message should be routed to is initially proposed by the node
- that receives the message. The node will pick a suitable route as per the normal clustered
- routing conditions, i.e. round robin available queues, use a local queue first and choose a
- queue that has a consumer. If the proposal is excepted by the grouping handlers the node
- will route messages to this queue from that point on, if rejected an alternative route will
- be offered and the node will again route to that queue indefinitely. All other nodes will
- also route to the queue chosen at proposal time. Once the message arrives at the queue then
- normal single server message group semantics take over and the message is pinned to a
- consumer on that queue.</para>
- <para>You may have noticed that there is a single point of failure with the single local
- handler. If this node crashes then no decisions will be able to be made. Any messages sent
- will be not be delivered and an exception thrown. To avoid this happening Local Handlers
- can be replicated on another backup node. Simple create your back up node and configure it
- with the same Local handler.</para>
+ <para><emphasis role="italic">address</emphasis>属性表示一个集群的连接以及它使用的地址。有关如何配置集群
+ 参见集群章节。<emphasis role="italic">timeout</emphasis>属性代表做出路由决定所需要等待的时间。如果超过
+ 了这个时间还没有做出决定，则会抛出异常。这可以保证严格的顺序。</para>
+ <para>收到消息的节点会首先提出一个消息路由的建议。它采用轮询方式来选择一个合适的路由。它首先选择一个本地的队列，之后
+ 再选择一个有接收者的队列。如果这个建议被所有组处理器接受，消息就会被路由到所选的队列。如果被拒绝就提出另一个路
+ 由方案，如此反复直到方案被接受为止。队列选择后所有其它的节点都将消息路由到这个队列。这样所有的消息组的消息在一个
+ 节点上进行处理，也就是该节点上的接收者接收所有的同组的消息。</para>
+ <para>由于只有一个本地处理器，如果它的节点出现故障则无法做出决定。这时所有的消息将不能被传递，并且会抛出异常。
+ 为了避免这一单点故障，本地处理器可以在备份节点上有一个复本。只要创建备份节点并配置一个相同的本地处理器即可。</para>
<para/>
<section>
- <title>Clustered Grouping Best Practices</title>
- <para>Some best practices should be followed when using clustered grouping:<orderedlist>
+ <title>集群消息组的最佳使用惯例</title>
+ <para>下面是一些很好的建议：<orderedlist>
<listitem>
- <para>Make sure your consumers are distributed evenly across the different nodes
- if possible. This is only an issue if you are creating and closing consumers
- regularly. Since messages are always routed to the same queue once pinned,
- removing a consumer from this queue may leave it with no consumers meaning the
- queue will just keep receiving the messages. Avoid closing consumers or make
- sure that you always have plenty of consumers, i.e., if you have 3 nodes have 3
- consumers.</para>
+ <para>尽可能使接收者均匀分布在不同的节点上。由于消息组的消息总是传递到同一个队列的同一个接收者，
+ 如果你经常性地创建与关闭接收者，就可能出现消息由于没有接收者而传递不出去，造成消息在队列中
+ 不断积累的情况。因此，尽量要避免关闭接收者，或者确保有足够数量的接收者。例如，如果你的集群
+ 有3个节点，那么就创建3个接收者。</para>
</listitem>
<listitem>
- <para>Use durable queues if possible. If queues are removed once a group is bound
- to it, then it is possible that other nodes may still try to route messages to
- it. This can be avoided by making sure that the queue is deleted by the session
- that is sending the messages. This means that when the next message is sent it
- is sent to the node where the queue was deleted meaning a new proposal can
- succesfully take place. Alternatively you could just start using a different
- group id.</para>
+ <para>尽可能使用持久型队列。如果消息组的消息与一个队列绑定，一旦这个队列被删除，其它节点可能仍然
+ 尝试向这个已删除的队列路由消息。为避免这种情况，要确保这个队列由发送消息的会话来删除。这样如果
+ 下一个消息发出后发现原来的队列被删除，新的路由建议就会提出。另外一种方案是你可以重新使用一个不
+ 同的组ID。</para>
</listitem>
<listitem>
- <para>Always make sure that the node that has the Local Grouping Handler is
- replicated. These means that on failover grouping will still occur.</para>
+ <para>一定要确保本地的消息组处理器有备份。这样在有故障时消息组仍然可以正常工作。</para>
</listitem>
</orderedlist></para>
</section>
<section>
- <title>Clustered Grouping Example</title>
- <para>See <xref linkend="examples.clustered.grouping"/> for an example of how to configure
- message groups with a HornetQ cluster</para>
+ <title>集群消息组例子</title>
+ <para>参见<xref linkend="examples.clustered.grouping"/>，这个例子给出了如何在HornetQ集群中配置消息组。</para>
</section>
</section>
</chapter>
Modified: branches/HnetQ_323_cn/docs/user-manual/zh/queue-attributes.xml
===================================================================
--- branches/HnetQ_323_cn/docs/user-manual/zh/queue-attributes.xml 2010-04-09 14:04:00 UTC (rev 9084)
+++ branches/HnetQ_323_cn/docs/user-manual/zh/queue-attributes.xml 2010-04-09 14:36:35 UTC (rev 9085)
@@ -17,34 +17,27 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
<chapter id="queue-attributes">
- <title>Queue Attributes</title>
- <para>Queue attributes can be set in one of two ways. Either by configuring them using the
- configuration file or by using the core API. This chapter will explain how to configure each
- attribute and what effect the attribute has.</para>
+ <title>队列属性</title>
+ <para>有两种方法可以设置队列的属性。一种使用配置文件，另一种使用核心接口（core API）。
+ 本章讲述这些属性的配置以及这些属性的作用。</para>
<section id="predefined.queues">
- <title>Predefined Queues</title>
- <para>Queues can be predefined via configuration at a core level or at a JMS level. Firstly
- lets look at a JMS level.</para>
- <para>The following shows a queue predefined in the <literal>hornetq-jms.xml</literal>
- configuration file.</para>
+ <title>预定义的队列</title>
+ <para>通过配置可以定义队列。队列的定义可以在核心层定义，也可以在JMS层来定义。首先我们看一下JMS层。</para>
+ <para>下面就是一个在<literal>hornetq-jms.xml</literal>中定义的一个队列的例子：</para>
<programlisting><queue name="selectorQueue">
<entry name="/queue/selectorQueue"/>
<selector string="color='red'"/>
<durable>true</durable>
</queue></programlisting>
- <para>This name attribute of queue defines the name of the queue. When we do this at a jms
- level we follow a naming convention so the actual name of the core queue will be
- <literal>jms.queue.selectorQueue</literal>.</para>
- <para>The entry element configures the name that will be used to bind the queue to JNDI.
- This is a mandatory element and the queue can contain multiple of these to bind the same
- queue to different names.</para>
- <para>The selector element defines what JMS message selector the predefined queue will have.
- Only messages that match the selector will be added to the queue. This is an optional
- element with a default of null when omitted.</para>
- <para>The durable element specifies whether the queue will be persisted. This again is
- optional and defaults to true if omitted.</para>
- <para>Secondly a queue can be predefined at a core level in the <literal
- >hornetq-configuration.xml</literal> file. The following is an example.</para>
+ <para>这个队列的name属性定义了队列的名字。例子中我们采用了一种命名的惯例，因些对应的核心队列的名字是
+ <literal>jms.queue.selectorQueue</literal>。</para>
+ <para>在entry单元内定义的名字用来将队列绑定于JNDI。这是必不可少的。一个队列可以有多个entry定义，每个
+ 定义中的名字都绑定到同一个队列。</para>
+ <para>selector单元定义的是队列的选择器。定义了选择器后，只有与选择器相匹配的消息才能被加到队列中。
+ 这是一个可选项。如果没有定义选择器，队列将默认没有选择器。</para>
+ <para>durable定义了队列是否是一个可持久的队列。这也是一个可选项，默认值是true。</para>
+ <para>如果在核心层定义队列，则使用<literal>hornetq-configuration.xml</literal>文件。
+ 下面是一个例子：</para>
<programlisting><queues>
<queue name="jms.queue.selectorQueue">
<address>jms.queue.selectorQueue</address>
@@ -52,43 +45,36 @@
<durable>true</durable>
</queue>
</queues></programlisting>
- <para>This is very similar to the JMS configuration, with 3 real differences which
- are.</para>
+ <para>它的配置与JMS的配置很相似，但有三个不同之处：</para>
<orderedlist>
<listitem>
- <para>The name attribute of queue is the actual name used for the queue with no
- naming convention as in JMS.</para>
+ <para>队列的name属性是队列的真正名字，不是JMS中的名字。</para>
</listitem>
<listitem>
- <para>The address element defines what address is used for routing messages.</para>
+ <para>address一项定义了消息路由的地址。</para>
</listitem>
<listitem>
- <para>There is no entry element.</para>
+ <para>没有entry单元。</para>
</listitem>
<listitem>
- <para>The filter uses the <emphasis>Core filter syntax</emphasis> (described in
- <xref linkend="filter-expressions"/>), <emphasis>not</emphasis> the JMS
- selector syntax.</para>
+ <para>filter的定义使用<emphasis>核心过滤器语法</emphasis> （在
+ <xref linkend="filter-expressions"/>中描述），不是JMS的选择器语法。</para>
</listitem>
</orderedlist>
</section>
<section>
- <title>Using the API</title>
- <para>Queues can also be created using the core API or the management API.</para>
- <para>For the core API, queues can be created via the <literal
- >org.hornetq.api.core.client.ClientSession</literal> interface. There are multiple
- <literal>createQueue</literal> methods that support setting all of the previously
- mentioned attributes. There is one extra attribute that can be set via this API which is
- <literal>temporary</literal>. setting this to true means that the queue will be
- deleted once the session is disconnected.</para>
- <para>Take a look at <xref linkend="management"/> for a description of the management API
- for creating queues.</para>
+ <title>使用接口（API）创建队列</title>
+ <para>队列还可以使用核心接口或管理接口来创建。</para>
+ <para>核心接口的<literal>org.hornetq.api.core.client.ClientSession</literal>接口可以用来
+ 创建队列。它有几个<literal>createQueue</literal>方法，可以在创建队列时对上述的属性进行设置。
+ 除此之外，还有一个额外的属性<literal>temporary</literal>可以设置。如果将其设为true，
+ 那么队列在会话断开时将被删除。</para>
+ <para>在<xref linkend="management"/>中讲述了如何用管理接口来创建队列。</para>
</section>
<section id="queue-attributes.address-settings">
- <title>Configuring Queues Via Address Settings</title>
- <para>There are some attributes that are defined against an address wildcard rather than a
- specific queue. Here an example of an <literal>address-setting</literal> entry that
- would be found in the <literal>hornetq-configuration.xml</literal> file.</para>
+ <title>通过地址设置来配置队列属性</title>
+ <para>有些属性的定义中地址可以使用通配符。下面是<literal>hornetq-configuration.xml</literal>
+ 文件中的一个<literal>address-setting</literal>的配置例子。</para>
<programlisting><address-settings>
<address-setting match="jms.queue.exampleQueue">
<dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
@@ -103,43 +89,32 @@
<address-full-policy>PAGE</address-full-policy>
</address-setting>
</address-settings></programlisting>
- <para>The idea with address settings, is you can provide a block of settings which will be
- applied against any adresses that match the string in the <literal>match</literal> attribute. In the
- above example the settings would only be applied to any addresses which exactly match
- the address <literal>jms.queue.exampleQueue</literal>, but you can also use wildcards to apply sets of
- configuration against many addresses. The wildcard syntax used is described <link linkend="wildcard-syntax">here</link>.</para>
- <para>For example, if you used the <literal>match</literal> string <literal>jms.queue.#</literal> the settings would be applied
- to all addresses which start with <literal>jms.queue.</literal> which would be all JMS queues.</para>
- <para>The meaning of the specific settings are explained fully throughout the user manual, however here is a brief
- description with a link to the appropriate chapter if available. </para>
- <para><literal>max-delivery-attempts</literal> defines how many time a cancelled message can
- be redelivered before sending to the <literal>dead-letter-address</literal>. A full
- explanation can be found <link linkend="undelivered-messages.configuring"
- >here</link>.</para>
- <para><literal>redelivery-delay</literal> defines how long to wait before attempting
- redelivery of a cancelled message. see <link linkend="undelivered-messages.delay"
- >here</link>.</para>
- <para><literal>expiry-address</literal> defines where to send a message that has expired.
- see <link linkend="message-expiry.configuring">here</link>.</para>
- <para><literal>last-value-queue</literal> defines whether a queue only uses last values or
- not. see <link linkend="last-value-queues">here</link>.</para>
- <para><literal>max-size-bytes</literal> and <literal>page-size-bytes</literal> are used to
- set paging on an address. This is explained <link linkend="paging">here</link>.</para>
- <para><literal>redistribution-delay</literal> defines how long to wait when the last
- consumer is closed on a queue before redistributing any messages. see <link
- linkend="clusters.message-redistribution">here</link>.</para>
- <para><literal>send-to-dla-on-no-route</literal>. If a message is sent to an address, but the server does not route it to any queues,
- for example, there might be no queues bound to that address, or none of the queues have filters that match, then normally that message
- would be discarded. However if this parameter is set to true for that address, if the message is not routed to any queues it will instead
- be sent to the dead letter address (DLA) for that address, if it exists.</para>
- <para><literal>address-full-policy</literal>. This attribute can have one of the following values: PAGE, DROP or BLOCK and determines what happens when
- an address where <literal>max-size-bytes</literal> is specified becomes full. The default value is PAGE. If the value is PAGE then further messages will be paged to disk.
- If the value is DROP then further messages will be silently dropped.
- If the value is BLOCK then client message producers will block when they try and send further messages.
-
- See the following chapters for more info <xref linkend="flow-control"/>, <xref linkend="paging"/>.
+ <para>通过上述的地址设定可以将多个属性应用于所有与<literal>match</literal>属性相匹配的地址。
+ 上面例子中所定义的属性应用于<literal>jms.queue.exampleQueue</literal>的地址。如果使用
+ 通配符，就可以将这些属性应用于一组匹配的地址。通配符的详细说明在<link linkend="wildcard-syntax">这里</link>。</para>
+ <para>例如在<literal>match</literal>中定义字符串<literal>jms.queue.#</literal>，那么
+ 定义的属性就会应用于所有以<literal>jms.queue.</literal>开头的地址－－即所有的JMS队列。</para>
+ <para>这些属性在本手册的各个地方有相应的介绍。在此处给出了简单的解释各它所在章的连接。</para>
+ <para><literal>max-delivery-attempts</literal>定义了最大重传递的次数。一个消息如果反复传递超过
+ 了这个值将会被发往死信地址<literal>dead-letter-address</literal>。相关的完整的解释在
+ <link linkend="undelivered-messages.configuring">这里</link>。</para>
+ <para><literal>redelivery-delay</literal>定义了重新传递的延迟。它控制HornetQ在重新
+ 传递一个被取消的消息时要等待的时间。参见<link linkend="undelivered-messages.delay"
+ >这里</link>。</para>
+ <para><literal>expiry-address</literal>定义了过期消息的发送地址。参见<link linkend="message-expiry.configuring">这里</link>。</para>
+ <para><literal>last-value-queue</literal> 定义一个队列是否使用最新值。参见<link linkend="last-value-queues">这里</link>。</para>
+ <para><literal>max-size-bytes</literal>和<literal>page-size-bytes</literal>用来设置地址的分页转存功能。
+ 它们在<link linkend="paging">这里</link>有详细的解释。</para>
+ <para><literal>redistribution-delay</literal>定义了当最后一个接收者关闭时重新分配队列消息前所等待的时间。
+ 参见<link linkend="clusters.message-redistribution">这里</link>。</para>
+ <para><literal>send-to-dla-on-no-route</literal>。当一个消息被送到某个地址时，可能不会被路由到任何一个队列。
+ 例如该地址没有绑定任何队列的情况，或者它所有的队列的选择器与该消息不匹配时。这样的消息通常情况下会被丢弃。这时
+ 如果将这个参数设为true，则如果这个地址配置了死信地址的话，这样的消息就会被发送到该地址的死信地址（DLA）。</para>
+ <para><literal>address-full-policy</literal>。这个属性有三个可能的值：PAGE、 DROP 或 BLOCK。它决定了
+ 如果地址的消息所占用的内存达到了<literal>max-size-bytes</literal>所定义的值时，如何处理后继到来的消息。
+ 默认值是PAGE，就是将后续的消息分页转存到磁盘上。DROP则表示丢弃后续的消息。BLOCK表示阻塞消息的发送方发送后续
+ 的消息。参见<xref linkend="flow-control"/>和<xref linkend="paging"/>。
</para>
-
-
+
</section>
</chapter>
Modified: branches/HnetQ_323_cn/docs/user-manual/zh/scheduled-messages.xml
===================================================================
--- branches/HnetQ_323_cn/docs/user-manual/zh/scheduled-messages.xml 2010-04-09 14:04:00 UTC (rev 9084)
+++ branches/HnetQ_323_cn/docs/user-manual/zh/scheduled-messages.xml 2010-04-09 14:36:35 UTC (rev 9085)
@@ -17,18 +17,15 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
<chapter id="scheduled-messages">
- <title>Scheduled Messages</title>
- <para>Scheduled messages differ from normal messages in that they won't be delivered until a
- specified time in the future, at the earliest.</para>
- <para>To do this, a special property is set on the message before sending it.</para>
+ <title>定期消息</title>
+ <para>与普通消息不同，定期消息是在未来某个指定时间发送的消息。</para>
+ <para>为了创建定期消息，需要设定一个特殊的参数.</para>
<section>
- <title>Scheduled Delivery Property</title>
- <para>The property name used to identify a scheduled message is <literal
- >"_HQ_SCHED_DELIVERY"</literal> (or the constant <literal
- >Message.HDR_SCHEDULED_DELIVERY_TIME</literal>).</para>
- <para>The specified value must be a <literal>long</literal> corresponding to the time the
- message must be delivered (in milliseconds). An example of sending a scheduled message
- using the JMS API is as follows.</para>
+ <title>定期传递参数</title>
+ <para>用来标识一个定期消息的参数是<literal
+ >"_HQ_SCHED_DELIVERY"</literal> （相当于常量<literal
+ >Message.HDR_SCHEDULED_DELIVERY_TIME</literal>）。</para>
+ <para>这个参数的值必须是一个长整型，单位是毫秒。下面例子给出了使用JMS接口创建定期消息的方法：</para>
<programlisting>
TextMessage message =
session.createTextMessage("This is a scheduled message message which will be delivered
@@ -41,12 +38,10 @@
// message will not be received immediately but 5 seconds later
TextMessage messageReceived = (TextMessage) consumer.receive();
</programlisting>
- <para>Scheduled messages can also be sent using the core API, by setting the same property on
- the core message before sending.</para>
+ <para>也可以使用核心接口来发送定期消息。它只需要将同样的参数设定到核心消息上即可。</para>
</section>
<section>
- <title>Example</title>
- <para>See <xref linkend="examples.scheduled-message"/> for an example which shows how
- scheduled messages can be used with JMS.</para>
+ <title>例子</title>
+ <para>参见<xref linkend="examples.scheduled-message"/>，它是一个JMS使用定期消息的例子。</para>
</section>
</chapter>
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9084 - in trunk: examples/javaee/mdb-bmt/server and 102 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-04-09 10:04:00 -0400 (Fri, 09 Apr 2010)
New Revision: 9084
Modified:
trunk/docs/user-manual/en/security.xml
trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
trunk/examples/jms/applet/server0/hornetq-configuration.xml
trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml
trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml
trunk/examples/jms/bridge/server0/hornetq-configuration.xml
trunk/examples/jms/bridge/server1/hornetq-configuration.xml
trunk/examples/jms/browser/server0/hornetq-configuration.xml
trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml
trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml
trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml
trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml
trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml
trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml
trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml
trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml
trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml
trunk/examples/jms/divert/server0/hornetq-configuration.xml
trunk/examples/jms/divert/server1/hornetq-configuration.xml
trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml
trunk/examples/jms/expiry/server0/hornetq-configuration.xml
trunk/examples/jms/http-transport/server0/hornetq-configuration.xml
trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml
trunk/examples/jms/interceptor/server0/hornetq-configuration.xml
trunk/examples/jms/jaas/server0/hornetq-configuration.xml
trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml
trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml
trunk/examples/jms/jmx/server0/hornetq-configuration.xml
trunk/examples/jms/large-message/server0/hornetq-configuration.xml
trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml
trunk/examples/jms/management-notifications/readme.html
trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml
trunk/examples/jms/management/server0/hornetq-configuration.xml
trunk/examples/jms/message-counters/server0/hornetq-configuration.xml
trunk/examples/jms/message-group/server0/hornetq-configuration.xml
trunk/examples/jms/message-group2/server0/hornetq-configuration.xml
trunk/examples/jms/message-priority/server0/hornetq-configuration.xml
trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml
trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml
trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml
trunk/examples/jms/paging/server0/hornetq-configuration.xml
trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml
trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml
trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml
trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml
trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml
trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml
trunk/examples/jms/queue/server0/hornetq-configuration.xml
trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml
trunk/examples/jms/request-reply/server0/hornetq-configuration.xml
trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml
trunk/examples/jms/security/readme.html
trunk/examples/jms/security/server0/hornetq-configuration.xml
trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml
trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml
trunk/examples/jms/static-selector/server0/hornetq-configuration.xml
trunk/examples/jms/stomp/server0/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml
trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml
trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml
trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml
trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml
trunk/examples/jms/topic/server0/hornetq-configuration.xml
trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml
trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml
trunk/examples/jms/transactional/server0/hornetq-configuration.xml
trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml
trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml
trunk/examples/jms/xa-send/server0/hornetq-configuration.xml
trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml
trunk/src/config/jboss-as/clustered/hornetq-configuration.xml
trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml
trunk/src/config/stand-alone/clustered/hornetq-configuration.xml
trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml
trunk/src/config/trunk/clustered/hornetq-configuration.xml
trunk/src/config/trunk/non-clustered/hornetq-configuration.xml
trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
trunk/src/main/org/hornetq/core/persistence/config/PersistedRoles.java
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
trunk/src/main/org/hornetq/utils/SecurityFormatter.java
trunk/tests/config/ConfigurationTest-full-config.xml
trunk/tests/jms-tests/config/hornetq-queues.xml
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-309: Consistent naming of non-durable queues permissions
* make sure we consistently use createNonDurableQueue/deleteNonDurableQueue permissions in the code, example, doc, etc.
* for compatibility sake, createTempQueue/deleteTempQueue is still supported by the XML configuration file but is not advertised by the doc
Modified: trunk/docs/user-manual/en/security.xml
===================================================================
--- trunk/docs/user-manual/en/security.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/docs/user-manual/en/security.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -47,12 +47,12 @@
delete a durable queue under matching addresses.</para>
</listitem>
<listitem>
- <para><literal>createTempQueue</literal>. This permission allows the user to create
- a temporary queue under matching addresses.</para>
+ <para><literal>createNonDurableQueue</literal>. This permission allows the user to create
+ a non-durable queue under matching addresses.</para>
</listitem>
<listitem>
- <para><literal>deleteTempQueue</literal>. This permission allows the user to delete
- a temporarry queue under matching addresses.</para>
+ <para><literal>deleteNonDurableQueue</literal>. This permission allows the user to delete
+ a non-durable queue under matching addresses.</para>
</listitem>
<listitem>
<para><literal>send</literal>. This permission allows the user to send a message to
@@ -78,8 +78,8 @@
<security-setting match="globalqueues.europe.#">
<permission type="createDurableQueue" roles="admin"/>
<permission type="deleteDurableQueue" roles="admin"/>
- <permission type="createTempQueue" roles="admin, guest, europe-users"/>
- <permission type="deleteTempQueue" roles="admin, guest, europe-users"/>
+ <permission type="createNonDurableQueue" roles="admin, guest, europe-users"/>
+ <permission type="deleteNonDurableQueue" roles="admin, guest, europe-users"/>
<permission type="send" roles="admin, europe-users"/>
<permission type="consume" roles="admin, europe-users"/>
</security-setting>
@@ -124,8 +124,8 @@
'globalqueues.europe.orders.plastics' the only permissions that exist are <literal
>send</literal> and <literal>consume</literal> for the role europe-users. The
permissions <literal>createDurableQueue</literal>, <literal
- >deleteDurableQueue</literal>, <literal>createTempQueue</literal>, <literal
- >deleteTempQueue</literal> are not inherited from the other security-setting
+ >deleteDurableQueue</literal>, <literal>createNonDurableQueue</literal>, <literal
+ >deleteNonDurableQueue</literal> are not inherited from the other security-setting
block.</para>
<para>By not inheriting permissions, it allows you to effectively deny permissions in more
specific security-setting blocks by simply not specifying them. Otherwise it would not
Modified: trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/applet/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/applet/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/applet/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/bridge/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/bridge/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -52,8 +52,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/bridge/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/bridge/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/browser/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/browser/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/browser/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -46,8 +46,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -47,8 +47,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -45,8 +45,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -62,8 +62,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -61,8 +61,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -61,8 +61,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -55,8 +55,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -55,8 +55,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/divert/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/divert/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/divert/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -74,8 +74,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/divert/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/divert/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/divert/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -25,8 +25,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/expiry/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/expiry/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/expiry/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/http-transport/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -28,8 +28,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/interceptor/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/interceptor/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -28,8 +28,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/jaas/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/jaas/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/jaas/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.#">
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
</security-setting>
</security-settings>
</configuration>
Modified: trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.#">
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
</security-setting>
</security-settings>
</configuration>
Modified: trunk/examples/jms/jmx/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/jmx/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/jmx/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/large-message/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/large-message/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/large-message/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.lastValueQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/management/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/management/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/management/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
@@ -36,8 +36,8 @@
<!-- security settings for JMS temporary queue -->
<security-setting match="jms.queue.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/management-notifications/readme.html
===================================================================
--- trunk/examples/jms/management-notifications/readme.html 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/management-notifications/readme.html 2010-04-09 14:04:00 UTC (rev 9084)
@@ -36,8 +36,8 @@
<code><!--security for notification topic-->
<security-setting match="jms.topic.notificationsTopic">
<permission type="consume" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
</security-setting></code>
</pre>
Modified: trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
@@ -33,14 +33,14 @@
<!--security for notification queue-->
<security-setting match="jms.topic.notificationsTopic">
<permission type="consume" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
</security-setting>
<!-- security settings for JMS temporary queue -->
<security-setting match="queuetempjms.*">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/message-counters/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/message-counters/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -28,8 +28,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
@@ -38,8 +38,8 @@
<security-setting match="jms.queue.expiryQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/message-group/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/message-group/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/message-group/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/message-group2/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/message-group2/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/message-group2/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/message-priority/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/message-priority/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -27,8 +27,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -32,8 +32,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/paging/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/paging/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/paging/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -25,8 +25,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
@@ -34,8 +34,8 @@
<security-setting match="jms.queue.pagingQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -22,8 +22,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -41,8 +41,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/request-reply/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/request-reply/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/security/readme.html
===================================================================
--- trunk/examples/jms/security/readme.html 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/security/readme.html 2010-04-09 14:04:00 UTC (rev 9084)
@@ -66,8 +66,8 @@
<security-setting match="jms.topic.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="user"/>
<permission type="consume" roles="user"/>
</security-setting>
@@ -75,8 +75,8 @@
<security-setting match="jms.topic.news.europe.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="europe-user"/>
<permission type="consume" roles="news-user"/>
</security-setting>
@@ -84,8 +84,8 @@
<security-setting match="jms.topic.news.us.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="us-user"/>
<permission type="consume" roles="news-user"/>
</security-setting>
Modified: trunk/examples/jms/security/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/security/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/security/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="user"/>
<permission type="consume" roles="user"/>
</security-setting>
@@ -32,8 +32,8 @@
<security-setting match="jms.topic.news.europe.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="europe-user"/>
<permission type="consume" roles="news-user"/>
</security-setting>
@@ -41,8 +41,8 @@
<security-setting match="jms.topic.news.us.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="us-user"/>
<permission type="consume" roles="news-user"/>
</security-setting>
Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -36,8 +36,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/static-selector/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/static-selector/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -30,8 +30,8 @@
<security-setting match="jms.queue.selectorQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.selectorQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/stomp/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/stomp/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/stomp/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -32,8 +32,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -59,8 +59,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/topic/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/topic/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/topic/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -27,8 +27,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -32,8 +32,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/transactional/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/transactional/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/transactional/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/xa-send/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/xa-send/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -83,8 +83,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/stand-alone/clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -70,8 +70,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -44,8 +44,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/trunk/clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -62,8 +62,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/trunk/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -36,8 +36,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -487,8 +487,8 @@
@Parameter(desc="a comma-separated list of roles allowed to consume messages", name="consume") String consumeRoles,
@Parameter(desc="a comma-separated list of roles allowed to create durable queues", name="createDurableQueueRoles") String createDurableQueueRoles,
@Parameter(desc="a comma-separated list of roles allowed to delete durable queues", name="deleteDurableQueueRoles") String deleteDurableQueueRoles,
- @Parameter(desc="a comma-separated list of roles allowed to create temporary queues", name="createTempQueueRoles") String createTempQueueRoles,
- @Parameter(desc="a comma-separated list of roles allowed to delete temporary queues", name="deleteTempQueueRoles") String deleteTempQueueRoles,
+ @Parameter(desc="a comma-separated list of roles allowed to create non durable queues", name="createNonDurableQueueRoles") String createNonDurableQueueRoles,
+ @Parameter(desc="a comma-separated list of roles allowed to delete non durable queues", name="deleteNonDurableQueueRoles") String deleteNonDurableQueueRoles,
@Parameter(desc="a comma-separated list of roles allowed to send management messages messages", name="manage") String manageRoles) throws Exception;
@Operation(desc = "Remove security settings for an address", impact = MBeanOperationInfo.ACTION)
Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -79,6 +79,11 @@
private static final String DELETEDURABLEQUEUE_NAME = "deleteDurableQueue";
+ private static final String CREATE_NON_DURABLE_QUEUE_NAME = "createNonDurableQueue";
+
+ private static final String DELETE_NON_DURABLE_QUEUE_NAME = "deleteNonDurableQueue";
+
+ // HORNETQ-309 we keep supporting these attribute names for compatibility
private static final String CREATETEMPQUEUE_NAME = "createTempQueue";
private static final String DELETETEMPQUEUE_NAME = "deleteTempQueue";
@@ -603,8 +608,8 @@
ArrayList<String> consume = new ArrayList<String>();
ArrayList<String> createDurableQueue = new ArrayList<String>();
ArrayList<String> deleteDurableQueue = new ArrayList<String>();
- ArrayList<String> createTempQueue = new ArrayList<String>();
- ArrayList<String> deleteTempQueue = new ArrayList<String>();
+ ArrayList<String> createNonDurableQueue = new ArrayList<String>();
+ ArrayList<String> deleteNonDurableQueue = new ArrayList<String>();
ArrayList<String> manageRoles = new ArrayList<String>();
ArrayList<String> allRoles = new ArrayList<String>();
NodeList children = node.getChildNodes();
@@ -637,13 +642,21 @@
{
deleteDurableQueue.add(role);
}
+ else if (FileConfigurationParser.CREATE_NON_DURABLE_QUEUE_NAME.equals(type))
+ {
+ createNonDurableQueue.add(role);
+ }
+ else if (FileConfigurationParser.DELETE_NON_DURABLE_QUEUE_NAME.equals(type))
+ {
+ deleteNonDurableQueue.add(role);
+ }
else if (FileConfigurationParser.CREATETEMPQUEUE_NAME.equals(type))
{
- createTempQueue.add(role);
+ createNonDurableQueue.add(role);
}
else if (FileConfigurationParser.DELETETEMPQUEUE_NAME.equals(type))
{
- deleteTempQueue.add(role);
+ deleteNonDurableQueue.add(role);
}
else if (FileConfigurationParser.MANAGE_NAME.equals(type))
{
@@ -665,8 +678,8 @@
consume.contains(role),
createDurableQueue.contains(role),
deleteDurableQueue.contains(role),
- createTempQueue.contains(role),
- deleteTempQueue.contains(role),
+ createNonDurableQueue.contains(role),
+ deleteNonDurableQueue.contains(role),
manageRoles.contains(role)));
}
Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -1175,8 +1175,8 @@
String consumeRoles,
String createDurableQueueRoles,
String deleteDurableQueueRoles,
- String createTempQueueRoles,
- String deleteTempQueueRoles,
+ String createNonDurableQueueRoles,
+ String deleteNonDurableQueueRoles,
String manageRoles) throws Exception
{
checkStarted();
@@ -1188,8 +1188,8 @@
consumeRoles,
createDurableQueueRoles,
deleteDurableQueueRoles,
- createTempQueueRoles,
- deleteTempQueueRoles,
+ createNonDurableQueueRoles,
+ deleteNonDurableQueueRoles,
manageRoles);
server.getSecurityRepository().addMatch(addressMatch, roles);
@@ -1199,8 +1199,8 @@
consumeRoles,
createDurableQueueRoles,
deleteDurableQueueRoles,
- createTempQueueRoles,
- deleteTempQueueRoles,
+ createNonDurableQueueRoles,
+ deleteNonDurableQueueRoles,
manageRoles);
storageManager.storeSecurityRoles(persistedRoles);
Modified: trunk/src/main/org/hornetq/core/persistence/config/PersistedRoles.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/config/PersistedRoles.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/core/persistence/config/PersistedRoles.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -43,9 +43,9 @@
private SimpleString deleteDurableQueueRoles;
- private SimpleString createTempQueueRoles;
+ private SimpleString createNonDurableQueueRoles;
- private SimpleString deleteTempQueueRoles;
+ private SimpleString deleteNonDurableQueueRoles;
private SimpleString manageRoles;
@@ -64,8 +64,8 @@
* @param consumeRoles
* @param createDurableQueueRoles
* @param deleteDurableQueueRoles
- * @param createTempQueueRoles
- * @param deleteTempQueueRoles
+ * @param createNonDurableQueueRoles
+ * @param deleteNonDurableQueueRoles
* @param manageRoles
*/
public PersistedRoles(final String addressMatch,
@@ -73,8 +73,8 @@
final String consumeRoles,
final String createDurableQueueRoles,
final String deleteDurableQueueRoles,
- final String createTempQueueRoles,
- final String deleteTempQueueRoles,
+ final String createNonDurableQueueRoles,
+ final String deleteNonDurableQueueRoles,
final String manageRoles)
{
super();
@@ -83,8 +83,8 @@
this.consumeRoles = SimpleString.toSimpleString(consumeRoles);
this.createDurableQueueRoles = SimpleString.toSimpleString(createDurableQueueRoles);
this.deleteDurableQueueRoles = SimpleString.toSimpleString(deleteDurableQueueRoles);
- this.createTempQueueRoles = SimpleString.toSimpleString(createTempQueueRoles);
- this.deleteTempQueueRoles = SimpleString.toSimpleString(deleteTempQueueRoles);
+ this.createNonDurableQueueRoles = SimpleString.toSimpleString(createNonDurableQueueRoles);
+ this.deleteNonDurableQueueRoles = SimpleString.toSimpleString(deleteNonDurableQueueRoles);
this.manageRoles = SimpleString.toSimpleString(manageRoles);
}
@@ -141,19 +141,19 @@
}
/**
- * @return the createTempQueueRoles
+ * @return the createNonDurableQueueRoles
*/
- public String getCreateTempQueueRoles()
+ public String getCreateNonDurableQueueRoles()
{
- return createTempQueueRoles.toString();
+ return createNonDurableQueueRoles.toString();
}
/**
- * @return the deleteTempQueueRoles
+ * @return the deleteNonDurableQueueRoles
*/
- public String getDeleteTempQueueRoles()
+ public String getDeleteNonDurableQueueRoles()
{
- return deleteTempQueueRoles.toString();
+ return deleteNonDurableQueueRoles.toString();
}
/**
@@ -174,8 +174,8 @@
buffer.writeNullableSimpleString(consumeRoles);
buffer.writeNullableSimpleString(createDurableQueueRoles);
buffer.writeNullableSimpleString(deleteDurableQueueRoles);
- buffer.writeNullableSimpleString(createTempQueueRoles);
- buffer.writeNullableSimpleString(deleteTempQueueRoles);
+ buffer.writeNullableSimpleString(createNonDurableQueueRoles);
+ buffer.writeNullableSimpleString(deleteNonDurableQueueRoles);
buffer.writeNullableSimpleString(manageRoles);
}
@@ -188,8 +188,8 @@
SimpleString.sizeofNullableString(consumeRoles) +
SimpleString.sizeofNullableString(createDurableQueueRoles) +
SimpleString.sizeofNullableString(deleteDurableQueueRoles) +
- SimpleString.sizeofNullableString(createTempQueueRoles) +
- SimpleString.sizeofNullableString(deleteTempQueueRoles) +
+ SimpleString.sizeofNullableString(createNonDurableQueueRoles) +
+ SimpleString.sizeofNullableString(deleteNonDurableQueueRoles) +
SimpleString.sizeofNullableString(manageRoles);
}
@@ -204,8 +204,8 @@
consumeRoles = buffer.readNullableSimpleString();
createDurableQueueRoles = buffer.readNullableSimpleString();
deleteDurableQueueRoles = buffer.readNullableSimpleString();
- createTempQueueRoles = buffer.readNullableSimpleString();
- deleteTempQueueRoles = buffer.readNullableSimpleString();
+ createNonDurableQueueRoles = buffer.readNullableSimpleString();
+ deleteNonDurableQueueRoles = buffer.readNullableSimpleString();
manageRoles = buffer.readNullableSimpleString();
}
@@ -220,9 +220,9 @@
result = prime * result + ((addressMatch == null) ? 0 : addressMatch.hashCode());
result = prime * result + ((consumeRoles == null) ? 0 : consumeRoles.hashCode());
result = prime * result + ((createDurableQueueRoles == null) ? 0 : createDurableQueueRoles.hashCode());
- result = prime * result + ((createTempQueueRoles == null) ? 0 : createTempQueueRoles.hashCode());
+ result = prime * result + ((createNonDurableQueueRoles == null) ? 0 : createNonDurableQueueRoles.hashCode());
result = prime * result + ((deleteDurableQueueRoles == null) ? 0 : deleteDurableQueueRoles.hashCode());
- result = prime * result + ((deleteTempQueueRoles == null) ? 0 : deleteTempQueueRoles.hashCode());
+ result = prime * result + ((deleteNonDurableQueueRoles == null) ? 0 : deleteNonDurableQueueRoles.hashCode());
result = prime * result + ((manageRoles == null) ? 0 : manageRoles.hashCode());
result = prime * result + ((sendRoles == null) ? 0 : sendRoles.hashCode());
result = prime * result + (int)(storeId ^ (storeId >>> 32));
@@ -263,12 +263,12 @@
}
else if (!createDurableQueueRoles.equals(other.createDurableQueueRoles))
return false;
- if (createTempQueueRoles == null)
+ if (createNonDurableQueueRoles == null)
{
- if (other.createTempQueueRoles != null)
+ if (other.createNonDurableQueueRoles != null)
return false;
}
- else if (!createTempQueueRoles.equals(other.createTempQueueRoles))
+ else if (!createNonDurableQueueRoles.equals(other.createNonDurableQueueRoles))
return false;
if (deleteDurableQueueRoles == null)
{
@@ -277,12 +277,12 @@
}
else if (!deleteDurableQueueRoles.equals(other.deleteDurableQueueRoles))
return false;
- if (deleteTempQueueRoles == null)
+ if (deleteNonDurableQueueRoles == null)
{
- if (other.deleteTempQueueRoles != null)
+ if (other.deleteNonDurableQueueRoles != null)
return false;
}
- else if (!deleteTempQueueRoles.equals(other.deleteTempQueueRoles))
+ else if (!deleteNonDurableQueueRoles.equals(other.deleteNonDurableQueueRoles))
return false;
if (manageRoles == null)
{
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -1228,8 +1228,8 @@
roleItem.getConsumeRoles(),
roleItem.getCreateDurableQueueRoles(),
roleItem.getDeleteDurableQueueRoles(),
- roleItem.getCreateTempQueueRoles(),
- roleItem.getDeleteTempQueueRoles(),
+ roleItem.getCreateNonDurableQueueRoles(),
+ roleItem.getDeleteNonDurableQueueRoles(),
roleItem.getManageRoles());
securityRepository.addMatch(roleItem.getAddressMatch().toString(), setRoles);
Modified: trunk/src/main/org/hornetq/utils/SecurityFormatter.java
===================================================================
--- trunk/src/main/org/hornetq/utils/SecurityFormatter.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/utils/SecurityFormatter.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -22,12 +22,12 @@
public class SecurityFormatter
{
- public static Set<Role> createSecurity(String sendRoles, String consumeRoles, String createDurableQueueRoles, String deleteDurableQueueRoles, String createTempQueueRoles, String deleteTempQueueRoles, String manageRoles)
+ public static Set<Role> createSecurity(String sendRoles, String consumeRoles, String createDurableQueueRoles, String deleteDurableQueueRoles, String createNonDurableQueueRoles, String deleteNonDurableQueueRoles, String manageRoles)
{
List<String> createDurableQueue = toList(createDurableQueueRoles);
List<String> deleteDurableQueue = toList(deleteDurableQueueRoles);
- List<String> createTempQueue = toList(createTempQueueRoles);
- List<String> deleteTempQueue = toList(deleteTempQueueRoles);
+ List<String> createNonDurableQueue = toList(createNonDurableQueueRoles);
+ List<String> deleteNonDurableQueue = toList(deleteNonDurableQueueRoles);
List<String> send = toList(sendRoles);
List<String> consume = toList(consumeRoles);
List<String> manage = toList(manageRoles);
@@ -35,8 +35,8 @@
Set<String> allRoles = new HashSet<String>();
allRoles.addAll(createDurableQueue);
allRoles.addAll(deleteDurableQueue);
- allRoles.addAll(createTempQueue);
- allRoles.addAll(deleteTempQueue);
+ allRoles.addAll(createNonDurableQueue);
+ allRoles.addAll(deleteNonDurableQueue);
allRoles.addAll(send);
allRoles.addAll(consume);
allRoles.addAll(manage);
@@ -49,8 +49,8 @@
consume.contains(role),
createDurableQueue.contains(role),
deleteDurableQueue.contains(role),
- createTempQueue.contains(role),
- deleteTempQueue.contains(role),
+ createNonDurableQueue.contains(role),
+ deleteNonDurableQueue.contains(role),
manageRoles.contains(role)));
}
return roles;
Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/tests/config/ConfigurationTest-full-config.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -185,10 +185,10 @@
<security-settings>
<security-setting match="a1">
- <permission type="createTempQueue" roles="a1.1"/>
+ <permission type="createNonDurableQueue" roles="a1.1"/>
</security-setting>
<security-setting match="a2">
- <permission type="deleteTempQueue" roles="a2.1"/>
+ <permission type="deleteNonDurableQueue" roles="a2.1"/>
</security-setting>
</security-settings>
Modified: trunk/tests/jms-tests/config/hornetq-queues.xml
===================================================================
--- trunk/tests/jms-tests/config/hornetq-queues.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/tests/jms-tests/config/hornetq-queues.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -6,8 +6,8 @@
<security-setting match="#">
<permission type="createDurableQueue" roles="guest,def"/>
<permission type="deleteDurableQueue" roles="guest,def"/>
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="createNonDurableQueue" roles="guest,def"/>
+ <permission type="deleteNonDurableQueue" roles="guest,def"/>
<permission type="consume" roles="guest,def"/>
<permission type="send" roles="guest,def"/>
</security-setting>
Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -472,14 +472,14 @@
String consumeRoles,
String createDurableQueueRoles,
String deleteDurableQueueRoles,
- String createTempQueueRoles,
- String deleteTempQueueRoles,
+ String createNonDurableQueueRoles,
+ String deleteNonDurableQueueRoles,
String manageRoles) throws Exception
{
proxy.invokeOperation("addSecuritySettings", addressMatch,
sendRoles, consumeRoles,
createDurableQueueRoles, deleteDurableQueueRoles,
- createTempQueueRoles, deleteTempQueueRoles,
+ createNonDurableQueueRoles, deleteNonDurableQueueRoles,
manageRoles);
}
Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -41,8 +41,8 @@
+ " <permission type=\"manage\" roles=\"guest,publisher,durpublisher\"/>\n"
+ " </security-setting>";
- private final String conf2 = "<security-setting match=\"jms.topic.testQueue\">\n" + " <permission type=\"createTempQueue\" roles=\"durpublisher\"/>\n"
- + " <permission type=\"deleteTempQueue\" roles=\"durpublisher\"/>\n"
+ private final String conf2 = "<security-setting match=\"jms.topic.testQueue\">\n" + " <permission type=\"createNonDurableQueue\" roles=\"durpublisher\"/>\n"
+ + " <permission type=\"deleteNonDurableQueue\" roles=\"durpublisher\"/>\n"
+ " <permission type=\"consume\" roles=\"guest,publisher,durpublisher\"/>\n"
+ " <permission type=\"send\" roles=\"guest,publisher,durpublisher\"/>\n"
+ " </security-setting>";
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9083 - in trunk: src/main/org/hornetq/core/protocol/core and 4 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-04-09 08:06:23 -0400 (Fri, 09 Apr 2010)
New Revision: 9083
Modified:
trunk/examples/jms/reattach-node/server0/hornetq-jms.xml
trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java
trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java
trunk/src/main/org/hornetq/core/server/ServerSession.java
trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-336
Modified: trunk/examples/jms/reattach-node/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/reattach-node/server0/hornetq-jms.xml 2010-04-09 11:42:08 UTC (rev 9082)
+++ trunk/examples/jms/reattach-node/server0/hornetq-jms.xml 2010-04-09 12:06:23 UTC (rev 9083)
@@ -27,6 +27,10 @@
to try to reconnect -->
<failover-on-server-shutdown>true</failover-on-server-shutdown>
+ <!-- We need to specify a confirmation-window-size to enable re-attachment, default is -1 which
+ means no re-attachment -->
+ <confirmation-window-size>1048576</confirmation-window-size>
+
</connection-factory>
<!-- This is used by the example to send the management operations, it's not central to the example -->
Modified: trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-04-09 11:42:08 UTC (rev 9082)
+++ trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-04-09 12:06:23 UTC (rev 9083)
@@ -147,8 +147,6 @@
{
log.warn("Client connection failed, clearing up resources for session " + session.getName());
- session.runConnectionFailureRunners();
-
try
{
session.close();
@@ -177,7 +175,6 @@
public void connectionClosed()
{
- session.runConnectionFailureRunners();
}
private void addConnectionListeners()
Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-04-09 11:42:08 UTC (rev 9082)
+++ trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-04-09 12:06:23 UTC (rev 9083)
@@ -567,8 +567,7 @@
{
session.getSession().rollback(true);
session.getSession().close();
- session.getSession().runConnectionFailureRunners();
- }
+ }
catch (Exception e)
{
log.warn(e.getMessage(), e);
@@ -587,7 +586,6 @@
{
serverSession.rollback(true);
serverSession.close();
- serverSession.runConnectionFailureRunners();
}
catch (Exception e)
{
Modified: trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-04-09 11:42:08 UTC (rev 9082)
+++ trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-04-09 12:06:23 UTC (rev 9083)
@@ -31,8 +31,10 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.logging.Logger;
+import org.hornetq.core.protocol.core.ServerSessionPacketHandler;
import org.hornetq.core.protocol.core.impl.CoreProtocolManagerFactory;
import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory;
+import org.hornetq.core.remoting.FailureListener;
import org.hornetq.core.remoting.server.RemotingService;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.management.ManagementService;
@@ -365,16 +367,32 @@
if (conn != null)
{
- // if the connection has no failure listeners it means the sesssions etc were already closed so this is a clean
- // shutdown, therefore we can destroy the connection
- // otherwise client might have crashed/exited without closing connections so we leave them for connection TTL
+ // Bit of a hack - find a better way to do this
- if (conn.connection.getFailureListeners().isEmpty())
+ List<FailureListener> failureListeners = conn.connection.getFailureListeners();
+
+ boolean empty = true;
+
+ for (FailureListener listener : failureListeners)
{
+ if (listener instanceof ServerSessionPacketHandler)
+ {
+ empty = false;
+
+ break;
+ }
+ }
+
+ // We only destroy the connection if the connection has no sessions attached to it
+ // Otherwise it means the connection has died without the sessions being closed first
+ // so we need to keep them for ttl, in case re-attachment occurs
+ if (empty)
+ {
connections.remove(connectionID);
conn.connection.destroy();
}
+
}
}
Modified: trunk/src/main/org/hornetq/core/server/ServerSession.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/ServerSession.java 2010-04-09 11:42:08 UTC (rev 9082)
+++ trunk/src/main/org/hornetq/core/server/ServerSession.java 2010-04-09 12:06:23 UTC (rev 9083)
@@ -110,6 +110,4 @@
void close() throws Exception;
void setTransferring(boolean transferring);
-
- void runConnectionFailureRunners();
}
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-04-09 11:42:08 UTC (rev 9082)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-04-09 12:06:23 UTC (rev 9083)
@@ -73,7 +73,7 @@
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
* @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a>
*/
-public class ServerSessionImpl implements ServerSession, FailureListener, CloseListener
+public class ServerSessionImpl implements ServerSession, FailureListener
{
// Constants -----------------------------------------------------------------------------
@@ -102,7 +102,7 @@
private final Map<Long, ServerConsumer> consumers = new ConcurrentHashMap<Long, ServerConsumer>();
private Transaction tx;
-
+
private final boolean xa;
private final StorageManager storageManager;
@@ -117,8 +117,10 @@
private volatile boolean started = false;
- private final Map<SimpleString, Runnable> failureRunners = new HashMap<SimpleString, Runnable>();
+ // private final Map<SimpleString, Runnable> failureRunners = new HashMap<SimpleString, Runnable>();
+ private final Map<SimpleString, TempQueueCleanerUpper> tempQueueCleannerUppers = new HashMap<SimpleString, TempQueueCleanerUpper>();
+
private final String name;
private final HornetQServer server;
@@ -131,7 +133,7 @@
private final RoutingContext routingContext = new RoutingContextImpl(null);
private final SessionCallback callback;
-
+
private volatile SimpleString defaultAddress;
// Constructors ---------------------------------------------------------------------------------
@@ -182,7 +184,7 @@
{
tx = new TransactionImpl(storageManager);
}
-
+
this.xa = xa;
this.strictUpdateDeliveryCount = strictUpdateDeliveryCount;
@@ -196,12 +198,10 @@
this.managementAddress = managementAddress;
this.callback = callback;
-
+
this.defaultAddress = defaultAddress;
remotingConnection.addFailureListener(this);
-
- remotingConnection.addCloseListener(this);
}
// ServerSession implementation ----------------------------------------------------------------------------
@@ -272,7 +272,7 @@
}
remotingConnection.removeFailureListener(this);
-
+
callback.closed();
}
@@ -359,9 +359,9 @@
// session is closed.
// It is up to the user to delete the queue when finished with it
- failureRunners.put(name, new Runnable()
+ CloseListener closeListener = new CloseListener()
{
- public void run()
+ public void connectionClosed()
{
try
{
@@ -375,10 +375,57 @@
ServerSessionImpl.log.error("Failed to remove temporary queue " + name);
}
}
- });
+ };
+
+ TempQueueCleanerUpper cleaner = new TempQueueCleanerUpper(postOffice, name);
+
+ remotingConnection.addCloseListener(cleaner);
+ remotingConnection.addFailureListener(cleaner);
+
+ tempQueueCleannerUppers.put(name, cleaner);
}
}
+ private static class TempQueueCleanerUpper implements CloseListener, FailureListener
+ {
+ private final PostOffice postOffice;
+
+ private final SimpleString bindingName;
+
+ TempQueueCleanerUpper(final PostOffice postOffice, final SimpleString bindingName)
+ {
+ this.postOffice = postOffice;
+
+ this.bindingName = bindingName;
+ }
+
+ private void run()
+ {
+ try
+ {
+ if (postOffice.getBinding(bindingName) != null)
+ {
+ postOffice.removeBinding(bindingName);
+ }
+ }
+ catch (Exception e)
+ {
+ ServerSessionImpl.log.error("Failed to remove temporary queue " + bindingName);
+ }
+ }
+
+ public void connectionFailed(HornetQException exception)
+ {
+ run();
+ }
+
+ public void connectionClosed()
+ {
+ run();
+ }
+
+ }
+
public void deleteQueue(final SimpleString name) throws Exception
{
Binding binding = postOffice.getBinding(name);
@@ -390,7 +437,14 @@
server.destroyQueue(name, this);
- failureRunners.remove(name);
+ TempQueueCleanerUpper cleaner = this.tempQueueCleannerUppers.remove(name);
+
+ if (cleaner != null)
+ {
+ remotingConnection.removeCloseListener(cleaner);
+
+ remotingConnection.removeFailureListener(cleaner);
+ }
}
public QueueQueryResult executeQueueQuery(final SimpleString name) throws Exception
@@ -465,7 +519,7 @@
public void acknowledge(final long consumerID, final long messageID) throws Exception
{
ServerConsumer consumer = consumers.get(consumerID);
-
+
if (this.xa && tx == null)
{
throw new HornetQXAException(XAException.XAER_PROTO, "Invalid transaction state");
@@ -473,11 +527,11 @@
consumer.acknowledge(autoCommitAcks, tx, messageID);
}
-
+
public void individualAcknowledge(final long consumerID, final long messageID) throws Exception
{
ServerConsumer consumer = consumers.get(consumerID);
-
+
if (this.xa && tx == null)
{
throw new HornetQXAException(XAException.XAER_PROTO, "Invalid transaction state");
@@ -921,27 +975,27 @@
currentLargeMessage = msg;
}
-
+
public void send(final ServerMessage message) throws Exception
{
long id = storageManager.generateUniqueID();
SimpleString address = message.getAddress();
-
+
message.setMessageID(id);
message.encodeMessageIDToBuffer();
-
+
if (address == null)
{
if (message.isDurable())
{
- //We need to force a re-encode when the message gets persisted or when it gets reloaded
- //it will have no address
+ // We need to force a re-encode when the message gets persisted or when it gets reloaded
+ // it will have no address
message.setAddress(defaultAddress);
}
else
{
- //We don't want to force a re-encode when the message gets sent to the consumer
+ // We don't want to force a re-encode when the message gets sent to the consumer
message.setAddressTransient(defaultAddress);
}
}
@@ -955,8 +1009,8 @@
else
{
doSend(message);
- }
-
+ }
+
if (defaultAddress == null)
{
defaultAddress = address;
@@ -986,9 +1040,9 @@
}
public void requestProducerCredits(final SimpleString address, final int credits) throws Exception
- {
+ {
PagingStore store = postOffice.getPagingManager().getPageStore(address);
-
+
store.executeRunnableWhenMemoryAvailable(new Runnable()
{
public void run()
@@ -1008,21 +1062,6 @@
}
}
- public void runConnectionFailureRunners()
- {
- for (Runnable runner : failureRunners.values())
- {
- try
- {
- runner.run();
- }
- catch (Throwable t)
- {
- ServerSessionImpl.log.error("Failed to execute failure runner", t);
- }
- }
- }
-
// FailureListener implementation
// --------------------------------------------------------------------
@@ -1032,18 +1071,6 @@
{
ServerSessionImpl.log.warn("Client connection failed, clearing up resources for session " + name);
- for (Runnable runner : failureRunners.values())
- {
- try
- {
- runner.run();
- }
- catch (Throwable t)
- {
- ServerSessionImpl.log.error("Failed to execute failure runner", t);
- }
- }
-
close();
ServerSessionImpl.log.warn("Cleared up resources for session " + name);
@@ -1054,29 +1081,7 @@
}
}
- public void connectionClosed()
- {
- try
- {
- for (Runnable runner : failureRunners.values())
- {
- try
- {
- runner.run();
- }
- catch (Throwable t)
- {
- ServerSessionImpl.log.error("Failed to execute failure runner", t);
- }
- }
- }
- catch (Throwable t)
- {
- ServerSessionImpl.log.error("Failed to fire listeners " + this);
- }
- }
-
// Public
// ----------------------------------------------------------------------------
@@ -1174,7 +1179,7 @@
{
throw new HornetQXAException(XAException.XAER_PROTO, "Invalid transaction state");
}
-
+
if (tx == null || autoCommitSends)
{
}
15 years, 8 months
- 1
- 0
JBoss hornetq SVN: r9082 - trunk/src/main/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-04-09 07:42:08 -0400 (Fri, 09 Apr 2010)
New Revision: 9082
Modified:
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-350: Hornetq-configuration.xml elements deployed twice
* deploy resources (queues, address settings, security settings) from Configuration object if file deployment is disabled,
or let the deployers handle deployment else.
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-08 19:44:31 UTC (rev 9081)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-09 11:42:08 UTC (rev 9082)
@@ -990,14 +990,16 @@
// Address settings need to deployed initially, since they're require on paging manager.start()
- deployAddressSettingsFromConfiguration();
-
if (configuration.isFileDeploymentEnabled())
{
addressSettingsDeployer = new AddressSettingsDeployer(deploymentManager, addressSettingsRepository);
addressSettingsDeployer.start();
}
+ else
+ {
+ deployAddressSettingsFromConfiguration();
+ }
storageManager.start();
@@ -1014,8 +1016,6 @@
resourceManager.start();
- deploySecurityFromConfiguration();
-
// Deploy all security related config
if (configuration.isFileDeploymentEnabled())
{
@@ -1030,6 +1030,11 @@
securityDeployer.start();
}
}
+ else
+ {
+ deploySecurityFromConfiguration();
+ }
+
deployGroupingHandlerConfiguration(configuration.getGroupingHandlerConfiguration());
// Load the journal and populate queues, transactions and caches in memory
@@ -1037,18 +1042,17 @@
compareJournals(journalInfo);
- // Deploy any queues in the Configuration class - if there's no file deployment we still need
- // to load those
- deployQueuesFromConfiguration();
-
// Deploy any predefined queues
-
if (configuration.isFileDeploymentEnabled())
{
queueDeployer = new QueueDeployer(deploymentManager, this);
queueDeployer.start();
}
+ else
+ {
+ deployQueuesFromConfiguration();
+ }
// We need to call this here, this gives any dependent server a chance to deploy its own addresses
// this needs to be done before clustering is initialised
15 years, 8 months
- 1
- 0