JBoss hornetq SVN: r8331 - in branches/ClebertTemporary: src/main/org/hornetq/core/persistence and 4 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-11-19 22:01:51 -0500 (Thu, 19 Nov 2009)
New Revision: 8331
Modified:
branches/ClebertTemporary/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/persistence/StorageManager.java
branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java
branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
Log:
Fixing tests
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-11-20 01:51:27 UTC (rev 8330)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-11-20 03:01:51 UTC (rev 8331)
@@ -438,7 +438,7 @@
{
Transaction transaction = resourceManager.removeTransaction(xid);
transaction.commit();
- server.getStorageManager().completeOperations();
+ server.getStorageManager().waitOnOperations(-1);
long recordID = server.getStorageManager().storeHeuristicCompletion(xid, true);
resourceManager.putHeuristicCompletion(recordID, xid, true);
return true;
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/persistence/StorageManager.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/persistence/StorageManager.java 2009-11-20 01:51:27 UTC (rev 8330)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/persistence/StorageManager.java 2009-11-20 03:01:51 UTC (rev 8331)
@@ -59,10 +59,14 @@
void afterCompleteOperations(IOAsyncTask run);
- /** Block until the replication is done.
+ /** Block until the operations are done.
* @throws Exception */
void waitOnOperations(long timeout) throws Exception;
+ /** Block until the operations are done.
+ * @throws Exception */
+ void waitOnOperations() throws Exception;
+
/** To close the OperationsContext */
void completeOperations();
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-11-20 01:51:27 UTC (rev 8330)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-11-20 03:01:51 UTC (rev 8331)
@@ -309,6 +309,12 @@
return replicator != null;
}
+
+ public void waitOnOperations() throws Exception
+ {
+ waitOnOperations(-1);
+ }
+
/* (non-Javadoc)
* @see org.hornetq.core.persistence.StorageManager#blockOnReplication()
*/
@@ -316,6 +322,12 @@
{
SimpleWaitIOCallback waitCallback = new SimpleWaitIOCallback();
afterCompleteOperations(waitCallback);
+ completeOperations();
+ if (timeout <= 0)
+ {
+ waitCallback.waitCompletion();
+ }
+ else
if (!waitCallback.waitCompletion(timeout))
{
throw new IllegalStateException("no response received from replication");
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java 2009-11-20 01:51:27 UTC (rev 8330)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java 2009-11-20 03:01:51 UTC (rev 8331)
@@ -349,4 +349,11 @@
run.done();
}
+ /* (non-Javadoc)
+ * @see org.hornetq.core.persistence.StorageManager#waitOnOperations()
+ */
+ public void waitOnOperations() throws Exception
+ {
+ }
+
}
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-20 01:51:27 UTC (rev 8330)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-20 03:01:51 UTC (rev 8331)
@@ -651,40 +651,46 @@
return deleteMatchingReferences(null);
}
- public synchronized int deleteMatchingReferences(final Filter filter) throws Exception
+ public int deleteMatchingReferences(final Filter filter) throws Exception
{
int count = 0;
-
- Transaction tx = new TransactionImpl(storageManager);
-
- Iterator<MessageReference> iter = messageReferences.iterator();
-
- while (iter.hasNext())
+
+ synchronized(this)
{
- MessageReference ref = iter.next();
-
- if (filter == null || filter.match(ref.getMessage()))
+
+ Transaction tx = new TransactionImpl(storageManager);
+
+ Iterator<MessageReference> iter = messageReferences.iterator();
+
+ while (iter.hasNext())
{
- deliveringCount.incrementAndGet();
- acknowledge(tx, ref);
- iter.remove();
- count++;
+ MessageReference ref = iter.next();
+
+ if (filter == null || filter.match(ref.getMessage()))
+ {
+ deliveringCount.incrementAndGet();
+ acknowledge(tx, ref);
+ iter.remove();
+ count++;
+ }
}
- }
-
- List<MessageReference> cancelled = scheduledDeliveryHandler.cancel();
- for (MessageReference messageReference : cancelled)
- {
- if (filter == null || filter.match(messageReference.getMessage()))
+
+ List<MessageReference> cancelled = scheduledDeliveryHandler.cancel();
+ for (MessageReference messageReference : cancelled)
{
- deliveringCount.incrementAndGet();
- acknowledge(tx, messageReference);
- count++;
+ if (filter == null || filter.match(messageReference.getMessage()))
+ {
+ deliveringCount.incrementAndGet();
+ acknowledge(tx, messageReference);
+ count++;
+ }
}
+
+ tx.commit();
}
+
+ storageManager.waitOnOperations(-1);
- tx.commit();
-
return count;
}
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-11-20 01:51:27 UTC (rev 8330)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-11-20 03:01:51 UTC (rev 8331)
@@ -1238,10 +1238,15 @@
*/
public void afterCompleteOperations(IOAsyncTask run)
{
- // TODO Auto-generated method stub
-
}
+ /* (non-Javadoc)
+ * @see org.hornetq.core.persistence.StorageManager#waitOnOperations()
+ */
+ public void waitOnOperations() throws Exception
+ {
+ }
+
}
class FakeStoreFactory implements PagingStoreFactory
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8330 - branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-11-19 20:51:27 -0500 (Thu, 19 Nov 2009)
New Revision: 8330
Modified:
branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/JournalImpl.java
Log:
Fixing tests
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/JournalImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-11-20 01:30:34 UTC (rev 8329)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-11-20 01:51:27 UTC (rev 8330)
@@ -85,7 +85,7 @@
private static final Logger log = Logger.getLogger(JournalImpl.class);
- private static final boolean trace = false;
+ private static final boolean trace = log.isTraceEnabled();
/** This is to be set to true at DEBUG & development only */
private static final boolean LOAD_TRACE = false;
@@ -96,6 +96,7 @@
private static final void trace(final String message)
{
log.trace(message);
+ //System.out.println("JournalImpl::" + message);
}
// The sizes of primitive types
@@ -866,6 +867,10 @@
public void appendAddRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync, final IOCompletion callback) throws Exception
{
+ if (LOAD_TRACE)
+ {
+ trace("appendAddRecord id = " + id + ", recordType = " + recordType);
+ }
if (state != STATE_LOADED)
{
throw new IllegalStateException("Journal must be loaded first");
@@ -929,6 +934,10 @@
public void appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync, final IOCompletion callback) throws Exception
{
+ if (LOAD_TRACE)
+ {
+ trace("appendUpdateRecord id = " + id + ", recordType = " + recordType);
+ }
if (state != STATE_LOADED)
{
throw new IllegalStateException("Journal must be loaded first");
@@ -1003,6 +1012,10 @@
public void appendDeleteRecord(final long id, final boolean sync, final IOCompletion callback) throws Exception
{
+ if (LOAD_TRACE)
+ {
+ trace("appendDeleteRecord id = " + id);
+ }
if (state != STATE_LOADED)
{
throw new IllegalStateException("Journal must be loaded first");
@@ -1073,6 +1086,10 @@
final byte recordType,
final EncodingSupport record) throws Exception
{
+ if (LOAD_TRACE)
+ {
+ trace("appendAddRecordTransactional txID " + txID + ", id = " + id + ", recordType = " + recordType);
+ }
if (state != STATE_LOADED)
{
throw new IllegalStateException("Journal must be loaded first");
@@ -1122,6 +1139,10 @@
final byte recordType,
final EncodingSupport record) throws Exception
{
+ if (LOAD_TRACE)
+ {
+ trace("appendUpdateRecordTransactional txID " + txID + ", id = " + id + ", recordType = " + recordType);
+ }
if (state != STATE_LOADED)
{
throw new IllegalStateException("Journal must be loaded first");
@@ -1165,6 +1186,11 @@
public void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception
{
+ if (LOAD_TRACE)
+ {
+ trace("appendDeleteRecordTransactional txID " + txID + ", id = " + id);
+ }
+
if (state != STATE_LOADED)
{
throw new IllegalStateException("Journal must be loaded first");
@@ -1246,6 +1272,11 @@
*/
public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync, IOCompletion callback) throws Exception
{
+ if (LOAD_TRACE)
+ {
+ trace("appendPrepareRecord txID " + txID);
+ }
+
if (state != STATE_LOADED)
{
throw new IllegalStateException("Journal must be loaded first");
@@ -1342,7 +1373,10 @@
if (tx == null)
{
- throw new IllegalStateException("Cannot find tx with id " + txID);
+ log.warn("Commit being called on an empty transaction, ignoring call. ID = " + txID);
+ // Commit being called on an empty transaction
+ callback.done();
+ return;
}
ChannelBuffer bb = newBuffer(SIZE_COMPLETE_TRANSACTION_RECORD);
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8329 - branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/client.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-11-19 20:30:34 -0500 (Thu, 19 Nov 2009)
New Revision: 8329
Modified:
branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
Log:
Fixing tests
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-11-20 01:23:23 UTC (rev 8328)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-11-20 01:30:34 UTC (rev 8329)
@@ -179,6 +179,14 @@
clientSession.rollback();
}
+ long timeout = System.currentTimeMillis() + 5000;
+
+ // DLA transfer is asynchronous fired on the rollback
+ while (System.currentTimeMillis() < timeout && ((Queue)server.getPostOffice().getBinding(qName).getBindable()).getMessageCount() != 0)
+ {
+ Thread.sleep(1);
+ }
+
assertEquals(0, ((Queue)server.getPostOffice().getBinding(qName).getBindable()).getMessageCount());
ClientMessage m = clientConsumer.receiveImmediate();
assertNull(m);
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8328 - branches/ClebertTemporary/src/main/org/hornetq/core/management/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-11-19 20:23:23 -0500 (Thu, 19 Nov 2009)
New Revision: 8328
Modified:
branches/ClebertTemporary/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
Log:
Fixing tests
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-11-20 01:17:02 UTC (rev 8327)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-11-20 01:23:23 UTC (rev 8328)
@@ -438,6 +438,7 @@
{
Transaction transaction = resourceManager.removeTransaction(xid);
transaction.commit();
+ server.getStorageManager().completeOperations();
long recordID = server.getStorageManager().storeHeuristicCompletion(xid, true);
resourceManager.putHeuristicCompletion(recordID, xid, true);
return true;
@@ -456,6 +457,7 @@
{
Transaction transaction = resourceManager.removeTransaction(xid);
transaction.rollback();
+ server.getStorageManager().completeOperations();
long recordID = server.getStorageManager().storeHeuristicCompletion(xid, false);
resourceManager.putHeuristicCompletion(recordID, xid, false);
return true;
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8327 - branches/ClebertTemporary/src/main/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-11-19 20:17:02 -0500 (Thu, 19 Nov 2009)
New Revision: 8327
Modified:
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java
Log:
removing another recursive IO
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-20 01:00:17 UTC (rev 8326)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-20 01:17:02 UTC (rev 8327)
@@ -1463,7 +1463,7 @@
private void postAcknowledge(final MessageReference ref)
{
- ServerMessage message = ref.getMessage();
+ final ServerMessage message = ref.getMessage();
QueueImpl queue = (QueueImpl)ref.getQueue();
@@ -1485,14 +1485,23 @@
// also note then when this happens as part of a trasaction its the tx commt of the ack that is important
// not this
- try
+
+ // and this has to happen in a different thread
+
+ journalExecutor.execute(new Runnable()
{
- storageManager.deleteMessage(message.getMessageID());
- }
- catch (Exception e)
- {
- log.warn("Unable to remove message id = " + message.getMessageID() + " please remove manually");
- }
+ public void run()
+ {
+ try
+ {
+ storageManager.deleteMessage(message.getMessageID());
+ }
+ catch (Exception e)
+ {
+ log.warn("Unable to remove message id = " + message.getMessageID() + " please remove manually");
+ }
+ }
+ });
}
}
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8326 - in branches/ClebertTemporary/src/main/org/hornetq/core: server/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-11-19 20:00:17 -0500 (Thu, 19 Nov 2009)
New Revision: 8326
Modified:
branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/JournalImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/TimedBuffer.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java
Log:
Fixing tests
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/JournalImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-11-20 01:00:17 UTC (rev 8326)
@@ -2964,7 +2964,10 @@
{
// Set the delegated callback as a parameter
TransactionCallback txcallback = tx.getCallback(currentFile);
- txcallback.setDelegateCompletion(parameterCallback);
+ if (parameterCallback != null)
+ {
+ txcallback.setDelegateCompletion(parameterCallback);
+ }
callback = txcallback;
}
else
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/TimedBuffer.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/TimedBuffer.java 2009-11-19 19:53:49 UTC (rev 8325)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/journal/impl/TimedBuffer.java 2009-11-20 01:00:17 UTC (rev 8326)
@@ -15,6 +15,7 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
@@ -280,7 +281,7 @@
bufferObserver.flushBuffer(directBuffer, pendingSync, callbacks);
- callbacks = new ArrayList<IOAsyncTask>();
+ callbacks = new LinkedList<IOAsyncTask>();
active = false;
pendingSync = false;
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-20 01:00:17 UTC (rev 8326)
@@ -627,6 +627,8 @@
{
acknowledge(ref);
}
+
+ storageManager.completeOperations();
}
public void setExpiryAddress(final SimpleString expiryAddress)
@@ -945,6 +947,7 @@
try
{
storageManager.updateDeliveryCount(reference);
+ storageManager.completeOperations();
}
catch (Exception e)
{
@@ -974,6 +977,7 @@
try
{
sendToDeadLetterAddress(reference);
+ storageManager.completeOperations();
}
catch (Exception e)
{
@@ -1005,7 +1009,8 @@
{
try
{
- sendToDeadLetterAddress(reference);
+ storageManager.updateScheduledDeliveryTime(reference);
+ storageManager.completeOperations();
}
catch (Exception e)
{
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java 2009-11-20 01:00:17 UTC (rev 8326)
@@ -147,14 +147,38 @@
storageManager.prepare(id, xid);
state = State.PREPARED;
+ // We use the Callback even for non persistence
+ // If we are using non-persistence with replication, the replication manager will have
+ // to execute this runnable in the correct order
+ storageManager.afterCompleteOperations(new IOAsyncTask()
+ {
- if (operations != null)
- {
- for (TransactionOperation operation : operations)
+ public void onError(int errorCode, String errorMessage)
{
- operation.afterPrepare(this);
+ log.warn("IO Error completing the transaction, code = " + errorCode + ", message = " + errorMessage);
}
- }
+
+ public void done()
+ {
+ if (operations != null)
+ {
+ System.out.println("Prepare was executed fine");
+ for (TransactionOperation operation : operations)
+ {
+ try
+ {
+ operation.afterPrepare(TransactionImpl.this);
+ }
+ catch (Exception e)
+ {
+ // https://jira.jboss.org/jira/browse/HORNETQ-188
+ // After commit shouldn't throw an exception
+ log.warn(e.getMessage(), e);
+ }
+ }
+ }
+ }
+ });
}
}
@@ -186,7 +210,11 @@
{
if (state == State.ACTIVE)
{
- prepare();
+ // Why do we need a prepare record on the onePhase optimization?
+ // Why we can't just go straight to commit, if we are doing one phase anyway?
+ state = State.PREPARED;
+// System.out.println("Adding Prepare");
+// prepare();
}
}
if (state != State.PREPARED)
@@ -212,6 +240,7 @@
if (containsPersistent || (xid != null && state == State.PREPARED))
{
+ System.out.println("Adding commit");
storageManager.commit(id);
state = State.COMMITTED;
@@ -230,6 +259,7 @@
public void done()
{
+ System.out.println("Commit was executed fine");
if (operations != null)
{
for (TransactionOperation operation : operations)
@@ -283,13 +313,38 @@
state = State.ROLLEDBACK;
- if (operations != null)
+ // We use the Callback even for non persistence
+ // If we are using non-persistence with replication, the replication manager will have
+ // to execute this runnable in the correct order
+ storageManager.afterCompleteOperations(new IOAsyncTask()
{
- for (TransactionOperation operation : operations)
+
+ public void onError(int errorCode, String errorMessage)
{
- operation.afterRollback(this);
+ log.warn("IO Error completing the transaction, code = " + errorCode + ", message = " + errorMessage);
}
- }
+
+ public void done()
+ {
+ if (operations != null)
+ {
+ System.out.println("Rollback was executed fine");
+ for (TransactionOperation operation : operations)
+ {
+ try
+ {
+ operation.afterRollback(TransactionImpl.this);
+ }
+ catch (Exception e)
+ {
+ // https://jira.jboss.org/jira/browse/HORNETQ-188
+ // After commit shouldn't throw an exception
+ log.warn(e.getMessage(), e);
+ }
+ }
+ }
+ }
+ });
}
}
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8325 - in branches/ClebertTemporary: src/main/org/hornetq/core/paging and 13 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-11-19 14:53:49 -0500 (Thu, 19 Nov 2009)
New Revision: 8325
Modified:
branches/ClebertTemporary/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/paging/PagingStore.java
branches/ClebertTemporary/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/FileLargeServerMessage.java
branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/LargeServerMessage.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/Queue.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/ServerMessage.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/LastValueQueue.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
branches/ClebertTemporary/src/main/org/hornetq/core/transaction/TransactionOperation.java
branches/ClebertTemporary/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java
branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java
branches/ClebertTemporary/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java
branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java
branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java
branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java
branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
Log:
Removing recursive IO calls on the callbacks
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -1024,6 +1024,7 @@
}
catch (HornetQException e)
{
+ log.warn(e.getMessage(), e);
// This should never occur
throw new XAException(XAException.XAER_RMERR);
}
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/paging/PagingStore.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/paging/PagingStore.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/paging/PagingStore.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -67,14 +67,14 @@
* @param message
* @throws Exception
*/
- void addSize(ServerMessage message, boolean add) throws Exception;
+ void addSize(ServerMessage message, boolean add);
/**
*
* @param reference
* @throws Exception
*/
- void addSize(MessageReference reference, boolean add) throws Exception;
+ void addSize(MessageReference reference, boolean add);
/**
*
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -281,7 +281,7 @@
checkReleaseProducerFlowControlCredits(-credits);
}
- public void addSize(final ServerMessage message, final boolean add) throws Exception
+ public void addSize(final ServerMessage message, final boolean add)
{
long size = message.getMemoryEstimate();
@@ -299,7 +299,7 @@
}
}
- public void addSize(final MessageReference reference, final boolean add) throws Exception
+ public void addSize(final MessageReference reference, final boolean add)
{
long size = MessageReferenceImpl.getMemoryEstimate();
@@ -479,7 +479,7 @@
}
}
- public boolean startPaging() throws Exception
+ public boolean startPaging()
{
if (!running)
{
@@ -510,7 +510,17 @@
{
if (currentPage == null)
{
- openNewPage();
+ try
+ {
+ openNewPage();
+ }
+ catch (Exception e)
+ {
+ // If not possible to starting page due to an IO error, we will just consider it non paging.
+ // This shouldn't happen anyway
+ log.warn("IO Error, impossible to start paging", e);
+ return false;
+ }
return true;
}
@@ -701,7 +711,7 @@
}
}
- private void addSize(final long size) throws Exception
+ private void addSize(final long size)
{
if (addressFullMessagePolicy != AddressFullMessagePolicy.PAGE)
{
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/FileLargeServerMessage.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/FileLargeServerMessage.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/FileLargeServerMessage.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -176,7 +176,7 @@
this.delayDeletionCount.incrementAndGet();
}
- public synchronized void decrementDelayDeletionCount() throws Exception
+ public synchronized void decrementDelayDeletionCount()
{
int count = this.delayDeletionCount.decrementAndGet();
@@ -191,7 +191,7 @@
return new DecodingContext();
}
- private void checkDelete() throws Exception
+ private void checkDelete()
{
if (getRefCount() <= 0)
{
@@ -220,7 +220,7 @@
}
@Override
- public synchronized int decrementRefCount(MessageReference reference) throws Exception
+ public synchronized int decrementRefCount(MessageReference reference)
{
int currentRefCount = super.decrementRefCount(reference);
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -1865,11 +1865,11 @@
}
}
- public void afterPrepare(final Transaction tx) throws Exception
+ public void afterPrepare(final Transaction tx)
{
}
- public void afterRollback(final Transaction tx) throws Exception
+ public void afterRollback(final Transaction tx)
{
PageTransactionInfo pageTransaction = (PageTransactionInfo)tx.getProperty(TransactionPropertyIndexes.PAGE_TRANSACTION);
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -138,7 +138,7 @@
/* (non-Javadoc)
* @see org.hornetq.core.server.LargeServerMessage#decrementDelayDeletionCount()
*/
- public void decrementDelayDeletionCount() throws Exception
+ public void decrementDelayDeletionCount()
{
}
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -211,7 +211,7 @@
this.recordID = recordID;
}
- private void process() throws Exception
+ private void process()
{
if (!done)
{
@@ -246,17 +246,17 @@
{
}
- public void afterCommit(final Transaction tx) throws Exception
+ public void afterCommit(final Transaction tx)
{
process();
}
- public void afterPrepare(final Transaction tx) throws Exception
+ public void afterPrepare(final Transaction tx)
{
process();
}
- public void afterRollback(final Transaction tx) throws Exception
+ public void afterRollback(final Transaction tx)
{
}
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -1114,11 +1114,11 @@
}
}
- public void afterPrepare(final Transaction tx) throws Exception
+ public void afterPrepare(final Transaction tx)
{
}
- public void afterRollback(final Transaction tx) throws Exception
+ public void afterRollback(final Transaction tx)
{
PageTransactionInfo pageTransaction = (PageTransactionInfo)tx.getProperty(TransactionPropertyIndexes.PAGE_TRANSACTION);
@@ -1225,11 +1225,11 @@
}
}
- public void afterPrepare(Transaction tx) throws Exception
+ public void afterPrepare(Transaction tx)
{
}
- public void afterRollback(Transaction tx) throws Exception
+ public void afterRollback(Transaction tx)
{
}
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/LargeServerMessage.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/LargeServerMessage.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/LargeServerMessage.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -42,5 +42,5 @@
void incrementDelayDeletionCount();
- void decrementDelayDeletionCount() throws Exception;
+ void decrementDelayDeletionCount();
}
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/Queue.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/Queue.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/Queue.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -125,6 +125,10 @@
Collection<Consumer> getConsumers();
+ /** We can't execute IO operation when inside the IOCallback / TransactionCallback.
+ * This method will will perform IO operations in a second thread */
+ boolean checkDLQ(MessageReference ref, Executor ioExecutor) throws Exception;
+
boolean checkDLQ(MessageReference ref) throws Exception;
void lockDelivery();
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/ServerMessage.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/ServerMessage.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/ServerMessage.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -33,7 +33,7 @@
int incrementRefCount(MessageReference reference) throws Exception;
- int decrementRefCount(MessageReference reference) throws Exception;
+ int decrementRefCount(MessageReference reference);
int incrementDurableRefCount();
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -1025,7 +1025,7 @@
configuration.getManagementClusterPassword(),
managementService);
- queueFactory = new QueueFactoryImpl(scheduledPool, addressSettingsRepository, storageManager);
+ queueFactory = new QueueFactoryImpl(executorFactory, scheduledPool, addressSettingsRepository, storageManager);
pagingManager = createPagingManager();
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/LastValueQueue.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -14,6 +14,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
import org.hornetq.core.filter.Filter;
@@ -50,6 +51,7 @@
final Filter filter,
final boolean durable,
final boolean temporary,
+ final Executor executor,
final ScheduledExecutorService scheduledExecutor,
final PostOffice postOffice,
final StorageManager storageManager,
@@ -61,6 +63,7 @@
filter,
durable,
temporary,
+ executor,
scheduledExecutor,
postOffice,
storageManager,
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -22,6 +22,7 @@
import org.hornetq.core.server.QueueFactory;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
+import org.hornetq.utils.ExecutorFactory;
import org.hornetq.utils.SimpleString;
/**
@@ -42,11 +43,16 @@
private PostOffice postOffice;
private final StorageManager storageManager;
+
+ private final ExecutorFactory executorFactory;
- public QueueFactoryImpl(final ScheduledExecutorService scheduledExecutor,
+ public QueueFactoryImpl(final ExecutorFactory executorFactory,
+ final ScheduledExecutorService scheduledExecutor,
final HierarchicalRepository<AddressSettings> addressSettingsRepository,
final StorageManager storageManager)
{
+ this.executorFactory = executorFactory;
+
this.addressSettingsRepository = addressSettingsRepository;
this.scheduledExecutor = scheduledExecutor;
@@ -77,6 +83,7 @@
filter,
durable,
temporary,
+ executorFactory.getExecutor(),
scheduledExecutor,
postOffice,
storageManager,
@@ -90,6 +97,7 @@
filter,
durable,
temporary,
+ executorFactory.getExecutor(),
scheduledExecutor,
postOffice,
storageManager,
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -114,6 +114,9 @@
private final HierarchicalRepository<AddressSettings> addressSettingsRepository;
private final ScheduledExecutorService scheduledExecutor;
+
+ /** We can't perform any operation on the journal while inside the Transactional operations. */
+ private final Executor journalExecutor;
private final SimpleString address;
@@ -139,6 +142,7 @@
final Filter filter,
final boolean durable,
final boolean temporary,
+ final Executor executor,
final ScheduledExecutorService scheduledExecutor,
final PostOffice postOffice,
final StorageManager storageManager,
@@ -163,6 +167,8 @@
this.addressSettingsRepository = addressSettingsRepository;
this.scheduledExecutor = scheduledExecutor;
+
+ this.journalExecutor = executor;
direct = true;
@@ -921,11 +927,36 @@
public boolean checkDLQ(final MessageReference reference) throws Exception
{
+ return checkDLQ(reference, null);
+ }
+
+ public boolean checkDLQ(final MessageReference reference, Executor ioExecutor) throws Exception
+ {
ServerMessage message = reference.getMessage();
if (message.isDurable() && durable)
{
- storageManager.updateDeliveryCount(reference);
+ if (ioExecutor != null)
+ {
+ ioExecutor.execute(new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ storageManager.updateDeliveryCount(reference);
+ }
+ catch (Exception e)
+ {
+ log.warn("Can't update delivery count on checkDLQ", e);
+ }
+ }
+ });
+ }
+ else
+ {
+ storageManager.updateDeliveryCount(reference);
+ }
}
AddressSettings addressSettings = addressSettingsRepository.getMatch(address.toString());
@@ -934,7 +965,27 @@
if (maxDeliveries > 0 && reference.getDeliveryCount() >= maxDeliveries)
{
- sendToDeadLetterAddress(reference);
+ if (ioExecutor != null)
+ {
+ ioExecutor.execute(new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ sendToDeadLetterAddress(reference);
+ }
+ catch (Exception e)
+ {
+ log.warn("Error on DLQ send", e);
+ }
+ }
+ });
+ }
+ else
+ {
+ sendToDeadLetterAddress(reference);
+ }
return false;
}
@@ -946,7 +997,27 @@
{
reference.setScheduledDeliveryTime(System.currentTimeMillis() + redeliveryDelay);
- storageManager.updateScheduledDeliveryTime(reference);
+ if (ioExecutor != null)
+ {
+ ioExecutor.execute(new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ sendToDeadLetterAddress(reference);
+ }
+ catch (Exception e)
+ {
+ log.warn("Error on DLQ send", e);
+ }
+ }
+ });
+ }
+ else
+ {
+ storageManager.updateScheduledDeliveryTime(reference);
+ }
}
deliveringCount.decrementAndGet();
@@ -1377,7 +1448,7 @@
return status;
}
- private void removeExpiringReference(final MessageReference ref) throws Exception
+ private void removeExpiringReference(final MessageReference ref)
{
if (ref.getMessage().getExpiration() > 0)
{
@@ -1385,7 +1456,7 @@
}
}
- private void postAcknowledge(final MessageReference ref) throws Exception
+ private void postAcknowledge(final MessageReference ref)
{
ServerMessage message = ref.getMessage();
@@ -1427,7 +1498,7 @@
message.decrementRefCount(ref);
}
- void postRollback(final LinkedList<MessageReference> refs) throws Exception
+ void postRollback(final LinkedList<MessageReference> refs)
{
synchronized (this)
{
@@ -1477,29 +1548,38 @@
{
}
- public void afterPrepare(final Transaction tx) throws Exception
+ public void afterPrepare(final Transaction tx)
{
}
- public void afterRollback(final Transaction tx) throws Exception
+ public void afterRollback(final Transaction tx)
{
Map<QueueImpl, LinkedList<MessageReference>> queueMap = new HashMap<QueueImpl, LinkedList<MessageReference>>();
for (MessageReference ref : refsToAck)
{
- if (ref.getQueue().checkDLQ(ref))
+ try
{
- LinkedList<MessageReference> toCancel = queueMap.get(ref.getQueue());
-
- if (toCancel == null)
+ if (ref.getQueue().checkDLQ(ref, journalExecutor))
{
- toCancel = new LinkedList<MessageReference>();
-
- queueMap.put((QueueImpl)ref.getQueue(), toCancel);
+ LinkedList<MessageReference> toCancel = queueMap.get(ref.getQueue());
+
+ if (toCancel == null)
+ {
+ toCancel = new LinkedList<MessageReference>();
+
+ queueMap.put((QueueImpl)ref.getQueue(), toCancel);
+ }
+
+ toCancel.addFirst(ref);
}
-
- toCancel.addFirst(ref);
}
+ catch (Exception e)
+ {
+ // checkDLQ here will be using an executor, this shouldn't happen
+ // don't you just hate checked exceptions in java?
+ log.warn("Error on checkDLQ", e);
+ }
}
for (Map.Entry<QueueImpl, LinkedList<MessageReference>> entry : queueMap.entrySet())
@@ -1515,7 +1595,7 @@
}
}
- public void afterCommit(final Transaction tx) throws Exception
+ public void afterCommit(final Transaction tx)
{
for (MessageReference ref : refsToAck)
{
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -119,7 +119,7 @@
return count;
}
- public int decrementRefCount(final MessageReference reference) throws Exception
+ public int decrementRefCount(final MessageReference reference)
{
int count = refCount.decrementAndGet();
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -766,6 +766,7 @@
public void handleRollback(final RollbackMessage packet)
{
+ new Exception("Rollback").printStackTrace();
Packet response = null;
try
@@ -1078,6 +1079,7 @@
public void handleXARollback(final SessionXARollbackMessage packet)
{
+ System.out.println("XARollback");
Packet response = null;
Xid xid = packet.getXid();
Modified: branches/ClebertTemporary/src/main/org/hornetq/core/transaction/TransactionOperation.java
===================================================================
--- branches/ClebertTemporary/src/main/org/hornetq/core/transaction/TransactionOperation.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/src/main/org/hornetq/core/transaction/TransactionOperation.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -29,9 +29,9 @@
void beforeRollback(Transaction tx) throws Exception;
- void afterPrepare(Transaction tx) throws Exception;
+ void afterPrepare(Transaction tx);
- void afterCommit(Transaction tx) throws Exception;
+ void afterCommit(Transaction tx);
- void afterRollback(Transaction tx) throws Exception;
+ void afterRollback(Transaction tx);
}
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -40,8 +40,20 @@
{
private static final Logger log = Logger.getLogger(QueueTest.class);
- private QueueFactory queueFactory = new FakeQueueFactory();
+ private FakeQueueFactory queueFactory = new FakeQueueFactory();
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ queueFactory = new FakeQueueFactory();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ queueFactory.stop();
+ super.tearDown();
+ }
+
/*
* Concurrent set consumer not busy, busy then, call deliver while messages are being added and consumed
*/
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -538,15 +538,15 @@
{
}
- public void afterPrepare(Transaction tx) throws Exception
+ public void afterPrepare(Transaction tx)
{
}
- public void afterCommit(Transaction tx) throws Exception
+ public void afterCommit(Transaction tx)
{
}
- public void afterRollback(Transaction tx) throws Exception
+ public void afterRollback(Transaction tx)
{
latch.countDown();
}
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -15,6 +15,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@@ -41,17 +43,23 @@
private static final Logger log = Logger.getLogger(QueueImplTest.class);
private ScheduledExecutorService scheduledExecutor;
+
+ private ExecutorService executor;
public void setUp() throws Exception
{
super.setUp();
scheduledExecutor = new ScheduledThreadPoolExecutor(1);
+
+ executor = Executors.newSingleThreadExecutor();
}
public void tearDown() throws Exception
{
scheduledExecutor.shutdownNow();
+
+ executor.shutdown();
super.tearDown();
}
@@ -70,7 +78,7 @@
public void testScheduledNoConsumer() throws Exception
{
- Queue queue = new QueueImpl(1, new SimpleString("address1"), new SimpleString("queue1"), null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, new SimpleString("address1"), new SimpleString("queue1"), null, false, true, executor, scheduledExecutor, null, null, null);
//Send one scheduled
@@ -136,7 +144,7 @@
private void testScheduled(boolean direct) throws Exception
{
- Queue queue = new QueueImpl(1,new SimpleString("address1"), new SimpleString("queue1"), null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1,new SimpleString("address1"), new SimpleString("queue1"), null, false, true, executor, scheduledExecutor, null, null, null);
FakeConsumer consumer = null;
@@ -243,7 +251,7 @@
return HandleStatus.HANDLED;
}
};
- Queue queue = new QueueImpl(1, new SimpleString("address1"), queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, new SimpleString("address1"), queue1, null, false, true, executor, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
queue.addConsumer(consumer);
messageReference.setScheduledDeliveryTime(System.currentTimeMillis() + 2000);
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -1131,7 +1131,7 @@
return null;
}
- public int decrementRefCount(MessageReference reference) throws Exception
+ public int decrementRefCount(MessageReference reference)
{
// TODO Auto-generated method stub
return 0;
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -493,4 +493,13 @@
return false;
}
+ /* (non-Javadoc)
+ * @see org.hornetq.core.server.Queue#checkDLQ(org.hornetq.core.server.MessageReference, java.util.concurrent.Executor)
+ */
+ public boolean checkDLQ(MessageReference ref, Executor ioExecutor) throws Exception
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
\ No newline at end of file
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -17,6 +17,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@@ -43,7 +44,23 @@
{
// The tests ----------------------------------------------------------------
- private final ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+ private ScheduledExecutorService scheduledExecutor;
+
+ private ExecutorService executor;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+ executor = Executors.newSingleThreadExecutor();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ scheduledExecutor.shutdown();
+ executor.shutdown();
+ super.tearDown();
+ }
private static final SimpleString queue1 = new SimpleString("queue1");
@@ -53,18 +70,18 @@
{
final SimpleString name = new SimpleString("oobblle");
- Queue queue = new QueueImpl(1, address1, name, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, name, null, false, true, executor, scheduledExecutor, null, null, null);
assertEquals(name, queue.getName());
}
public void testDurable()
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, false, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, false, executor, scheduledExecutor, null, null, null);
assertFalse(queue.isDurable());
- queue = new QueueImpl(1, address1, queue1, null, true, false, scheduledExecutor, null, null, null);
+ queue = new QueueImpl(1, address1, queue1, null, true, false, executor, scheduledExecutor, null, null, null);
assertTrue(queue.isDurable());
}
@@ -77,7 +94,7 @@
Consumer cons3 = new FakeConsumer();
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
assertEquals(0, queue.getConsumerCount());
@@ -118,7 +135,7 @@
public void testGetFilter()
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
assertNull(queue.getFilter());
@@ -135,7 +152,7 @@
}
};
- queue = new QueueImpl(1, address1, queue1, filter, false, true, scheduledExecutor, null, null, null);
+ queue = new QueueImpl(1, address1, queue1, filter, false, true, executor, scheduledExecutor, null, null, null);
assertEquals(filter, queue.getFilter());
@@ -143,7 +160,7 @@
public void testSimpleadd()
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -162,7 +179,7 @@
public void testSimpleDirectDelivery() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
FakeConsumer consumer = new FakeConsumer();
@@ -190,7 +207,7 @@
public void testSimpleNonDirectDelivery() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -228,7 +245,7 @@
public void testBusyConsumer() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
FakeConsumer consumer = new FakeConsumer();
@@ -272,7 +289,7 @@
public void testBusyConsumerThenAddMoreMessages() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
FakeConsumer consumer = new FakeConsumer();
@@ -339,7 +356,7 @@
public void testAddFirstadd() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -399,7 +416,7 @@
null,
false,
true,
- scheduledExecutor,
+ executor, scheduledExecutor,
new FakePostOffice(),
null,
null);
@@ -556,7 +573,7 @@
public void testConsumerReturningNull() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
class NullConsumer implements Consumer
{
@@ -589,7 +606,7 @@
public void testRoundRobinWithQueueing() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -632,7 +649,7 @@
public void testRoundRobinDirect() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -673,7 +690,7 @@
public void testWithPriorities() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -740,7 +757,7 @@
public void testConsumerWithFilterAddAndRemove()
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
Filter filter = new FakeFilter("fruit", "orange");
@@ -749,7 +766,7 @@
public void testList()
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 20;
@@ -773,7 +790,7 @@
public void testListWithFilter()
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 20;
@@ -815,7 +832,7 @@
null,
false,
true,
- scheduledExecutor,
+ executor, scheduledExecutor,
new FakePostOffice(),
null,
null);
@@ -887,7 +904,7 @@
public void testBusyConsumerWithFilterFirstCallBusy() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
FakeConsumer consumer = new FakeConsumer(FilterImpl.createFilter("color = 'green'"));
@@ -928,7 +945,7 @@
public void testBusyConsumerWithFilterThenAddMoreMessages() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
FakeConsumer consumer = new FakeConsumer(FilterImpl.createFilter("color = 'green'"));
@@ -1002,7 +1019,7 @@
public void testConsumerWithFilterThenAddMoreMessages() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
final int numMessages = 10;
List<MessageReference> refs = new ArrayList<MessageReference>();
@@ -1072,7 +1089,7 @@
null,
false,
true,
- scheduledExecutor,
+ executor, scheduledExecutor,
new FakePostOffice(),
null,
null);
@@ -1164,7 +1181,7 @@
public void testMessageOrder() throws Exception
{
FakeConsumer consumer = new FakeConsumer();
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
MessageReference messageReference2 = generateReference(queue, 2);
MessageReference messageReference3 = generateReference(queue, 3);
@@ -1184,7 +1201,7 @@
public void testMessagesAdded() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
MessageReference messageReference2 = generateReference(queue, 2);
MessageReference messageReference3 = generateReference(queue, 3);
@@ -1196,7 +1213,7 @@
public void testGetReference() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
MessageReference messageReference2 = generateReference(queue, 2);
MessageReference messageReference3 = generateReference(queue, 3);
@@ -1209,7 +1226,7 @@
public void testGetNonExistentReference() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
MessageReference messageReference2 = generateReference(queue, 2);
MessageReference messageReference3 = generateReference(queue, 3);
@@ -1226,7 +1243,7 @@
*/
public void testPauseAndResumeWithAsync() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
// pauses the queue
queue.pause();
@@ -1281,7 +1298,7 @@
public void testPauseAndResumeWithDirect() throws Exception
{
- Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, executor, scheduledExecutor, null, null, null);
// Now add a consumer
FakeConsumer consumer = new FakeConsumer();
Modified: branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
===================================================================
--- branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java 2009-11-19 17:50:33 UTC (rev 8324)
+++ branches/ClebertTemporary/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java 2009-11-19 19:53:49 UTC (rev 8325)
@@ -13,6 +13,7 @@
package org.hornetq.tests.unit.core.server.impl.fakes;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@@ -32,14 +33,16 @@
*/
public class FakeQueueFactory implements QueueFactory
{
- private final ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
-
+ private final ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+
+ private final ExecutorService executor = Executors.newSingleThreadExecutor();
+
private PostOffice postOffice;
public Queue createQueue(long persistenceID, final SimpleString address, SimpleString name, Filter filter,
boolean durable, boolean temporary)
{
- return new QueueImpl(persistenceID, address, name, filter, durable, temporary, scheduledExecutor, postOffice, null, null);
+ return new QueueImpl(persistenceID, address, name, filter, durable, temporary, executor, scheduledExecutor, postOffice, null, null);
}
public void setPostOffice(PostOffice postOffice)
@@ -47,5 +50,12 @@
this.postOffice = postOffice;
}
+
+ public void stop() throws Exception
+ {
+ scheduledExecutor.shutdown();
+
+ executor.shutdown();
+ }
}
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8324 - trunk/tests/src/org/hornetq/tests/integration/client.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-11-19 12:50:33 -0500 (Thu, 19 Nov 2009)
New Revision: 8324
Modified:
trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
Log:
fixed TemporaryQueueTest.testDeleteTemporaryQueueWhenClientCrash
* the server must received at least 1 ping from the client to use the client Connection TTL value instead of the default server value
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-11-19 15:59:30 UTC (rev 8323)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-11-19 17:50:33 UTC (rev 8324)
@@ -30,9 +30,13 @@
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.CloseListener;
+import org.hornetq.core.remoting.Interceptor;
+import org.hornetq.core.remoting.Packet;
import org.hornetq.core.remoting.RemotingConnection;
import org.hornetq.core.remoting.impl.RemotingConnectionImpl;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
+import org.hornetq.core.remoting.impl.wireformat.PacketImpl;
+import org.hornetq.core.remoting.server.impl.RemotingServiceImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
@@ -171,42 +175,52 @@
public void testDeleteTemporaryQueueWhenClientCrash() throws Exception
{
+ session.close();
+
final SimpleString queue = randomSimpleString();
SimpleString address = randomSimpleString();
+ // server must received at least one ping from the client to pass
+ // so that the server connection TTL is configured with the client value
+ final CountDownLatch pingOnServerLatch = new CountDownLatch(1);
+ server.getRemotingService().addInterceptor(new Interceptor()
+ {
+
+ public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException
+ {
+ if (packet.getType() == PacketImpl.PING)
+ {
+ pingOnServerLatch.countDown();
+ }
+ return true;
+ }
+ });
+
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+ sf.setConnectionTTL(CONNECTION_TTL);
+ session = sf.createSession(false, true, true);
+
session.createTemporaryQueue(address, queue);
-
+ assertTrue("server has not received any ping from the client", pingOnServerLatch.await(2 * RemotingServiceImpl.CONNECTION_TTL_CHECK_INTERVAL, TimeUnit.MILLISECONDS));
assertEquals(1, server.getConnectionCount());
- RemotingConnection remotingConnection = server
- .getRemotingService()
+ RemotingConnection remotingConnection = server.getRemotingService()
.getConnections()
.iterator()
.next();
- final CountDownLatch latch = new CountDownLatch(1);
- final CountDownLatch latch2 = new CountDownLatch(1);
+ final CountDownLatch serverCloseLatch = new CountDownLatch(1);
remotingConnection.addCloseListener(new CloseListener()
{
public void connectionClosed()
{
- latch.countDown();
+ serverCloseLatch.countDown();
}
});
- server.getRemotingService().getConnections().iterator().next().addCloseListener(new CloseListener()
- {
- public void connectionClosed()
- {
- latch2.countDown();
- }
- });
-
((ClientSessionInternal)session).getConnection().fail(new HornetQException(HornetQException.INTERNAL_ERROR, "simulate a client failure"));
-
// let some time for the server to clean the connections
- latch.await(2 * CONNECTION_TTL + 1000, TimeUnit.MILLISECONDS);
- latch2.await(4 * CONNECTION_TTL + 1000, TimeUnit.MILLISECONDS);
+ assertTrue("server has not closed the connection", serverCloseLatch.await(2 * RemotingServiceImpl.CONNECTION_TTL_CHECK_INTERVAL + 2 * CONNECTION_TTL , TimeUnit.MILLISECONDS));
assertEquals(0, server.getConnectionCount());
session.close();
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8323 - in trunk: examples/common and 94 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-11-19 10:59:30 -0500 (Thu, 19 Nov 2009)
New Revision: 8323
Modified:
trunk/docs/user-manual/en/client-reconnection.xml
trunk/docs/user-manual/en/clusters.xml
trunk/docs/user-manual/en/configuration-index.xml
trunk/docs/user-manual/en/configuring-transports.xml
trunk/docs/user-manual/en/flow-control.xml
trunk/docs/user-manual/en/large-messages.xml
trunk/docs/user-manual/en/message-grouping.xml
trunk/docs/user-manual/en/pre-acknowledge.xml
trunk/docs/user-manual/en/thread-pooling.xml
trunk/docs/user-manual/en/using-jms.xml
trunk/examples/common/build.xml
trunk/examples/javaee/ejb-jms-transaction/server/hornetq-jms.xml
trunk/examples/javaee/hajndi/config/hornetq-jms.xml
trunk/examples/javaee/jca-config/server/hornetq-jms.xml
trunk/examples/javaee/jms-bridge/server/hornetq-jms.xml
trunk/examples/javaee/mdb-bmt/server/hornetq-jms.xml
trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-jms.xml
trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-jms.xml
trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-jms.xml
trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-jms.xml
trunk/examples/javaee/mdb-message-selector/server/hornetq-jms.xml
trunk/examples/javaee/mdb-tx-send/server/hornetq-jms.xml
trunk/examples/javaee/servlet-ssl/server/hornetq-jms.xml
trunk/examples/javaee/servlet-transport/server/hornetq-jms.xml
trunk/examples/javaee/xarecovery/server/hornetq-jms.xml
trunk/examples/jms/applet/server0/hornetq-jms.xml
trunk/examples/jms/application-layer-failover/server0/hornetq-jms.xml
trunk/examples/jms/application-layer-failover/server1/hornetq-jms.xml
trunk/examples/jms/automatic-failover/server0/hornetq-jms.xml
trunk/examples/jms/automatic-failover/server1/hornetq-jms.xml
trunk/examples/jms/bridge/server0/hornetq-jms.xml
trunk/examples/jms/bridge/server1/hornetq-jms.xml
trunk/examples/jms/browser/server0/hornetq-jms.xml
trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml
trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jms.xml
trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jms.xml
trunk/examples/jms/clustered-grouping/server0/hornetq-jms.xml
trunk/examples/jms/clustered-grouping/server1/hornetq-jms.xml
trunk/examples/jms/clustered-grouping/server2/hornetq-jms.xml
trunk/examples/jms/clustered-queue/server0/hornetq-jms.xml
trunk/examples/jms/clustered-queue/server1/hornetq-jms.xml
trunk/examples/jms/clustered-topic/server0/hornetq-jms.xml
trunk/examples/jms/clustered-topic/server1/hornetq-jms.xml
trunk/examples/jms/consumer-rate-limit/server0/hornetq-jms.xml
trunk/examples/jms/dead-letter/server0/hornetq-jms.xml
trunk/examples/jms/delayed-redelivery/server0/hornetq-jms.xml
trunk/examples/jms/divert/server0/hornetq-jms.xml
trunk/examples/jms/divert/server1/hornetq-jms.xml
trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml
trunk/examples/jms/expiry/server0/hornetq-jms.xml
trunk/examples/jms/http-transport/server0/hornetq-jms.xml
trunk/examples/jms/interceptor/server0/hornetq-jms.xml
trunk/examples/jms/jaas/server0/hornetq-jms.xml
trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml
trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml
trunk/examples/jms/jmx/server0/hornetq-jms.xml
trunk/examples/jms/large-message/server0/hornetq-jms.xml
trunk/examples/jms/last-value-queue/server0/hornetq-jms.xml
trunk/examples/jms/management-notifications/server0/hornetq-jms.xml
trunk/examples/jms/management/server0/hornetq-jms.xml
trunk/examples/jms/message-counters/server0/hornetq-jms.xml
trunk/examples/jms/message-group/server0/hornetq-jms.xml
trunk/examples/jms/message-priority/server0/hornetq-jms.xml
trunk/examples/jms/no-consumer-buffering/server0/hornetq-jms.xml
trunk/examples/jms/non-transaction-failover/server0/hornetq-jms.xml
trunk/examples/jms/non-transaction-failover/server1/hornetq-jms.xml
trunk/examples/jms/paging/server0/hornetq-jms.xml
trunk/examples/jms/perf/server0/hornetq-jms.xml
trunk/examples/jms/pre-acknowledge/server0/hornetq-jms.xml
trunk/examples/jms/producer-rate-limit/server0/hornetq-jms.xml
trunk/examples/jms/queue-message-redistribution/server0/hornetq-jms.xml
trunk/examples/jms/queue-message-redistribution/server1/hornetq-jms.xml
trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml
trunk/examples/jms/queue-selector/server0/hornetq-jms.xml
trunk/examples/jms/queue/server0/hornetq-jms.xml
trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml
trunk/examples/jms/request-reply/server0/hornetq-jms.xml
trunk/examples/jms/scheduled-message/server0/hornetq-jms.xml
trunk/examples/jms/security/server0/hornetq-jms.xml
trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml
trunk/examples/jms/ssl-enabled/server0/hornetq-jms.xml
trunk/examples/jms/static-selector-jms/server0/hornetq-jms.xml
trunk/examples/jms/static-selector/server0/hornetq-jms.xml
trunk/examples/jms/temp-queue/server0/hornetq-jms.xml
trunk/examples/jms/topic-hierarchies/server0/hornetq-jms.xml
trunk/examples/jms/topic-selector-example1/server0/hornetq-jms.xml
trunk/examples/jms/topic-selector-example2/server0/hornetq-jms.xml
trunk/examples/jms/topic/server0/hornetq-jms.xml
trunk/examples/jms/transaction-failover/server0/hornetq-jms.xml
trunk/examples/jms/transaction-failover/server1/hornetq-jms.xml
trunk/examples/jms/transactional/server0/hornetq-jms.xml
trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml
trunk/examples/jms/xa-receive/server0/hornetq-jms.xml
trunk/examples/jms/xa-send/server0/hornetq-jms.xml
trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml
trunk/examples/soak/normal/server0/hornetq-jms.xml
trunk/src/config/common/schema/hornetq-jms.xsd
trunk/src/config/jboss-as/clustered/hornetq-jms.xml
trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
trunk/src/config/stand-alone/clustered/hornetq-jms.xml
trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml
trunk/src/config/trunk/clustered/hornetq-jms.xml
trunk/src/config/trunk/non-clustered/hornetq-jms.xml
trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
trunk/tests/jms-tests/config/hornetq-jms.xml
Log:
HORNETQ-222: XSD schema does not allow to configure multiple connector pairs for JMS Connection Factory
* added a <connectors> container to allow multiple <connector-ref>
* updated doc + examples
Modified: trunk/docs/user-manual/en/client-reconnection.xml
===================================================================
--- trunk/docs/user-manual/en/client-reconnection.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/client-reconnection.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -86,7 +86,9 @@
the xml configuration in <literal>hornetq-jms.xml</literal>, for example:</para>
<programlisting>
<connection-factory name="ConnectionFactory">
-<connector-ref connector-name="netty"/>
+<connectors>
+ <connector-ref connector-name="netty"/>
+</connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/docs/user-manual/en/clusters.xml
===================================================================
--- trunk/docs/user-manual/en/clusters.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/clusters.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -501,12 +501,14 @@
specify the list of servers in the server side configuration file <literal
>hornetq-jms.xml</literal>. Let's take a look at an example:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="my-connector1"
- backup-connector-name="my-backup-connector1"/>
- <connector-ref connector-name="my-connector2"
- backup-connector-name="my-backup-connector2"/>
- <connector-ref connector-name="my-connector3"
- backup-connector-name="my-backup-connector3"/>
+ <connectors>
+ <connector-ref connector-name="my-connector1"
+ backup-connector-name="my-backup-connector1"/>
+ <connector-ref connector-name="my-connector2"
+ backup-connector-name="my-backup-connector2"/>
+ <connector-ref connector-name="my-connector3"
+ backup-connector-name="my-backup-connector3"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/docs/user-manual/en/configuration-index.xml
===================================================================
--- trunk/docs/user-manual/en/configuration-index.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/configuration-index.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -839,14 +839,21 @@
</row>
<row>
<entry><link linkend="clusters.static.servers"
- >connection-factory.connector-ref.connector-name (attribute)</link></entry>
+ >connection-factory.connectors</link></entry>
<entry>String</entry>
+ <entry>A list of connectors used bu the connection factory</entry>
+ <entry />
+ </row>
+ <row>
+ <entry><link linkend="clusters.static.servers"
+ >connection-factory.connectors.connector-ref.connector-name (attribute)</link></entry>
+ <entry>String</entry>
<entry>Name of the connector to connect to the live server</entry>
<entry />
</row>
<row>
<entry><link linkend="clusters.static.servers"
- >connection-factory.connector-ref.backup-connector-name (attribute)</link></entry>
+ >connection-factory.connectors.connector-ref.backup-connector-name (attribute)</link></entry>
<entry>String</entry>
<entry>Name of the connector to connect to the backup server</entry>
<entry />
Modified: trunk/docs/user-manual/en/configuring-transports.xml
===================================================================
--- trunk/docs/user-manual/en/configuring-transports.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/configuring-transports.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -102,7 +102,9 @@
>hornetq-configuration.xml</literal> file:</para>
<programlisting>
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/docs/user-manual/en/flow-control.xml
===================================================================
--- trunk/docs/user-manual/en/flow-control.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/flow-control.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -109,7 +109,9 @@
configured in <literal>hornetq-jms.xml</literal>:</para>
<programlisting>
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
@@ -149,7 +151,9 @@
<para>If JNDI is used to look up the connection factory, the max rate can be configured
in <literal>hornetq-jms.xml</literal>:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
@@ -207,7 +211,9 @@
<para>If JNDI is used to look up the connection factory, the max rate can be configured
in <literal>hornetq-jms.xml</literal>:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/docs/user-manual/en/large-messages.xml
===================================================================
--- trunk/docs/user-manual/en/large-messages.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/large-messages.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -78,7 +78,9 @@
is specified in <literal>hornetq-jms.xml</literal></para>
<programlisting>...
<connection-factory name="ConnectionFactory">
-<connector-ref connector-name="netty"/>
+<connectors>
+ <connector-ref connector-name="netty"/>
+</connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/docs/user-manual/en/message-grouping.xml
===================================================================
--- trunk/docs/user-manual/en/message-grouping.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/message-grouping.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -63,7 +63,9 @@
>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>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/docs/user-manual/en/pre-acknowledge.xml
===================================================================
--- trunk/docs/user-manual/en/pre-acknowledge.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/pre-acknowledge.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -54,7 +54,9 @@
<para>This can be configured in the <literal>hornetq-jms.xml</literal> file on the <literal
>connection factory</literal> like this:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/docs/user-manual/en/thread-pooling.xml
===================================================================
--- trunk/docs/user-manual/en/thread-pooling.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/thread-pooling.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -113,7 +113,9 @@
instances, you can also set these parameters in the <literal>hornetq-jms.xml</literal>
file where you describe your connection factory, for example:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/docs/user-manual/en/using-jms.xml
===================================================================
--- trunk/docs/user-manual/en/using-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/using-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -63,7 +63,9 @@
xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd ">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/common/build.xml
===================================================================
--- trunk/examples/common/build.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/common/build.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -201,6 +201,7 @@
<exclude name="jms/applet/build.xml"/>
<exclude name="jms/clustered-standalone/build.xml"/>
<exclude name="jms/jms-bridge/build.xml"/>
+ <exclude name="jms/large-message/build.xml"/>
<exclude name="jms/perf/build.xml"/>
</fileset>
</subant>
Modified: trunk/examples/javaee/ejb-jms-transaction/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/ejb-jms-transaction/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/hajndi/config/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/hajndi/config/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/hajndi/config/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/jca-config/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/jca-config/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/jca-config/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -2,7 +2,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/jms-bridge/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/jms-bridge/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-bmt/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-bmt/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-bmt/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-message-selector/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-message-selector/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-message-selector/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-tx-send/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-tx-send/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-tx-send/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/servlet-ssl/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/servlet-ssl/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/servlet-ssl/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
+ <connectors>
+ <connector-ref connector-name="netty-servlet"/>
+ </connectors>
<entries>
<entry name="/ServletConnectionFactory"/>
</entries>
Modified: trunk/examples/javaee/servlet-transport/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/servlet-transport/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
+ <connectors>
+ <connector-ref connector-name="netty-servlet"/>
+ </connectors>
<entries>
<entry name="/ServletConnectionFactory"/>
</entries>
Modified: trunk/examples/javaee/xarecovery/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/xarecovery/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/xarecovery/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/jms/applet/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/applet/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/applet/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/application-layer-failover/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/application-layer-failover/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/automatic-failover/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/automatic-failover/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/automatic-failover/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/automatic-failover/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/bridge/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/bridge/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/bridge/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/bridge/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/browser/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/browser/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/browser/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-grouping/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-grouping/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-grouping/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-grouping/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-grouping/server2/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server2/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-grouping/server2/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-queue/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-queue/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-queue/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-queue/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-topic/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-topic/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-topic/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-topic/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/consumer-rate-limit/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/consumer-rate-limit/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/dead-letter/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/dead-letter/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/delayed-redelivery/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/delayed-redelivery/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/divert/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/divert/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/divert/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -5,7 +5,9 @@
<!-- the connection factory used by the example -->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/divert/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/divert/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/divert/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -5,7 +5,9 @@
<!-- the connection factory used by the example -->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/expiry/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/expiry/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/expiry/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/http-transport/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/http-transport/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/interceptor/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/interceptor/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/jaas/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/jaas/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/jaas/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/source/ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/target/ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/jmx/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/jmx/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/jmx/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/large-message/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/large-message/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/large-message/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<min-large-message-size>10240</min-large-message-size>
<entries>
<entry name="ConnectionFactory"/>
Modified: trunk/examples/jms/last-value-queue/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/last-value-queue/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/management/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/management/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/management/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/management-notifications/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/management-notifications/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/message-counters/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/message-counters/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/message-group/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/message-group/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/message-group/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/message-priority/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/message-priority/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/no-consumer-buffering/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/no-consumer-buffering/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/non-transaction-failover/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/non-transaction-failover/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
Modified: trunk/examples/jms/non-transaction-failover/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/non-transaction-failover/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
Modified: trunk/examples/jms/paging/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/paging/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/paging/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/perf/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/perf/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/perf/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/pre-acknowledge/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/pre-acknowledge/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/producer-rate-limit/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/producer-rate-limit/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue-selector/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue-selector/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -5,7 +5,9 @@
<!--the connection factories used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/request-reply/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/request-reply/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/scheduled-message/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/scheduled-message/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/security/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/security/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/security/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<block-on-persistent-send>true</block-on-persistent-send>
<block-on-non-persistent-send>true</block-on-non-persistent-send>
<entries>
Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/ssl-enabled/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-ssl-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-ssl-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/static-selector/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/static-selector/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/static-selector-jms/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/static-selector-jms/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/static-selector-jms/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/temp-queue/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/temp-queue/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/topic/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/topic/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/topic/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/topic-hierarchies/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/topic-hierarchies/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/topic-selector-example1/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/topic-selector-example1/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/topic-selector-example2/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/topic-selector-example2/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/transaction-failover/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/transaction-failover/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,8 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
-
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/transaction-failover/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/transaction-failover/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,8 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
-
+ <connectors>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/transactional/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/transactional/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/transactional/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="XAConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/xa-receive/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/xa-receive/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="XAConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/xa-send/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/xa-send/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="XAConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="XAConnectionFactory"/>
</entries>
Modified: trunk/examples/soak/normal/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/soak/normal/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/soak/normal/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/src/config/common/schema/hornetq-jms.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-jms.xsd 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/common/schema/hornetq-jms.xsd 2009-11-19 15:59:30 UTC (rev 8323)
@@ -30,6 +30,14 @@
<xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
<xsd:element name="discovery-initial-wait-timeout" type="xsd:long" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector-ref" type="connector-refType"
+ maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="entries" maxOccurs="1" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
Modified: trunk/src/config/jboss-as/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/jboss-as/clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="NettyConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="NettyConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/ConnectionFactory"/>
<entry name="/XAConnectionFactory"/>
Modified: trunk/src/config/stand-alone/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="NettyConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/ConnectionFactory"/>
<entry name="/XAConnectionFactory"/>
Modified: trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="NettyConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/ConnectionFactory"/>
<entry name="/XAConnectionFactory"/>
Modified: trunk/src/config/trunk/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/trunk/clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/trunk/clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/src/config/trunk/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/trunk/non-clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-11-19 15:59:30 UTC (rev 8323)
@@ -62,6 +62,8 @@
private static final String ENTRY_NODE_NAME = "entry";
+ private static final String CONNECTORS_NODE_NAME = "connectors";
+
private static final String CONNECTION_FACTORY_NODE_NAME = "connection-factory";
private static final String QUEUE_NODE_NAME = "queue";
@@ -177,38 +179,40 @@
}
}
}
- else if (CONNECTOR_REF_ELEMENT.equals(child.getNodeName()))
+ else if (CONNECTORS_NODE_NAME.equals(child.getNodeName()))
{
- String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue();
-
- TransportConfiguration connector = configuration.getConnectorConfigurations().get(connectorName);
-
- if (connector == null)
+ NodeList entries = child.getChildNodes();
+ for (int i = 0; i < entries.getLength(); i++)
{
- log.warn("There is no connector with name '" + connectorName + "' deployed.");
+ Node entry = entries.item(i);
+ if (CONNECTOR_REF_ELEMENT.equals(entry.getNodeName()))
+ {
+ String connectorName = entry.getAttributes().getNamedItem("connector-name").getNodeValue();
+ TransportConfiguration connector = configuration.getConnectorConfigurations().get(connectorName);
- return;
- }
+ if (connector == null)
+ {
+ log.warn("There is no connector with name '" + connectorName + "' deployed.");
+ return;
+ }
- TransportConfiguration backupConnector = null;
+ TransportConfiguration backupConnector = null;
+ Node backupNode = entry.getAttributes().getNamedItem("backup-connector-name");
+ if (backupNode != null)
+ {
+ String backupConnectorName = backupNode.getNodeValue();
+ backupConnector = configuration.getConnectorConfigurations().get(backupConnectorName);
- Node backupNode = child.getAttributes().getNamedItem("backup-connector-name");
+ if (backupConnector == null)
+ {
+ log.warn("There is no backup connector with name '" + connectorName + "' deployed.");
+ return;
+ }
+ }
- if (backupNode != null)
- {
- String backupConnectorName = backupNode.getNodeValue();
-
- backupConnector = configuration.getConnectorConfigurations().get(backupConnectorName);
-
- if (backupConnector == null)
- {
- log.warn("There is no backup connector with name '" + connectorName + "' deployed.");
-
- return;
+ connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(connector, backupConnector));
}
}
-
- connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(connector, backupConnector));
}
else if (DISCOVERY_GROUP_ELEMENT.equals(child.getNodeName()))
{
Modified: trunk/tests/jms-tests/config/hornetq-jms.xml
===================================================================
--- trunk/tests/jms-tests/config/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/tests/jms-tests/config/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="/ConnectionFactory"/>
15 years, 1 month
- 1
- 0
JBoss hornetq SVN: r8322 - in trunk: tests/src/org/hornetq/tests/integration/remoting and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-11-19 07:54:45 -0500 (Thu, 19 Nov 2009)
New Revision: 8322
Modified:
trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java
trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java
Log:
fixed PingTest.testClientFailureNoServerPing
* the server must received at least 1 ping from the client to use the client Connection TTL value instead of the default server value
Modified: trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2009-11-19 11:23:14 UTC (rev 8321)
+++ trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2009-11-19 12:54:45 UTC (rev 8322)
@@ -65,7 +65,7 @@
private static final Logger log = Logger.getLogger(RemotingServiceImpl.class);
- private static final long CONNECTION_TTL_CHECK_INTERVAL = 2000;
+ public static final long CONNECTION_TTL_CHECK_INTERVAL = 2000;
// Attributes ----------------------------------------------------
Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2009-11-19 11:23:14 UTC (rev 8321)
+++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2009-11-19 12:54:45 UTC (rev 8322)
@@ -28,7 +28,11 @@
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.CloseListener;
+import org.hornetq.core.remoting.Interceptor;
+import org.hornetq.core.remoting.Packet;
import org.hornetq.core.remoting.RemotingConnection;
+import org.hornetq.core.remoting.impl.wireformat.PacketImpl;
+import org.hornetq.core.remoting.server.impl.RemotingServiceImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
@@ -290,6 +294,22 @@
*/
public void testClientFailureNoServerPing() throws Exception
{
+ // server must received at least one ping from the client to pass
+ // so that the server connection TTL is configured with the client value
+ final CountDownLatch pingOnServerLatch = new CountDownLatch(1);
+ server.getRemotingService().addInterceptor(new Interceptor()
+ {
+
+ public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException
+ {
+ if (packet.getType() == PacketImpl.PING)
+ {
+ pingOnServerLatch.countDown();
+ }
+ return true;
+ }
+ });
+
TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory");
ClientSessionFactory csf = new ClientSessionFactoryImpl(transportConfig);
@@ -341,15 +361,19 @@
}
}
+
serverConn.addCloseListener(serverListener);
+ assertTrue("server has not received any ping from the client" , pingOnServerLatch.await(2000, TimeUnit.MILLISECONDS));
+ // we let the server receives at least 1 ping (so that it uses the client ConnectionTTL value)
+
//Setting the handler to null will prevent server sending pings back to client
serverConn.getChannel(0, -1).setHandler(null);
assertTrue(clientLatch.await(4 * CLIENT_FAILURE_CHECK_PERIOD, TimeUnit.MILLISECONDS));
//Server connection will be closed too, when client closes client side connection after failure is detected
- assertTrue(serverLatch.await(8 * CLIENT_FAILURE_CHECK_PERIOD, TimeUnit.MILLISECONDS));
+ assertTrue(serverLatch.await(2 * RemotingServiceImpl.CONNECTION_TTL_CHECK_INTERVAL, TimeUnit.MILLISECONDS));
long start = System.currentTimeMillis();
while (true)
15 years, 1 month
- 1
- 0