[jboss-cvs] JBoss Messaging SVN: r6488 - in trunk: examples/jms and 18 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 20 06:41:51 EDT 2009
Author: timfox
Date: 2009-04-20 06:41:51 -0400 (Mon, 20 Apr 2009)
New Revision: 6488
Added:
trunk/examples/jms/pre-acknowledge/
trunk/examples/jms/pre-acknowledge/build.xml
trunk/examples/jms/pre-acknowledge/readme.html
trunk/examples/jms/pre-acknowledge/server0/
trunk/examples/jms/pre-acknowledge/server0/client-jndi.properties
trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-security.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml
trunk/examples/jms/pre-acknowledge/src/
trunk/examples/jms/pre-acknowledge/src/org/
trunk/examples/jms/pre-acknowledge/src/org/jboss/
trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/
trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/
trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/PreacknowledgeExample.java
Modified:
trunk/.classpath
trunk/examples/jms/management/server0/jbm-queues.xml
trunk/examples/jms/queue-requestor/server0/jbm-queues.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
trunk/examples/jms/request-reply/server0/jbm-queues.xml
trunk/examples/jms/temp-queue/server0/jbm-queues.xml
trunk/src/config/jbm-queues.xml
trunk/src/main/org/jboss/messaging/jms/JBossTemporaryQueue.java
trunk/src/main/org/jboss/messaging/jms/JBossTemporaryTopic.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
Log:
pre-ack example
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/.classpath 2009-04-20 10:41:51 UTC (rev 6488)
@@ -14,6 +14,7 @@
<classpathentry kind="src" path="src/schemas"/>
<classpathentry kind="src" path="tests/joram-tests/src"/>
<classpathentry kind="src" path="tests/joram-tests/config"/>
+ <classpathentry kind="src" path="examples/jms/pre-acknowledge/src"/>
<classpathentry kind="src" path="examples/jms/static-selector/src"/>
<classpathentry kind="src" path="examples/jms/topic-hierarchies/src"/>
<classpathentry kind="src" path="examples/jms/security/src"/>
Modified: trunk/examples/jms/management/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-queues.xml 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/examples/jms/management/server0/jbm-queues.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -18,7 +18,7 @@
</security>
<!-- security settings for JMS temporary queue -->
- <security match="queuetempjms.*">
+ <security match="jms.tempqueue.#">
<permission type="createTempQueue" roles="guest"/>
<permission type="deleteTempQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
Added: trunk/examples/jms/pre-acknowledge/build.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/build.xml (rev 0)
+++ trunk/examples/jms/pre-acknowledge/build.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent">
+ ]>
+
+<!-- =========================================================================================== -->
+<!-- -->
+<!-- JBoss, Home of Professional Open Source -->
+<!-- Copyright 2005, JBoss Inc., and individual contributors as indicated -->
+<!-- by the @authors tag. See the copyright.txt in the distribution for a -->
+<!-- full listing of individual contributors. -->
+<!-- -->
+<!-- This is free software; you can redistribute it and/or modify it -->
+<!-- under the terms of the GNU Lesser General Public License as -->
+<!-- published by the Free Software Foundation; either version 2.1 of -->
+<!-- the License, or (at your option) any later version. -->
+<!-- -->
+<!-- This software is distributed in the hope that it will be useful, -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
+<!-- Lesser General Public License for more details. -->
+<!-- -->
+<!-- You should have received a copy of the GNU Lesser General Public -->
+<!-- License along with this software; if not, write to the Free -->
+<!-- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -->
+<!-- 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
+<!-- -->
+<!-- =========================================================================================== -->
+
+
+<project default="run" name="JBoss Messaging JMS Pre-acknowledge example">
+
+ <import file="../common/build.xml"/>
+
+ <target name="run">
+ <antcall target="runExample">
+ <param name="example.classname" value="org.jboss.jms.example.PreacknowledgeExample"/>
+ </antcall>
+ </target>
+
+ <target name="runRemote">
+ <antcall target="runExample">
+ <param name="example.classname" value="org.jboss.jms.example.PreacknowledgeExample"/>
+ <param name="jbm.example.runServer" value="false"/>
+ </antcall>
+ </target>
+
+</project>
\ No newline at end of file
Added: trunk/examples/jms/pre-acknowledge/readme.html
===================================================================
--- trunk/examples/jms/pre-acknowledge/readme.html (rev 0)
+++ trunk/examples/jms/pre-acknowledge/readme.html 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,124 @@
+<html>
+ <head>
+ <title>JBoss Messaging JMS Pre-Acknowledge Example</title>
+ <link rel="stylesheet" type="text/css" href="../common/common.css">
+ </head>
+ <body>
+ <h1>JBoss Messaging JMS Pre-Acknowledge Example</h1>
+ <br>
+ <p>Standard JMS supports three acknowledgement modes: AUTO_ACKNOWLEDGE, CLIENT_ACKNOWLEDGE, and
+ DUPS_OK_ACKNOWLEDGE. For a full descrition on these modes please consult the JMS specification, or any
+ JMS tutorial.</p>
+ <p>All of these standard modes involve sending acknowledgements from the client to the server. However
+ in some cases, you really don't mind losing messages in event of failure, so it would make sense
+ to acknowledge the message on the server <b>before</b> delivering it to the client.</p>
+ <p>By acknowledging the message before sending to the client, you can avoid extra network traffic and CPU
+ work done in sending acknowledgements from client to server.</p>
+ <p>The down-side of acknowledging on the server before delivery, is that if the system crashes after acknowledging
+ the message, but before the message has been received by the client, then, on recovery, that message
+ will be lost. This makes pre-acknowledgement not appropriate for all use cases, but it is very useful for some
+ use-cases when you can cope with such loss of messages<p>
+ <p>An example of a use-case where it might be a good idea to use pre-acknowledge, is for stock price update
+ messages. With these messages it might be ok to lose a message in event of crash, since the next price
+ update message will arrive soon, overriding the previous price.</p>
+ <p>In order to use pre-acknowledge functionality with JBoss Messaging the session has to be created with
+ a special, JBoss Messaging specific acknowledgement mode, given by the value of
+ <code>JBossSession.PRE_ACKNOWLEDGE</code>.
+ <h2>Example step-by-step</h2>
+ <p><i>To run the example, simply type <code>ant</code> from this directory</i></p>
+ <br>
+ <ol>
+ <li>Create an initial context to perform the JNDI lookup.</li>
+ <pre>
+ <code>
+ initialContext = getContext(0);
+ </code>
+ </pre>
+
+ <li>Perform the look-ups</li>
+ <pre>
+ <code>
+ Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
+
+ ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");
+ </code>
+ </pre>
+
+ <li>Create a the JMS objects.</li>
+ <pre>
+ <code>
+ connection = cf.createConnection();
+
+ Session session = connection.createSession(false, JBossSession.PRE_ACKNOWLEDGE);
+
+ MessageProducer producer = session.createProducer(queue);
+
+ MessageConsumer messageConsumer = session.createConsumer(queue);
+ </code>
+ </pre>
+
+ <li>Create and send a message.</li>
+ <pre>
+ <code>
+ TextMessage message1 = session.createTextMessage("This is a text message 1");
+
+ producer.send(message1);
+
+ System.out.println("Sent message: " + message1.getText());
+ </code>
+ </pre>
+
+ <li>Print out the message count of the queue. The queue contains one message as expected
+ delivery has not yet started on the queue.</li>
+ <pre>
+ <code>
+ int count = getMessageCount(connection);
+
+ System.out.println("Queue message count is " + count);
+ </code>
+ </pre>
+
+ <li>Start the Connection, delivery will now start. Give a little time for delivery to occur.</li>
+ <pre>
+ <code>
+ connection.start();
+
+ Thread.sleep(1000);
+ </code>
+ </pre>
+
+ <li>Print out the message count of the queue. It should now be zero, since the message has
+ already been acknowledged even before the consumer has received it.</li>
+ <pre>
+ <code>
+ count = getMessageCount(connection);
+
+ System.out.println("Queue message count is now " + count);
+ </code>
+ </pre>
+
+ <li>Finally, receive the message.</li>
+ <pre>
+ <code>
+ TextMessage messageReceived = (TextMessage)messageConsumer.receive(5000);
+
+ System.out.println("Received message: " + messageReceived.getText());
+ </code>
+ </pre>
+
+ <li>Be sure to close our resources!</li>
+ <pre>
+ <code>
+ if (initialContext != null)
+ {
+ initialContext.close();
+ }
+ if (connection != null)
+ {
+ connection.close();
+ }
+ </code>
+ </pre>
+ </ol>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/examples/jms/pre-acknowledge/server0/client-jndi.properties
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/client-jndi.properties (rev 0)
+++ trunk/examples/jms/pre-acknowledge/server0/client-jndi.properties 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Added: trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml (rev 0)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,29 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ <configuration>
+
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <journal-min-files>2</journal-min-files>
+
+ </configuration>
+
+</deployment>
Added: trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml (rev 0)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-jms.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,17 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ <!--the connection factory used by the example-->
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <!--the queue used by the example-->
+ <queue name="exampleQueue">
+ <entry name="/queue/exampleQueue"/>
+ </queue>
+
+</deployment>
Added: trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml (rev 0)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,18 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <security match="jms.#">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security>
+
+ <security match="jbm.management">
+ <permission type="manage" roles="guest" />
+ </security>
+
+</settings>
Added: trunk/examples/jms/pre-acknowledge/server0/jbm-security.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-security.xml (rev 0)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-security.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,7 @@
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-security.xsd ">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</deployment>
\ No newline at end of file
Added: trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml (rev 0)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-standalone-beans.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+ <!-- JNDI server. Disable this if you don't want JNDI -->
+ <bean name="JNDIServer" class="org.jnp.server.Main">
+ <property name="namingInfo">
+ <inject bean="Naming"/>
+ </property>
+ <property name="port">1099</property>
+ <property name="bindAddress">localhost</property>
+ <property name="rmiPort">1098</property>
+ <property name="rmiBindAddress">localhost</property>
+ </bean>
+
+ <!-- MBean server -->
+ <bean name="MBeanServer" class="javax.management.MBeanServer">
+ <constructor factoryClass="java.lang.management.ManagementFactory"
+ factoryMethod="getPlatformMBeanServer"/>
+ </bean>
+
+ <!-- The core configuration -->
+ <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
+
+ <!-- The security manager -->
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
+ </bean>
+
+ <!-- The core server -->
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="Configuration"/>
+ </parameter>
+ <parameter>
+ <inject bean="MBeanServer"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBMSecurityManager"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- The JMS server -->
+ <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+ <constructor>
+ <parameter>
+ <inject bean="MessagingServer"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Added: trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/PreacknowledgeExample.java
===================================================================
--- trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/PreacknowledgeExample.java (rev 0)
+++ trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/PreacknowledgeExample.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jms.example;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueRequestor;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import org.jboss.messaging.jms.JBossQueue;
+import org.jboss.messaging.jms.client.JBossSession;
+import org.jboss.messaging.jms.server.management.impl.JMSManagementHelper;
+
+/**
+ *
+ * This example demonstrates the use of JBoss Messaging "pre-acknowledge" functionality where
+ * messages are acknowledged before they are delivered to the consumer.
+ *
+ * Please see the readme.html for more details.
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class PreacknowledgeExample extends JMSExample
+{
+ public static void main(String[] args)
+ {
+ new PreacknowledgeExample().run(args);
+ }
+
+ public boolean runExample() throws Exception
+ {
+ Connection connection = null;
+
+ InitialContext initialContext = null;
+ try
+ {
+ // Step 1. Create an initial context to perform the JNDI lookup.
+ initialContext = getContext(0);
+
+ // Step 2. Perform the look-ups
+ Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
+
+ ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");
+
+ // Step 3. Create a the JMS objects
+ connection = cf.createConnection();
+
+ Session session = connection.createSession(false, JBossSession.PRE_ACKNOWLEDGE);
+
+ MessageProducer producer = session.createProducer(queue);
+
+ MessageConsumer messageConsumer = session.createConsumer(queue);
+
+ // Step 4. Create and send a message
+ TextMessage message1 = session.createTextMessage("This is a text message 1");
+
+ producer.send(message1);
+
+ System.out.println("Sent message: " + message1.getText());
+
+ // Step 5. Print out the message count of the queue. The queue contains one message as expected
+ // delivery has not yet started on the queue
+ int count = getMessageCount(connection);
+
+ System.out.println("Queue message count is " + count);
+
+ // Step 6. Start the Connection, delivery will now start. Give a little time for delivery to occur.
+ connection.start();
+
+ Thread.sleep(1000);
+
+ // Step 7. Print out the message countof the queue. It should now be zero, since the message has
+ // already been acknowledged even before the consumer has received it.
+ count = getMessageCount(connection);
+
+ System.out.println("Queue message count is now " + count);
+
+ if (count != 0)
+ {
+ return false;
+ }
+
+ // Step 8. Finally, receive the message
+ TextMessage messageReceived = (TextMessage)messageConsumer.receive(5000);
+
+ System.out.println("Received message: " + messageReceived.getText());
+
+ return true;
+ }
+ finally
+ {
+ // Step 9. Be sure to close our resources!
+ if (initialContext != null)
+ {
+ initialContext.close();
+ }
+ if (connection != null)
+ {
+ connection.close();
+ }
+ }
+ }
+
+ // To do this we send a management message to get the message count.
+ // In real life you wouldn't create a new session every time you send a management message
+ private int getMessageCount(final Connection connection) throws Exception
+ {
+ QueueSession session = ((QueueConnection)connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ Queue managementQueue = new JBossQueue("jbm.management", "jbm.management");
+
+ QueueRequestor requestor = new QueueRequestor(session, managementQueue);
+
+ connection.start();
+
+ Message m = session.createMessage();
+
+ JMSManagementHelper.putAttribute(m, "jms.queue.exampleQueue", "MessageCount");
+
+ ObjectMessage response = (ObjectMessage)requestor.request(m);
+
+ int messageCount = (Integer)response.getObject();
+
+ return messageCount;
+ }
+
+}
Modified: trunk/examples/jms/queue-requestor/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-queues.xml 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/examples/jms/queue-requestor/server0/jbm-queues.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -13,7 +13,7 @@
</security>
<!-- needed so
the queue requester can create a temporary queue-->
- <security match="queuetempjms.*">
+ <security match="jms.tempqueue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -1,7 +1,9 @@
<deployment xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
- <!--the connection factory used by the example-->
+
+ <!--the connection factories used by the example-->
+
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
<entries>
Modified: trunk/examples/jms/request-reply/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-queues.xml 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/examples/jms/request-reply/server0/jbm-queues.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -13,7 +13,7 @@
</security>
<!-- needed so the session can create a temporary queue-->
- <security match="queuetempjms.*">
+ <security match="jms.tempqueue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/temp-queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-queues.xml 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/examples/jms/temp-queue/server0/jbm-queues.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -13,7 +13,7 @@
</security>
<!-- needed so the session can create a temporary queue-->
- <security match="queuetempjms.*">
+ <security match="jms.tempqueue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/src/config/jbm-queues.xml
===================================================================
--- trunk/src/config/jbm-queues.xml 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/src/config/jbm-queues.xml 2009-04-20 10:41:51 UTC (rev 6488)
@@ -44,14 +44,14 @@
<permission type="send" roles="guest,publisher"/>
</security>
- <security match="queuetempjms.*">
+ <security match="jms.tempqueue.#">
<permission type="createTempQueue" roles="guest,def"/>
<permission type="deleteTempQueue" roles="guest,def"/>
<permission type="consume" roles="guest,def"/>
<permission type="send" roles="guest,def"/>
</security>
- <security match="topictempjms.*">
+ <security match="jms.temptopic.#">
<permission type="createTempQueue" roles="guest,def"/>
<permission type="deleteTempQueue" roles="guest,def"/>
<permission type="consume" roles="guest,def"/>
Modified: trunk/src/main/org/jboss/messaging/jms/JBossTemporaryQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossTemporaryQueue.java 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/src/main/org/jboss/messaging/jms/JBossTemporaryQueue.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -39,7 +39,7 @@
private static final long serialVersionUID = -4624930377557954624L;
- public static final String JMS_TEMP_QUEUE_ADDRESS_PREFIX = "queuetempjms.";
+ public static final String JMS_TEMP_QUEUE_ADDRESS_PREFIX = "jms.tempqueue.";
// Static --------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/jms/JBossTemporaryTopic.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossTemporaryTopic.java 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/src/main/org/jboss/messaging/jms/JBossTemporaryTopic.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 845450764835635266L;
- public static final String JMS_TEMP_TOPIC_ADDRESS_PREFIX = "topictempjms.";
+ public static final String JMS_TEMP_TOPIC_ADDRESS_PREFIX = "jms.temptopic.";
// Static --------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -460,7 +460,7 @@
{
session = sessionFactory.createSession(username, password, isXA, true, false, false, transactionBatchSize);
}
- else if (acknowledgeMode == JBossSession.SERVER_ACKNOWLEDGE)
+ else if (acknowledgeMode == JBossSession.PRE_ACKNOWLEDGE)
{
session = sessionFactory.createSession(username, password, isXA, true, false, true, transactionBatchSize);
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -264,7 +264,7 @@
this.blockOnPersistentSend = blockOnPersistentSend;
this.autoGroup = autoGroup;
this.maxConnections = maxConnections;
- this.preAcknowledge = preAcknowledge;
+ this.preAcknowledge = preAcknowledge;
this.retryInterval = retryInterval;
this.retryIntervalMultiplier = retryIntervalMultiplier;
this.reconnectAttempts = reconnectAttempts;
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -97,7 +97,7 @@
public static final int TYPE_TOPIC_SESSION = 2;
- public static final int SERVER_ACKNOWLEDGE = 4;
+ public static final int PRE_ACKNOWLEDGE = 100;
private static SimpleString REJECTING_FILTER = new SimpleString("_JBMX=-1");
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -247,12 +247,12 @@
maxConnections = org.jboss.messaging.utils.XMLUtil.parseInt(child);
}
else if (PRE_ACKNOWLEDGE_ELEMENT.equals(child.getNodeName()))
- {
- preAcknowledge = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);;
+ {
+ preAcknowledge = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);
}
else if (RETRY_INTERVAL.equals(child.getNodeName()))
{
- retryInterval = org.jboss.messaging.utils.XMLUtil.parseInt(child);;
+ retryInterval = org.jboss.messaging.utils.XMLUtil.parseInt(child);
}
else if (RETRY_INTERVAL_MULTIPLIER.equals(child.getNodeName()))
{
@@ -260,11 +260,11 @@
}
else if (RECONNECT_ATTEMPTS.equals(child.getNodeName()))
{
- reconnectAttempts = org.jboss.messaging.utils.XMLUtil.parseInt(child);;
+ reconnectAttempts = org.jboss.messaging.utils.XMLUtil.parseInt(child);
}
else if (FAILOVER_ON_NODE_SHUTDOWN.equals(child.getNodeName()))
{
- failoverOnNodeShutdown = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);;
+ failoverOnNodeShutdown = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);
}
else if (ENTRIES_NODE_NAME.equals(child.getNodeName()))
{
Modified: trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -1309,7 +1309,7 @@
actPreAck,
actTxBatchSize);
break;
- case JBossSession.SERVER_ACKNOWLEDGE:
+ case JBossSession.PRE_ACKNOWLEDGE:
result = sessionFactory.createSession(user,
pass,
deliveryTransacted,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-04-20 09:20:55 UTC (rev 6487)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-04-20 10:41:51 UTC (rev 6488)
@@ -141,7 +141,7 @@
public void testPreCommitAcks() throws Exception
{
Connection conn = cf.createConnection();
- Session session = conn.createSession(false, JBossSession.SERVER_ACKNOWLEDGE);
+ Session session = conn.createSession(false, JBossSession.PRE_ACKNOWLEDGE);
jBossQueue = new JBossQueue(Q_NAME);
MessageProducer producer = session.createProducer(jBossQueue);
MessageConsumer consumer = session.createConsumer(jBossQueue);
More information about the jboss-cvs-commits
mailing list