October 2009 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r8042 - trunk/tests/src/org/hornetq/tests/integration/client.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-05 04:49:23 -0400 (Mon, 05 Oct 2009) New Revision: 8042 Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java Log: HORNETQ-155: rework DeadLetterAddressTest * used regular client session instead of a XA one Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-10-05 08:27:04 UTC (rev 8041) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-10-05 08:49:23 UTC (rev 8042) @@ -17,9 +17,6 @@ import java.util.HashMap; import java.util.Map; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - import org.hornetq.core.client.ClientConsumer; import org.hornetq.core.client.ClientMessage; import org.hornetq.core.client.ClientProducer; @@ -34,7 +31,6 @@ import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.core.transaction.impl.XidImpl; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.SimpleString; @@ -49,7 +45,6 @@ public void testBasicSend() throws Exception { - Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes()); SimpleString dla = new SimpleString("DLA"); SimpleString qName = new SimpleString("q1"); AddressSettings addressSettings = new AddressSettings(); @@ -62,15 +57,13 @@ ClientProducer producer = clientSession.createProducer(qName); producer.send(createTextMessage("heyho!", clientSession)); clientSession.start(); - clientSession.start(xid, XAResource.TMNOFLAGS); ClientConsumer clientConsumer = clientSession.createConsumer(qName); ClientMessage m = clientConsumer.receive(500); m.acknowledge(); assertNotNull(m); assertEquals(m.getBody().readString(), "heyho!"); // force a cancel - clientSession.end(xid, XAResource.TMSUCCESS); - clientSession.rollback(xid); + clientSession.rollback(); m = clientConsumer.receive(500); assertNull(m); clientConsumer.close(); @@ -82,7 +75,6 @@ public void testBasicSendToMultipleQueues() throws Exception { - Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes()); SimpleString dla = new SimpleString("DLA"); SimpleString qName = new SimpleString("q1"); AddressSettings addressSettings = new AddressSettings(); @@ -97,16 +89,13 @@ ClientProducer producer = clientSession.createProducer(qName); producer.send(createTextMessage("heyho!", clientSession)); clientSession.start(); - clientSession.start(xid, XAResource.TMNOFLAGS); ClientConsumer clientConsumer = clientSession.createConsumer(qName); ClientMessage m = clientConsumer.receive(500); m.acknowledge(); assertNotNull(m); assertEquals(m.getBody().readString(), "heyho!"); // force a cancel - clientSession.end(xid, XAResource.TMSUCCESS); - clientSession.rollback(xid); - clientSession.start(xid, XAResource.TMNOFLAGS); + clientSession.rollback(); m = clientConsumer.receive(500); assertNull(m); clientConsumer.close(); @@ -126,7 +115,6 @@ public void testBasicSendToNoQueue() throws Exception { - Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes()); SimpleString qName = new SimpleString("q1"); AddressSettings addressSettings = new AddressSettings(); addressSettings.setMaxDeliveryAttempts(1); @@ -135,15 +123,13 @@ ClientProducer producer = clientSession.createProducer(qName); producer.send(createTextMessage("heyho!", clientSession)); clientSession.start(); - clientSession.start(xid, XAResource.TMNOFLAGS); ClientConsumer clientConsumer = clientSession.createConsumer(qName); ClientMessage m = clientConsumer.receive(500); m.acknowledge(); assertNotNull(m); assertEquals(m.getBody().readString(), "heyho!"); // force a cancel - clientSession.end(xid, XAResource.TMSUCCESS); - clientSession.rollback(xid); + clientSession.rollback(); m = clientConsumer.receive(500); assertNull(m); clientConsumer.close(); @@ -153,7 +139,6 @@ { final int MAX_DELIVERIES = 16; final int NUM_MESSAGES = 5; - Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes()); SimpleString dla = new SimpleString("DLA"); SimpleString qName = new SimpleString("q1"); AddressSettings addressSettings = new AddressSettings(); @@ -179,7 +164,6 @@ for (int i = 0; i < MAX_DELIVERIES; i++) { - clientSession.start(xid, XAResource.TMNOFLAGS); for (int j = 0; j < NUM_MESSAGES; j++) { ClientMessage tm = clientConsumer.receive(1000); @@ -192,8 +176,7 @@ } assertEquals("Message:" + j, tm.getBody().readString()); } - clientSession.end(xid, XAResource.TMSUCCESS); - clientSession.rollback(xid); + clientSession.rollback(); } assertEquals(0, ((Queue)server.getPostOffice().getBinding(qName).getBindable()).getMessageCount()); @@ -231,7 +214,6 @@ public void testDeadlLetterAddressWithDefaultAddressSettings() throws Exception { int deliveryAttempt = 3; - Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes()); SimpleString address = randomSimpleString(); SimpleString queue = randomSimpleString(); @@ -253,13 +235,11 @@ ClientConsumer clientConsumer = clientSession.createConsumer(queue); for (int i = 0; i < deliveryAttempt; i++) { - clientSession.start(xid, XAResource.TMNOFLAGS); ClientMessage m = clientConsumer.receive(500); assertNotNull(m); assertEquals(i + 1, m.getDeliveryCount()); m.acknowledge(); - clientSession.end(xid, XAResource.TMSUCCESS); - clientSession.rollback(xid); + clientSession.rollback(); } ClientMessage m = clientConsumer.receive(500); assertNull(m); @@ -274,7 +254,6 @@ public void testDeadlLetterAddressWithWildcardAddressSettings() throws Exception { int deliveryAttempt = 3; - Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes()); SimpleString address = randomSimpleString(); SimpleString queue = randomSimpleString(); @@ -296,13 +275,11 @@ ClientConsumer clientConsumer = clientSession.createConsumer(queue); for (int i = 0; i < deliveryAttempt; i++) { - clientSession.start(xid, XAResource.TMNOFLAGS); ClientMessage m = clientConsumer.receive(500); assertNotNull(m); assertEquals(i + 1, m.getDeliveryCount()); m.acknowledge(); - clientSession.end(xid, XAResource.TMSUCCESS); - clientSession.rollback(xid); + clientSession.rollback(); } ClientMessage m = clientConsumer.receive(500); assertNull(m); @@ -318,7 +295,6 @@ { int defaultDeliveryAttempt = 3; int specificeDeliveryAttempt = defaultDeliveryAttempt + 1; - Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes()); SimpleString address = new SimpleString("prefix.address"); SimpleString queue = randomSimpleString(); @@ -351,26 +327,22 @@ for (int i = 0; i < defaultDeliveryAttempt; i++) { - clientSession.start(xid, XAResource.TMNOFLAGS); ClientMessage m = clientConsumer.receive(500); assertNotNull(m); assertEquals(i + 1, m.getDeliveryCount()); m.acknowledge(); - clientSession.end(xid, XAResource.TMSUCCESS); - clientSession.rollback(xid); + clientSession.rollback(); } assertNull(defaultDeadLetterConsumer.receive(500)); assertNull(specificDeadLetterConsumer.receive(500)); // one more redelivery attempt: - clientSession.start(xid, XAResource.TMNOFLAGS); ClientMessage m = clientConsumer.receive(500); assertNotNull(m); assertEquals(specificeDeliveryAttempt, m.getDeliveryCount()); m.acknowledge(); - clientSession.end(xid, XAResource.TMSUCCESS); - clientSession.rollback(xid); + clientSession.rollback(); assertNull(defaultDeadLetterConsumer.receive(500)); assertNotNull(specificDeadLetterConsumer.receive(500)); @@ -390,7 +362,7 @@ server.start(); // then we create a client as normal ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY)); - clientSession = sessionFactory.createSession(true, true, false); + clientSession = sessionFactory.createSession(false, true, false); } @Override

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8041 - trunk/src/main/org/hornetq/jms/client.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-10-05 04:27:04 -0400 (Mon, 05 Oct 2009) New Revision: 8041 Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnection.java Log: tweak on HornetQConnection Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnection.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2009-10-05 08:05:51 UTC (rev 8040) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2009-10-05 08:27:04 UTC (rev 8041) @@ -541,8 +541,6 @@ try { initialSession = sessionFactory.createSession(username, password, false, false, false, false, 0); - - initialSession.addFailureListener(listener); } catch (HornetQException me) {

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8040 - in trunk/tests/src/org/hornetq/tests/integration: jms/connection and 1 other directory.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-10-05 04:05:51 -0400 (Mon, 05 Oct 2009) New Revision: 8040 Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java Log: fixed some tests Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2009-10-02 21:07:23 UTC (rev 8039) +++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2009-10-05 08:05:51 UTC (rev 8040) @@ -187,7 +187,15 @@ rc1.fail(new HornetQException(HornetQException.NOT_CONNECTED, "blah")); - Session sess2 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); + try + { + Session sess2 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); + fail("Should throw exception"); + } + catch (JMSException e) + { + //Ok + } conn1.close(); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-10-02 21:07:23 UTC (rev 8039) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-10-05 08:05:51 UTC (rev 8040) @@ -74,7 +74,7 @@ Connection conn2 = cf.createConnection(); Connection conn3 = cf.createConnection(); - assertEquals(3, server.getRemotingService().getConnections().size()); + assertEquals(1, server.getRemotingService().getConnections().size()); conn1 = null; conn2 = null;

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8039 - in branches/Replication_Clebert: src/main/org/hornetq/core/journal/impl and 2 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2009-10-02 17:07:23 -0400 (Fri, 02 Oct 2009) New Revision: 8039 Added: branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java Modified: branches/Replication_Clebert/src/main/org/hornetq/core/journal/Journal.java branches/Replication_Clebert/src/main/org/hornetq/core/journal/TestableJournal.java branches/Replication_Clebert/src/main/org/hornetq/core/journal/impl/JournalImpl.java branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java Log: Changes Modified: branches/Replication_Clebert/src/main/org/hornetq/core/journal/Journal.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/journal/Journal.java 2009-10-02 17:15:12 UTC (rev 8038) +++ branches/Replication_Clebert/src/main/org/hornetq/core/journal/Journal.java 2009-10-02 21:07:23 UTC (rev 8039) @@ -86,22 +86,5 @@ void perfBlast(int pages) throws Exception; - /** This method is called automatically when a new file is opened. - * @return true if it needs to re-check due to cleanup or other factors */ - boolean checkReclaimStatus() throws Exception; - /** This method check for the need of compacting based on the minCompactPercentage - * This method is usually called automatically when new files are opened - */ - void checkCompact() throws Exception; - - /** - * Eliminate deleted records of the journal. - * @throws Exception - */ - void compact() throws Exception; - - - JournalFile[] getDataFiles(); - } Modified: branches/Replication_Clebert/src/main/org/hornetq/core/journal/TestableJournal.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/journal/TestableJournal.java 2009-10-02 17:15:12 UTC (rev 8038) +++ branches/Replication_Clebert/src/main/org/hornetq/core/journal/TestableJournal.java 2009-10-02 21:07:23 UTC (rev 8039) @@ -13,6 +13,7 @@ package org.hornetq.core.journal; +import org.hornetq.core.journal.impl.JournalFile; /** * @@ -52,6 +53,14 @@ boolean isAutoReclaim(); + void compact() throws Exception; + /** This method is called automatically when a new file is opened. + * @return true if it needs to re-check due to cleanup or other factors */ + boolean checkReclaimStatus() throws Exception; + + JournalFile[] getDataFiles(); + + } Modified: branches/Replication_Clebert/src/main/org/hornetq/core/journal/impl/JournalImpl.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-10-02 17:15:12 UTC (rev 8038) +++ branches/Replication_Clebert/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-10-02 21:07:23 UTC (rev 8039) @@ -2159,7 +2159,7 @@ return (compactMinFiles * compactPercentage); } - public synchronized void cleanUp(final JournalFile file) throws Exception + private synchronized void cleanUp(final JournalFile file) throws Exception { if (state != STATE_LOADED) { @@ -2236,7 +2236,7 @@ } - public void checkCompact() throws Exception + private void checkCompact() throws Exception { if (compactMinFiles == 0) { Added: branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java (rev 0) +++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicatedJournalImpl.java 2009-10-02 21:07:23 UTC (rev 8039) @@ -0,0 +1,355 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.replication.impl; + +import java.util.List; + +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.journal.Journal; +import org.hornetq.core.journal.LoaderCallback; +import org.hornetq.core.journal.PreparedTransactionInfo; +import org.hornetq.core.journal.RecordInfo; +import org.hornetq.core.journal.TransactionFailureCallback; +import org.hornetq.core.journal.impl.JournalImpl.ByteArrayEncoding; +import org.hornetq.core.replication.ReplicationManager; + +/** + * A ReplicatedJournalImpl + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicatedJournalImpl implements Journal +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final ReplicationManager replicationManager; + + private final Journal replicatedJournal; + + private final byte journalID; + + /** + * @param journaID + * @param replicatedJournal + * @param replicationManager + */ + public ReplicatedJournalImpl(byte journaID, Journal replicatedJournal, ReplicationManager replicationManager) + { + super(); + this.journalID = journaID; + this.replicatedJournal = replicatedJournal; + this.replicationManager = replicationManager; + } + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + /** + * @param id + * @param recordType + * @param record + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean) + */ + public void appendAddRecord(long id, byte recordType, byte[] record, boolean sync) throws Exception + { + replicationManager.appendAddRecord(journalID, id, recordType, new ByteArrayEncoding(record)); + replicatedJournal.appendAddRecord(id, recordType, record, sync); + } + + /** + * @param id + * @param recordType + * @param record + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean) + */ + public void appendAddRecord(long id, byte recordType, EncodingSupport record, boolean sync) throws Exception + { + replicationManager.appendAddRecord(journalID, id, recordType, record); + replicatedJournal.appendAddRecord(id, recordType, record, sync); + } + + /** + * @param txID + * @param id + * @param recordType + * @param record + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[]) + */ + public void appendAddRecordTransactional(long txID, long id, byte recordType, byte[] record) throws Exception + { + replicationManager.appendAddRecordTransactional(journalID, txID, id, recordType, new ByteArrayEncoding(record)); + replicatedJournal.appendAddRecordTransactional(txID, id, recordType, record); + } + + /** + * @param txID + * @param id + * @param recordType + * @param record + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport) + */ + public void appendAddRecordTransactional(long txID, long id, byte recordType, EncodingSupport record) throws Exception + { + replicationManager.appendAddRecordTransactional(journalID, txID, id, recordType, record); + replicatedJournal.appendAddRecordTransactional(txID, id, recordType, record); + } + + /** + * @param txID + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean) + */ + public void appendCommitRecord(long txID, boolean sync) throws Exception + { + replicationManager.appendCommitRecord(journalID, txID); + replicatedJournal.appendCommitRecord(txID, sync); + } + + /** + * @param id + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean) + */ + public void appendDeleteRecord(long id, boolean sync) throws Exception + { + replicationManager.appendDeleteRecord(journalID, id); + replicatedJournal.appendDeleteRecord(id, sync); + } + + /** + * @param txID + * @param id + * @param record + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[]) + */ + public void appendDeleteRecordTransactional(long txID, long id, byte[] record) throws Exception + { + replicationManager.appendDeleteRecordTransactional(journalID, txID, id, new ByteArrayEncoding(record)); + replicatedJournal.appendDeleteRecordTransactional(txID, id, record); + } + + /** + * @param txID + * @param id + * @param record + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.hornetq.core.journal.EncodingSupport) + */ + public void appendDeleteRecordTransactional(long txID, long id, EncodingSupport record) throws Exception + { + replicationManager.appendDeleteRecordTransactional(journalID, txID, id, record); + replicatedJournal.appendDeleteRecordTransactional(txID, id, record); + } + + /** + * @param txID + * @param id + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long) + */ + public void appendDeleteRecordTransactional(long txID, long id) throws Exception + { + replicationManager.appendDeleteRecordTransactional(journalID, txID, id); + replicatedJournal.appendDeleteRecordTransactional(txID, id); + } + + /** + * @param txID + * @param transactionData + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean) + */ + public void appendPrepareRecord(long txID, byte[] transactionData, boolean sync) throws Exception + { + replicationManager.appendPrepareRecord(journalID, txID, new ByteArrayEncoding(transactionData)); + replicatedJournal.appendPrepareRecord(txID, transactionData, sync); + } + + /** + * @param txID + * @param transactionData + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean) + */ + public void appendPrepareRecord(long txID, EncodingSupport transactionData, boolean sync) throws Exception + { + replicationManager.appendPrepareRecord(journalID, txID, transactionData); + replicatedJournal.appendPrepareRecord(txID, transactionData, sync); + } + + /** + * @param txID + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean) + */ + public void appendRollbackRecord(long txID, boolean sync) throws Exception + { + replicationManager.appendRollbackRecord(journalID, txID); + replicatedJournal.appendRollbackRecord(txID, sync); + } + + /** + * @param id + * @param recordType + * @param record + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean) + */ + public void appendUpdateRecord(long id, byte recordType, byte[] record, boolean sync) throws Exception + { + replicationManager.appendUpdateRecord(journalID, id, recordType, new ByteArrayEncoding(record)); + replicatedJournal.appendUpdateRecord(id, recordType, record, sync); + } + + /** + * @param id + * @param recordType + * @param record + * @param sync + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean) + */ + public void appendUpdateRecord(long id, byte recordType, EncodingSupport record, boolean sync) throws Exception + { + replicationManager.appendUpdateRecord(journalID, id, recordType, record); + replicatedJournal.appendUpdateRecord(id, recordType, record, sync); + } + + /** + * @param txID + * @param id + * @param recordType + * @param record + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[]) + */ + public void appendUpdateRecordTransactional(long txID, long id, byte recordType, byte[] record) throws Exception + { + replicationManager.appendUpdateRecordTransactional(journalID, txID, id, recordType, new ByteArrayEncoding(record)); + replicatedJournal.appendUpdateRecordTransactional(txID, id, recordType, record); + } + + /** + * @param txID + * @param id + * @param recordType + * @param record + * @throws Exception + * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport) + */ + public void appendUpdateRecordTransactional(long txID, long id, byte recordType, EncodingSupport record) throws Exception + { + replicationManager.appendUpdateRecordTransactional(journalID, txID, id, recordType, record); + replicatedJournal.appendUpdateRecordTransactional(txID, id, recordType, record); + } + + /** + * @param committedRecords + * @param preparedTransactions + * @param transactionFailure + * @return + * @throws Exception + * @see org.hornetq.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback) + */ + public long load(List<RecordInfo> committedRecords, + List<PreparedTransactionInfo> preparedTransactions, + TransactionFailureCallback transactionFailure) throws Exception + { + return replicatedJournal.load(committedRecords, preparedTransactions, transactionFailure); + } + + /** + * @param reloadManager + * @return + * @throws Exception + * @see org.hornetq.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback) + */ + public long load(LoaderCallback reloadManager) throws Exception + { + return replicatedJournal.load(reloadManager); + } + + /** + * @param pages + * @throws Exception + * @see org.hornetq.core.journal.Journal#perfBlast(int) + */ + public void perfBlast(int pages) throws Exception + { + replicatedJournal.perfBlast(pages); + } + + /** + * @throws Exception + * @see org.hornetq.core.server.HornetQComponent#start() + */ + public void start() throws Exception + { + replicatedJournal.start(); + } + + /** + * @throws Exception + * @see org.hornetq.core.server.HornetQComponent#stop() + */ + public void stop() throws Exception + { + replicatedJournal.stop(); + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#getAlignment() + */ + public int getAlignment() throws Exception + { + return replicatedJournal.getAlignment(); + } + + /* (non-Javadoc) + * @see org.hornetq.core.server.HornetQComponent#isStarted() + */ + public boolean isStarted() + { + return replicatedJournal.isStarted(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-10-02 17:15:12 UTC (rev 8038) +++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-10-02 21:07:23 UTC (rev 8039) @@ -66,7 +66,7 @@ private boolean started; - private boolean playedResponsesOnFailure; + private volatile boolean enabled; private final Object replicationLock = new Object(); @@ -100,80 +100,120 @@ public void appendAddRecord(final byte journalID, final long id, final byte recordType, final EncodingSupport record) { - sendReplicatePacket(new ReplicationAddMessage(journalID, false, id, recordType, record)); + if (enabled) + { + sendReplicatePacket(new ReplicationAddMessage(journalID, false, id, recordType, record)); + } } /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendUpdateRecord(byte, long, byte, org.hornetq.core.journal.EncodingSupport, boolean) */ - public void appendUpdateRecord(byte journalID, long id, byte recordType, EncodingSupport record) throws Exception + public void appendUpdateRecord(final byte journalID, + final long id, + final byte recordType, + final EncodingSupport record) throws Exception { - sendReplicatePacket(new ReplicationAddMessage(journalID, true, id, recordType, record)); + if (enabled) + { + sendReplicatePacket(new ReplicationAddMessage(journalID, true, id, recordType, record)); + } } /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendDeleteRecord(byte, long, boolean) */ - public void appendDeleteRecord(byte journalID, long id) throws Exception + public void appendDeleteRecord(final byte journalID, final long id) throws Exception { - sendReplicatePacket(new ReplicationDeleteMessage(journalID, id)); + if (enabled) + { + sendReplicatePacket(new ReplicationDeleteMessage(journalID, id)); + } } - public void appendAddRecordTransactional(byte journalID, long txID, long id, byte recordType, EncodingSupport record) throws Exception + public void appendAddRecordTransactional(final byte journalID, + final long txID, + final long id, + final byte recordType, + final EncodingSupport record) throws Exception { - sendReplicatePacket(new ReplicationAddTXMessage(journalID, false, txID, id, recordType, record)); + if (enabled) + { + sendReplicatePacket(new ReplicationAddTXMessage(journalID, false, txID, id, recordType, record)); + } } /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendUpdateRecordTransactional(byte, long, long, byte, org.hornetq.core.journal.EncodingSupport) */ - public void appendUpdateRecordTransactional(byte journalID, - long txID, - long id, - byte recordType, - EncodingSupport record) throws Exception + public void appendUpdateRecordTransactional(final byte journalID, + final long txID, + final long id, + final byte recordType, + final EncodingSupport record) throws Exception { - sendReplicatePacket(new ReplicationAddTXMessage(journalID, true, txID, id, recordType, record)); + if (enabled) + { + sendReplicatePacket(new ReplicationAddTXMessage(journalID, true, txID, id, recordType, record)); + } } /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendCommitRecord(byte, long, boolean) */ - public void appendCommitRecord(byte journalID, long txID) throws Exception + public void appendCommitRecord(final byte journalID, final long txID) throws Exception { - sendReplicatePacket(new ReplicationCommitMessage(journalID, false, txID)); + if (enabled) + { + sendReplicatePacket(new ReplicationCommitMessage(journalID, false, txID)); + } } /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendDeleteRecordTransactional(byte, long, long, org.hornetq.core.journal.EncodingSupport) */ - public void appendDeleteRecordTransactional(byte journalID, long txID, long id, EncodingSupport record) throws Exception + public void appendDeleteRecordTransactional(final byte journalID, + final long txID, + final long id, + final EncodingSupport record) throws Exception { - sendReplicatePacket(new ReplicationDeleteTXMessage(journalID, txID, id, record)); + if (enabled) + { + sendReplicatePacket(new ReplicationDeleteTXMessage(journalID, txID, id, record)); + } } /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendDeleteRecordTransactional(byte, long, long) */ - public void appendDeleteRecordTransactional(byte journalID, long txID, long id) throws Exception + public void appendDeleteRecordTransactional(final byte journalID, final long txID, final long id) throws Exception { - sendReplicatePacket(new ReplicationDeleteTXMessage(journalID, txID, id, NullEncoding.instance)); + if (enabled) + { + sendReplicatePacket(new ReplicationDeleteTXMessage(journalID, txID, id, NullEncoding.instance)); + } } /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendPrepareRecord(byte, long, org.hornetq.core.journal.EncodingSupport, boolean) */ - public void appendPrepareRecord(byte journalID, long txID, EncodingSupport transactionData) throws Exception + public void appendPrepareRecord(final byte journalID, final long txID, final EncodingSupport transactionData) throws Exception { - sendReplicatePacket(new ReplicationPrepareMessage(journalID, txID, transactionData)); + if (enabled) + { + sendReplicatePacket(new ReplicationPrepareMessage(journalID, txID, transactionData)); + } } /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendRollbackRecord(byte, long, boolean) */ - public void appendRollbackRecord(byte journalID, long txID) throws Exception + public void appendRollbackRecord(final byte journalID, final long txID) throws Exception { - sendReplicatePacket(new ReplicationCommitMessage(journalID, false, txID)); + if (enabled) + { + sendReplicatePacket(new ReplicationCommitMessage(journalID, false, txID)); + } } /* (non-Javadoc) @@ -181,7 +221,7 @@ */ public synchronized boolean isStarted() { - return this.started; + return started; } /* (non-Javadoc) @@ -195,16 +235,18 @@ Channel mainChannel = connection.getChannel(1, -1, false); - this.replicatingChannel = connection.getChannel(channelID, WINDOW_SIZE, false); + replicatingChannel = connection.getChannel(channelID, WINDOW_SIZE, false); - this.replicatingChannel.setHandler(this.responseHandler); + replicatingChannel.setHandler(responseHandler); CreateReplicationSessionMessage replicationStartPackage = new CreateReplicationSessionMessage(channelID, WINDOW_SIZE); mainChannel.sendBlocking(replicationStartPackage); - this.started = true; + started = true; + + enabled = true; } /* (non-Javadoc) @@ -217,7 +259,7 @@ replicatingChannel.close(); } - this.started = false; + started = false; if (connection != null) { @@ -242,7 +284,7 @@ /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#addReplicationAction(java.lang.Runnable) */ - public void addReplicationAction(Runnable runnable) + public void addReplicationAction(final Runnable runnable) { getReplicationToken().addReplicationAction(runnable); } @@ -267,7 +309,7 @@ }); } } - + /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#getPendingTokens() */ @@ -276,7 +318,6 @@ return activeTokens; } - private void sendReplicatePacket(final Packet packet) { boolean runItNow = false; @@ -286,7 +327,7 @@ synchronized (replicationLock) { - if (playedResponsesOnFailure) + if (!enabled) { // Already replicating channel failed, so just play the action now @@ -336,7 +377,7 @@ /* (non-Javadoc) * @see org.hornetq.core.remoting.ChannelHandler#handlePacket(org.hornetq.core.remoting.Packet) */ - public void handlePacket(Packet packet) + public void handlePacket(final Packet packet) { if (packet.getType() == PacketImpl.REPLICATION_RESPONSE) { @@ -366,5 +407,4 @@ } - } Modified: branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2009-10-02 17:15:12 UTC (rev 8038) +++ branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2009-10-02 21:07:23 UTC (rev 8039) @@ -34,6 +34,11 @@ import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.exception.HornetQException; import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.journal.Journal; +import org.hornetq.core.journal.LoaderCallback; +import org.hornetq.core.journal.PreparedTransactionInfo; +import org.hornetq.core.journal.RecordInfo; +import org.hornetq.core.journal.TransactionFailureCallback; import org.hornetq.core.management.ManagementService; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.ChannelHandler; @@ -42,6 +47,7 @@ import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.remoting.spi.HornetQBuffer; +import org.hornetq.core.replication.impl.ReplicatedJournalImpl; import org.hornetq.core.replication.impl.ReplicationManagerImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.impl.HornetQServerImpl; @@ -147,21 +153,23 @@ ReplicationManagerImpl manager = new ReplicationManagerImpl(connectionManager, executor); manager.start(); - manager.appendPrepareRecord((byte)0, 100, new FakeData()); + Journal replicatedJournal = new ReplicatedJournalImpl((byte)1, new FakeJournal(), manager); - manager.appendAddRecord((byte)0, 1, (byte)1, new FakeData()); - manager.appendUpdateRecord((byte)0, 1, (byte)2, new FakeData()); - manager.appendDeleteRecord((byte)0, 1); - manager.appendAddRecordTransactional((byte)0, 2, 2, (byte)1, new FakeData()); - manager.appendUpdateRecordTransactional((byte)0, 2, 2, (byte)2, new FakeData()); - manager.appendCommitRecord((byte)0, 2); + replicatedJournal.appendPrepareRecord(1, new FakeData(), false); - manager.appendDeleteRecordTransactional((byte)0, 3, 4, new FakeData()); - manager.appendPrepareRecord((byte)0, 3, new FakeData()); - manager.appendRollbackRecord((byte)0, 3); + replicatedJournal.appendAddRecord(1, (byte)1, new FakeData(), false); + replicatedJournal.appendUpdateRecord(1, (byte)2, new FakeData(), false); + replicatedJournal.appendDeleteRecord(1, false); + replicatedJournal.appendAddRecordTransactional(2, 2, (byte)1, new FakeData()); + replicatedJournal.appendUpdateRecordTransactional(2, 2, (byte)2, new FakeData()); + replicatedJournal.appendCommitRecord(2, false); + replicatedJournal.appendDeleteRecordTransactional(3, 4, new FakeData()); + replicatedJournal.appendPrepareRecord(3, new FakeData(), false); + replicatedJournal.appendRollbackRecord(3, false); + final CountDownLatch latch = new CountDownLatch(1); - manager.getReplicationToken().addReplicationAction(new Runnable() + manager.addReplicationAction(new Runnable() { public void run() @@ -172,10 +180,10 @@ }); assertTrue(latch.await(1, TimeUnit.SECONDS)); assertEquals(1, manager.getActiveTokens().size()); - + manager.completeToken(); - - for (int i = 0 ; i < 100; i++) + + for (int i = 0; i < 100; i++) { // This is asynchronous. Have to wait completion if (manager.getActiveTokens().size() == 0) @@ -292,7 +300,7 @@ connectionManager = null; scheduledExecutor = null; - + super.tearDown(); } @@ -300,4 +308,199 @@ // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- + + static class FakeJournal implements Journal + { + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, byte[], boolean) + */ + public void appendAddRecord(long id, byte recordType, byte[] record, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean) + */ + public void appendAddRecord(long id, byte recordType, EncodingSupport record, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, byte[]) + */ + public void appendAddRecordTransactional(long txID, long id, byte recordType, byte[] record) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport) + */ + public void appendAddRecordTransactional(long txID, long id, byte recordType, EncodingSupport record) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean) + */ + public void appendCommitRecord(long txID, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean) + */ + public void appendDeleteRecord(long id, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, byte[]) + */ + public void appendDeleteRecordTransactional(long txID, long id, byte[] record) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long, org.hornetq.core.journal.EncodingSupport) + */ + public void appendDeleteRecordTransactional(long txID, long id, EncodingSupport record) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long, long) + */ + public void appendDeleteRecordTransactional(long txID, long id) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, org.hornetq.core.journal.EncodingSupport, boolean) + */ + public void appendPrepareRecord(long txID, EncodingSupport transactionData, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean) + */ + public void appendPrepareRecord(long txID, byte[] transactionData, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean) + */ + public void appendRollbackRecord(long txID, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[], boolean) + */ + public void appendUpdateRecord(long id, byte recordType, byte[] record, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, org.hornetq.core.journal.EncodingSupport, boolean) + */ + public void appendUpdateRecord(long id, byte recordType, EncodingSupport record, boolean sync) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, byte[]) + */ + public void appendUpdateRecordTransactional(long txID, long id, byte recordType, byte[] record) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long, long, byte, org.hornetq.core.journal.EncodingSupport) + */ + public void appendUpdateRecordTransactional(long txID, long id, byte recordType, EncodingSupport record) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#getAlignment() + */ + public int getAlignment() throws Exception + { + + return 0; + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback) + */ + public long load(LoaderCallback reloadManager) throws Exception + { + + return 0; + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback) + */ + public long load(List<RecordInfo> committedRecords, + List<PreparedTransactionInfo> preparedTransactions, + TransactionFailureCallback transactionFailure) throws Exception + { + + return 0; + } + + /* (non-Javadoc) + * @see org.hornetq.core.journal.Journal#perfBlast(int) + */ + public void perfBlast(int pages) throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.server.HornetQComponent#isStarted() + */ + public boolean isStarted() + { + + return false; + } + + /* (non-Javadoc) + * @see org.hornetq.core.server.HornetQComponent#start() + */ + public void start() throws Exception + { + + } + + /* (non-Javadoc) + * @see org.hornetq.core.server.HornetQComponent#stop() + */ + public void stop() throws Exception + { + + } + + } }

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8038 - in branches/Replication_Clebert: src/main/org/hornetq/core/replication and 3 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2009-10-02 13:15:12 -0400 (Fri, 02 Oct 2009) New Revision: 8038 Modified: branches/Replication_Clebert/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java branches/Replication_Clebert/src/main/org/hornetq/core/replication/ReplicationManager.java branches/Replication_Clebert/src/main/org/hornetq/core/replication/ReplicationToken.java branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationTokenImpl.java branches/Replication_Clebert/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java Log: Changes Modified: branches/Replication_Clebert/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java 2009-10-02 15:59:19 UTC (rev 8037) +++ branches/Replication_Clebert/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java 2009-10-02 17:15:12 UTC (rev 8038) @@ -46,7 +46,7 @@ public ReplicationPrepareMessage() { - super(REPLICATION_DELETE_TX); + super(REPLICATION_PREPARE); } public ReplicationPrepareMessage(byte journalID, long txId, EncodingSupport encodingData) Modified: branches/Replication_Clebert/src/main/org/hornetq/core/replication/ReplicationManager.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/replication/ReplicationManager.java 2009-10-02 15:59:19 UTC (rev 8037) +++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/ReplicationManager.java 2009-10-02 17:15:12 UTC (rev 8038) @@ -13,6 +13,8 @@ package org.hornetq.core.replication; +import java.util.Set; + import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.server.HornetQComponent; @@ -42,5 +44,13 @@ void appendPrepareRecord(byte journalID, long txID, EncodingSupport transactionData) throws Exception; void appendRollbackRecord(byte journalID, long txID) throws Exception; + + /** Add an action to be executed after the pending replications */ + void addReplicationAction(Runnable runnable); + + void completeToken(); + + /** A list of tokens that are still waiting for replications to be completed */ + Set<ReplicationToken> getActiveTokens(); } Modified: branches/Replication_Clebert/src/main/org/hornetq/core/replication/ReplicationToken.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/replication/ReplicationToken.java 2009-10-02 15:59:19 UTC (rev 8037) +++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/ReplicationToken.java 2009-10-02 17:15:12 UTC (rev 8038) @@ -30,7 +30,7 @@ /** To be called by the replication manager, when data is confirmed on the channel */ void replicated(); - void addFutureCompletion(Runnable runnable); + void addReplicationAction(Runnable runnable); /** To be called when there are no more operations pending */ void complete(); Modified: branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2009-10-02 15:59:19 UTC (rev 8037) +++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2009-10-02 17:15:12 UTC (rev 8038) @@ -122,7 +122,7 @@ Configuration config = server.getConfiguration(); // TODO: this needs an executor - JournalStorageManager storage = new JournalStorageManager(config, null); + storage = new JournalStorageManager(config, null); storage.start(); this.bindingsJournal = storage.getBindingsJournal(); Modified: branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-10-02 15:59:19 UTC (rev 8037) +++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-10-02 17:15:12 UTC (rev 8038) @@ -14,12 +14,12 @@ package org.hornetq.core.replication.impl; import java.util.Queue; +import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executor; import org.hornetq.core.client.impl.ConnectionManager; import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.journal.impl.JournalImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.ChannelHandler; @@ -36,6 +36,7 @@ import org.hornetq.core.remoting.spi.HornetQBuffer; import org.hornetq.core.replication.ReplicationManager; import org.hornetq.core.replication.ReplicationToken; +import org.hornetq.utils.ConcurrentHashSet; /** * A RepplicationManagerImpl @@ -75,6 +76,8 @@ private final Queue<ReplicationToken> pendingTokens = new ConcurrentLinkedQueue<ReplicationToken>(); + private final ConcurrentHashSet<ReplicationToken> activeTokens = new ConcurrentHashSet<ReplicationToken>(); + // Static -------------------------------------------------------- // Constructors -------------------------------------------------- @@ -121,7 +124,6 @@ sendReplicatePacket(new ReplicationAddTXMessage(journalID, false, txID, id, recordType, record)); } - /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendUpdateRecordTransactional(byte, long, long, byte, org.hornetq.core.journal.EncodingSupport) */ @@ -134,7 +136,6 @@ sendReplicatePacket(new ReplicationAddTXMessage(journalID, true, txID, id, recordType, record)); } - /* (non-Javadoc) * @see org.hornetq.core.replication.ReplicationManager#appendCommitRecord(byte, long, boolean) */ @@ -232,11 +233,50 @@ if (token == null) { token = new ReplicationTokenImpl(executor); + activeTokens.add(token); repliToken.set(token); } return token; } + /* (non-Javadoc) + * @see org.hornetq.core.replication.ReplicationManager#addReplicationAction(java.lang.Runnable) + */ + public void addReplicationAction(Runnable runnable) + { + getReplicationToken().addReplicationAction(runnable); + } + + /* (non-Javadoc) + * @see org.hornetq.core.replication.ReplicationManager#completeToken() + */ + public void completeToken() + { + final ReplicationToken token = repliToken.get(); + if (token != null) + { + // Disassociate thread local + repliToken.set(null); + // Remove from pending tokens as soon as this is complete + token.addReplicationAction(new Runnable() + { + public void run() + { + activeTokens.remove(token); + } + }); + } + } + + /* (non-Javadoc) + * @see org.hornetq.core.replication.ReplicationManager#getPendingTokens() + */ + public Set<ReplicationToken> getActiveTokens() + { + return activeTokens; + } + + private void sendReplicatePacket(final Packet packet) { boolean runItNow = false; @@ -298,7 +338,6 @@ */ public void handlePacket(Packet packet) { - System.out.println("HandlePacket on client"); if (packet.getType() == PacketImpl.REPLICATION_RESPONSE) { replicated(); @@ -311,7 +350,7 @@ { static NullEncoding instance = new NullEncoding(); - + public void decode(final HornetQBuffer buffer) { } @@ -327,4 +366,5 @@ } + } Modified: branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationTokenImpl.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationTokenImpl.java 2009-10-02 15:59:19 UTC (rev 8037) +++ branches/Replication_Clebert/src/main/org/hornetq/core/replication/impl/ReplicationTokenImpl.java 2009-10-02 17:15:12 UTC (rev 8038) @@ -66,7 +66,7 @@ } /** You may have several actions to be done after a replication operation is completed. */ - public synchronized void addFutureCompletion(Runnable runnable) + public synchronized void addReplicationAction(Runnable runnable) { System.out.println("pendings on addFutureCompletion = " + pendings); if (pendings == 0) Modified: branches/Replication_Clebert/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/Replication_Clebert/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-10-02 15:59:19 UTC (rev 8037) +++ branches/Replication_Clebert/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-10-02 17:15:12 UTC (rev 8038) @@ -354,6 +354,12 @@ { storageManager.stop(); } + + if (replicationEndpoint != null) + { + replicationEndpoint.stop(); + replicationEndpoint = null; + } if (securityManager != null) { Modified: branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2009-10-02 15:59:19 UTC (rev 8037) +++ branches/Replication_Clebert/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2009-10-02 17:15:12 UTC (rev 8038) @@ -146,20 +146,22 @@ { ReplicationManagerImpl manager = new ReplicationManagerImpl(connectionManager, executor); manager.start(); - + + manager.appendPrepareRecord((byte)0, 100, new FakeData()); + manager.appendAddRecord((byte)0, 1, (byte)1, new FakeData()); manager.appendUpdateRecord((byte)0, 1, (byte)2, new FakeData()); manager.appendDeleteRecord((byte)0, 1); manager.appendAddRecordTransactional((byte)0, 2, 2, (byte)1, new FakeData()); manager.appendUpdateRecordTransactional((byte)0, 2, 2, (byte)2, new FakeData()); manager.appendCommitRecord((byte)0, 2); - - manager.appendDeleteRecordTransactional((byte)0, 3, 4,new FakeData()); + + manager.appendDeleteRecordTransactional((byte)0, 3, 4, new FakeData()); manager.appendPrepareRecord((byte)0, 3, new FakeData()); manager.appendRollbackRecord((byte)0, 3); final CountDownLatch latch = new CountDownLatch(1); - manager.getReplicationToken().addFutureCompletion(new Runnable() + manager.getReplicationToken().addReplicationAction(new Runnable() { public void run() @@ -169,6 +171,21 @@ }); assertTrue(latch.await(1, TimeUnit.SECONDS)); + assertEquals(1, manager.getActiveTokens().size()); + + manager.completeToken(); + + for (int i = 0 ; i < 100; i++) + { + // This is asynchronous. Have to wait completion + if (manager.getActiveTokens().size() == 0) + { + break; + } + Thread.sleep(1); + } + + assertEquals(0, manager.getActiveTokens().size()); manager.stop(); } finally @@ -265,6 +282,7 @@ protected void tearDown() throws Exception { + executor.shutdown(); scheduledExecutor.shutdown(); @@ -274,6 +292,9 @@ connectionManager = null; scheduledExecutor = null; + + super.tearDown(); + } // Private -------------------------------------------------------

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8037 - trunk/src/main/org/hornetq/ra.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-10-02 11:59:19 -0400 (Fri, 02 Oct 2009) New Revision: 8037 Modified: trunk/src/main/org/hornetq/ra/HornetQRAMetaData.java Log: https://jira.jboss.org/jira/browse/HORNETQ-162 Modified: trunk/src/main/org/hornetq/ra/HornetQRAMetaData.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQRAMetaData.java 2009-10-02 15:47:08 UTC (rev 8036) +++ trunk/src/main/org/hornetq/ra/HornetQRAMetaData.java 2009-10-02 15:59:19 UTC (rev 8037) @@ -95,12 +95,19 @@ return mc.getUserName(); } - /* (non-Javadoc) - * @see javax.resource.spi.ManagedConnectionMetaData#getMaxConnections() - */ + /** + * Get the maximum number of connections -- RETURNS 0 + * @return The number + * @exception ResourceException Thrown if operation fails + */ public int getMaxConnections() throws ResourceException - { - // TODO Auto-generated method stub + { + if (trace) + { + log.trace("getMaxConnections()"); + } + return 0; } + }

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8036 - in trunk: src/config and 31 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-10-02 11:47:08 -0400 (Fri, 02 Oct 2009) New Revision: 8036 Added: trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java Removed: trunk/src/main/org/hornetq/core/client/impl/ConnectionManager.java trunk/src/main/org/hornetq/core/client/impl/ConnectionManagerImpl.java Modified: trunk/docs/user-manual/en/appserver-integration.xml trunk/src/config/common/schema/hornetq-jms.xsd trunk/src/config/ra.xml trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java trunk/src/main/org/hornetq/core/server/HornetQServer.java trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java trunk/src/main/org/hornetq/jms/server/JMSServerManager.java trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java trunk/src/main/org/hornetq/ra/HornetQRAMetaData.java trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/ResendTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java Log: https://jira.jboss.org/jira/browse/HORNETQ-162 Modified: trunk/docs/user-manual/en/appserver-integration.xml =================================================================== --- trunk/docs/user-manual/en/appserver-integration.xml 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/docs/user-manual/en/appserver-integration.xml 2009-10-02 15:47:08 UTC (rev 8036) @@ -541,13 +541,8 @@ <entry>AutoGroup</entry> <entry>boolean</entry> <entry>If true then auto group messages</entry> - </row> + </row> <row> - <entry>MaxConnections</entry> - <entry>integer</entry> - <entry>The max number of connections.</entry> - </row> - <row> <entry>PreAcknowledge</entry> <entry>boolean</entry> <entry>Whether to pre acknowledge messages before sending to Modified: trunk/src/config/common/schema/hornetq-jms.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-jms.xsd 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/config/common/schema/hornetq-jms.xsd 2009-10-02 15:47:08 UTC (rev 8036) @@ -87,9 +87,6 @@ <xsd:element name="auto-group-id" type="xsd:boolean" maxOccurs="1" minOccurs="0"> </xsd:element> - <xsd:element name="max-connections" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> <xsd:element name="pre-acknowledge" type="xsd:boolean" maxOccurs="1" minOccurs="0"> </xsd:element> Modified: trunk/src/config/ra.xml =================================================================== --- trunk/src/config/ra.xml 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/config/ra.xml 2009-10-02 15:47:08 UTC (rev 8036) @@ -203,8 +203,7 @@ <config-property-value></config-property-value> </config-property> <config-property> - <description>The max connections</description> - <config-property-name>MaxConnections</config-property-name> + <description>The max connections</description> <config-property-type>java.lang.Integer</config-property-type> <config-property-value></config-property-value> </config-property> Modified: trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -70,10 +70,6 @@ void setCallTimeout(long callTimeout); - int getMaxConnections(); - - void setMaxConnections(int maxConnections); - int getMinLargeMessageSize(); void setMinLargeMessageSize(int minLargeMessageSize); Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -87,8 +87,6 @@ public static final long DEFAULT_CALL_TIMEOUT = 30000; - public static final int DEFAULT_MAX_CONNECTIONS = 8; - public static final int DEFAULT_ACK_BATCH_SIZE = 1024 * 1024; public static final boolean DEFAULT_PRE_ACKNOWLEDGE = false; @@ -120,7 +118,7 @@ // Attributes // ----------------------------------------------------------------------------------- - private final Map<Pair<TransportConfiguration, TransportConfiguration>, ConnectionManager> connectionManagerMap = new LinkedHashMap<Pair<TransportConfiguration, TransportConfiguration>, ConnectionManager>(); + private final Map<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager> failoverManagerMap = new LinkedHashMap<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager>(); private volatile boolean receivedBroadcast = false; @@ -132,7 +130,7 @@ private ConnectionLoadBalancingPolicy loadBalancingPolicy; - private ConnectionManager[] connectionManagerArray; + private FailoverManager[] failoverManagerArray; private boolean readOnly; @@ -156,8 +154,6 @@ private long callTimeout; - private int maxConnections; - private int minLargeMessageSize; private int consumerWindowSize; @@ -284,11 +280,10 @@ { for (Pair<TransportConfiguration, TransportConfiguration> pair : staticConnectors) { - ConnectionManager cm = new ConnectionManagerImpl(this, + FailoverManager cm = new FailoverManagerImpl(this, pair.a, pair.b, - failoverOnServerShutdown, - maxConnections, + failoverOnServerShutdown, callTimeout, clientFailureCheckPeriod, connectionTTL, @@ -301,10 +296,10 @@ scheduledThreadPool, interceptors); - connectionManagerMap.put(pair, cm); + failoverManagerMap.put(pair, cm); } - updateConnectionManagerArray(); + updatefailoverManagerArray(); } else { @@ -328,8 +323,6 @@ callTimeout = DEFAULT_CALL_TIMEOUT; - maxConnections = DEFAULT_MAX_CONNECTIONS; - minLargeMessageSize = DEFAULT_MIN_LARGE_MESSAGE_SIZE; consumerWindowSize = DEFAULT_CONSUMER_WINDOW_SIZE; @@ -464,17 +457,6 @@ this.callTimeout = callTimeout; } - public synchronized int getMaxConnections() - { - return maxConnections; - } - - public synchronized void setMaxConnections(int maxConnections) - { - checkWrite(); - this.maxConnections = maxConnections; - } - public synchronized int getMinLargeMessageSize() { return minLargeMessageSize; @@ -833,9 +815,9 @@ { int num = 0; - for (ConnectionManager connectionManager : connectionManagerMap.values()) + for (FailoverManager failoverManager : failoverManagerMap.values()) { - num += connectionManager.numSessions(); + num += failoverManager.numSessions(); } return num; @@ -845,9 +827,9 @@ { int num = 0; - for (ConnectionManager connectionManager : connectionManagerMap.values()) + for (FailoverManager failoverManager : failoverManagerMap.values()) { - num += connectionManager.numConnections(); + num += failoverManager.numConnections(); } return num; @@ -872,12 +854,12 @@ } } - for (ConnectionManager connectionManager : connectionManagerMap.values()) + for (FailoverManager failoverManager : failoverManagerMap.values()) { - connectionManager.causeExit(); + failoverManager.causeExit(); } - connectionManagerMap.clear(); + failoverManagerMap.clear(); if (!useGlobalPools) { @@ -926,15 +908,15 @@ connectorSet.add(entry.getConnectorPair()); } - Iterator<Map.Entry<Pair<TransportConfiguration, TransportConfiguration>, ConnectionManager>> iter = connectionManagerMap.entrySet() + Iterator<Map.Entry<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager>> iter = failoverManagerMap.entrySet() .iterator(); while (iter.hasNext()) { - Map.Entry<Pair<TransportConfiguration, TransportConfiguration>, ConnectionManager> entry = iter.next(); + Map.Entry<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager> entry = iter.next(); if (!connectorSet.contains(entry.getKey())) { - // ConnectionManager no longer there - we should remove it + // failoverManager no longer there - we should remove it iter.remove(); } @@ -942,15 +924,14 @@ for (Pair<TransportConfiguration, TransportConfiguration> connectorPair : connectorSet) { - if (!connectionManagerMap.containsKey(connectorPair)) + if (!failoverManagerMap.containsKey(connectorPair)) { - // Create a new ConnectionManager + // Create a new failoverManager - ConnectionManager connectionManager = new ConnectionManagerImpl(this, + FailoverManager failoverManager = new FailoverManagerImpl(this, connectorPair.a, connectorPair.b, - failoverOnServerShutdown, - maxConnections, + failoverOnServerShutdown, callTimeout, clientFailureCheckPeriod, connectionTTL, @@ -963,16 +944,16 @@ scheduledThreadPool, interceptors); - connectionManagerMap.put(connectorPair, connectionManager); + failoverManagerMap.put(connectorPair, failoverManager); } } - updateConnectionManagerArray(); + updatefailoverManagerArray(); } - public ConnectionManager[] getConnectionManagers() + public FailoverManager[] getFailoverManagers() { - return connectionManagerArray; + return failoverManagerArray; } // Protected ------------------------------------------------------------------------------ @@ -1035,11 +1016,11 @@ synchronized (this) { - int pos = loadBalancingPolicy.select(connectionManagerArray.length); + int pos = loadBalancingPolicy.select(failoverManagerArray.length); - ConnectionManager connectionManager = connectionManagerArray[pos]; + FailoverManager failoverManager = failoverManagerArray[pos]; - ClientSession session = connectionManager.createSession(username, + ClientSession session = failoverManager.createSession(username, password, xa, autoCommitSends, @@ -1082,11 +1063,11 @@ } } - private synchronized void updateConnectionManagerArray() + private synchronized void updatefailoverManagerArray() { - connectionManagerArray = new ConnectionManager[connectionManagerMap.size()]; + failoverManagerArray = new FailoverManager[failoverManagerMap.size()]; - connectionManagerMap.values().toArray(connectionManagerArray); + failoverManagerMap.values().toArray(failoverManagerArray); } } Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -107,7 +107,7 @@ // Attributes ---------------------------------------------------------------------------- - private final ConnectionManager connectionManager; + private final FailoverManager connectionManager; private final String name; @@ -177,7 +177,7 @@ // Constructors ---------------------------------------------------------------------------- - public ClientSessionImpl(final ConnectionManager connectionManager, + public ClientSessionImpl(final FailoverManager connectionManager, final String name, final String username, final String password, @@ -785,7 +785,7 @@ { return true; } - + boolean ok = false; // We lock the channel to prevent any packets to be added to the resend @@ -795,7 +795,7 @@ try { channel.transferConnection(backupConnection); - + backupConnection.syncIDGeneratorSequence(remotingConnection.getIDGeneratorSequence()); remotingConnection = backupConnection; @@ -807,7 +807,7 @@ ReattachSessionResponseMessage response = (ReattachSessionResponseMessage)channel1.sendBlocking(request); if (response.isSessionFound()) - { + { channel.replayCommands(response.getLastReceivedCommandID(), channel.getID()); ok = true; @@ -862,7 +862,7 @@ } boolean ok = false; - + // Need to stop all consumers outside the lock for (ClientConsumerInternal consumer : consumers.values()) { @@ -1000,7 +1000,7 @@ channel.returnBlocking(); } - public ConnectionManager getConnectionManager() + public FailoverManager getConnectionManager() { return connectionManager; } Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -65,7 +65,7 @@ void setForceNotSameRM(boolean force); - ConnectionManager getConnectionManager(); + FailoverManager getConnectionManager(); void workDone(); } Deleted: trunk/src/main/org/hornetq/core/client/impl/ConnectionManager.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ConnectionManager.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/client/impl/ConnectionManager.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -1,63 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.core.client.impl; - -import org.hornetq.core.client.ClientSession; -import org.hornetq.core.exception.HornetQException; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.RemotingConnection; - -/** - * A ConnectionManager - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 27 Nov 2008 18:45:46 - * - * - */ -public interface ConnectionManager -{ - ClientSession createSession(final String username, - final String password, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final int ackBatchSize, - final boolean cacheLargeMessageClient, - final int minLargeMessageSize, - final boolean blockOnAcknowledge, - final boolean autoGroup, - final int producerWindowSize, - final int consumerWindowSize, - final int producerMaxRate, - final int consumerMaxRate, - final boolean blockOnNonPersistentSend, - final boolean blockOnPersistentSend) throws HornetQException; - - void removeSession(final ClientSessionInternal session); - - int numConnections(); - - int numSessions(); - - RemotingConnection getConnection(final int initialRefCount); - - void addFailureListener(FailureListener listener); - - boolean removeFailureListener(FailureListener listener); - - void causeExit(); -} Deleted: trunk/src/main/org/hornetq/core/client/impl/ConnectionManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ConnectionManagerImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/client/impl/ConnectionManagerImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -1,1351 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.core.client.impl; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Lock; - -import org.hornetq.core.client.ClientSession; -import org.hornetq.core.client.ClientSessionFactory; -import org.hornetq.core.config.TransportConfiguration; -import org.hornetq.core.exception.HornetQException; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Interceptor; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.AbstractBufferHandler; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.Ping; -import org.hornetq.core.remoting.spi.Connection; -import org.hornetq.core.remoting.spi.ConnectionLifeCycleListener; -import org.hornetq.core.remoting.spi.Connector; -import org.hornetq.core.remoting.spi.ConnectorFactory; -import org.hornetq.core.remoting.spi.HornetQBuffer; -import org.hornetq.core.version.Version; -import org.hornetq.utils.ConcurrentHashSet; -import org.hornetq.utils.ExecutorFactory; -import org.hornetq.utils.OrderedExecutorFactory; -import org.hornetq.utils.UUIDGenerator; -import org.hornetq.utils.VersionLoader; - -/** - * A ConnectionManagerImpl - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 27 Nov 2008 18:46:06 - * - */ -public class ConnectionManagerImpl implements ConnectionManager, ConnectionLifeCycleListener -{ - // Constants - // ------------------------------------------------------------------------------------ - - private static final long serialVersionUID = 2512460695662741413L; - - private static final Logger log = Logger.getLogger(ConnectionManagerImpl.class); - - // Attributes - // ----------------------------------------------------------------------------------- - - //We hold this reference for GC reasons - private final ClientSessionFactory sessionFactory; - - private final TransportConfiguration connectorConfig; - - private final TransportConfiguration backupConfig; - - private ConnectorFactory connectorFactory; - - private Map<String, Object> transportParams; - - private ConnectorFactory backupConnectorFactory; - - private Map<String, Object> backupTransportParams; - - private final int maxConnections; - - private final long callTimeout; - - private final long clientFailureCheckPeriod; - - private final long connectionTTL; - - private final Map<ClientSessionInternal, RemotingConnection> sessions = new HashMap<ClientSessionInternal, RemotingConnection>(); - - private final Object exitLock = new Object(); - - private final Object createSessionLock = new Object(); - - private boolean inCreateSession; - - private final Object failoverLock = new Object(); - - private final ExecutorFactory orderedExecutorFactory; - - private final ExecutorService threadPool; - - private final ScheduledExecutorService scheduledThreadPool; - - private final Map<Object, ConnectionEntry> connections = Collections.synchronizedMap(new LinkedHashMap<Object, ConnectionEntry>()); - - private int refCount; - - private Iterator<ConnectionEntry> mapIterator; - - private final long retryInterval; - - private final double retryIntervalMultiplier; // For exponential backoff - - private final long maxRetryInterval; - - private final int reconnectAttempts; - - private boolean failoverOnServerShutdown; - - private Set<FailureListener> listeners = new ConcurrentHashSet<FailureListener>(); - - private Connector connector; - - private Future<?> pingerFuture; - - private PingRunnable pingRunnable; - - private volatile boolean exitLoop; - - private final List<Interceptor> interceptors; - - private final boolean useReattach; - - // debug - - private static Map<TransportConfiguration, Set<RemotingConnection>> debugConns; - - private static boolean debug = false; - - public static void enableDebug() - { - debug = true; - - debugConns = new ConcurrentHashMap<TransportConfiguration, Set<RemotingConnection>>(); - } - - // Static - // --------------------------------------------------------------------------------------- - - // Constructors - // --------------------------------------------------------------------------------- - - public ConnectionManagerImpl(final ClientSessionFactory sessionFactory, - final TransportConfiguration connectorConfig, - final TransportConfiguration backupConfig, - final boolean failoverOnServerShutdown, - final int maxConnections, - final long callTimeout, - final long clientFailureCheckPeriod, - final long connectionTTL, - final long retryInterval, - final double retryIntervalMultiplier, - final long maxRetryInterval, - final int reconnectAttempts, - final boolean useReattach, - final ExecutorService threadPool, - final ScheduledExecutorService scheduledThreadPool, - final List<Interceptor> interceptors) - { - this.sessionFactory = sessionFactory; - - this.connectorConfig = connectorConfig; - - this.backupConfig = backupConfig; - - this.failoverOnServerShutdown = failoverOnServerShutdown; - - connectorFactory = instantiateConnectorFactory(connectorConfig.getFactoryClassName()); - - transportParams = connectorConfig.getParams(); - - if (backupConfig != null) - { - backupConnectorFactory = instantiateConnectorFactory(backupConfig.getFactoryClassName()); - - backupTransportParams = backupConfig.getParams(); - } - else - { - backupConnectorFactory = null; - - backupTransportParams = null; - } - - this.maxConnections = maxConnections; - - this.callTimeout = callTimeout; - - this.clientFailureCheckPeriod = clientFailureCheckPeriod; - - this.connectionTTL = connectionTTL; - - this.retryInterval = retryInterval; - - this.retryIntervalMultiplier = retryIntervalMultiplier; - - this.maxRetryInterval = maxRetryInterval; - - this.reconnectAttempts = reconnectAttempts; - - this.useReattach = useReattach; - - this.scheduledThreadPool = scheduledThreadPool; - - this.threadPool = threadPool; - - this.orderedExecutorFactory = new OrderedExecutorFactory(threadPool); - - this.interceptors = interceptors; - } - - // ConnectionLifeCycleListener implementation -------------------------------------------------- - - public void connectionCreated(final Connection connection) - { - } - - public void connectionDestroyed(final Object connectionID) - { - failConnection(connectionID, new HornetQException(HornetQException.NOT_CONNECTED, "Channel disconnected")); - } - - public void connectionException(final Object connectionID, final HornetQException me) - { - failConnection(connectionID, me); - } - - // ConnectionManager implementation ------------------------------------------------------------------ - - public ClientSession createSession(final String username, - final String password, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final int ackBatchSize, - final boolean cacheLargeMessageClient, - final int minLargeMessageSize, - final boolean blockOnAcknowledge, - final boolean autoGroup, - final int producerWindowSize, - final int consumerWindowSize, - final int producerMaxRate, - final int consumerMaxRate, - final boolean blockOnNonPersistentSend, - final boolean blockOnPersistentSend) throws HornetQException - { - synchronized (createSessionLock) - { - String name = UUIDGenerator.getInstance().generateSimpleStringUUID().toString(); - - boolean retry = false; - do - { - Version clientVersion = VersionLoader.getVersion(); - - RemotingConnection connection = null; - - Lock lock = null; - - try - { - Channel channel1; - - synchronized (failoverLock) - { - connection = getConnectionWithRetry(1, reconnectAttempts); - - if (connection == null) - { - if (exitLoop) - { - return null; - } - // This can happen if the connection manager gets exitLoop - e.g. the server gets shut down - - throw new HornetQException(HornetQException.NOT_CONNECTED, - "Unable to connect to server using configuration " + connectorConfig); - - } - - channel1 = connection.getChannel(1, -1, false); - - // Lock it - this must be done while the failoverLock is held - channel1.getLock().lock(); - - lock = channel1.getLock(); - } // We can now release the failoverLock - - // We now set a flag saying createSession is executing - synchronized (exitLock) - { - inCreateSession = true; - } - - long sessionChannelID = connection.generateChannelID(); - - Packet request = new CreateSessionMessage(name, - sessionChannelID, - clientVersion.getIncrementingVersion(), - username, - password, - minLargeMessageSize, - xa, - autoCommitSends, - autoCommitAcks, - preAcknowledge, - producerWindowSize); - - Packet pResponse; - try - { - pResponse = channel1.sendBlocking(request); - } - catch (HornetQException e) - { - if (e.getCode() == HornetQException.UNBLOCKED) - { - // This means the thread was blocked on create session and failover unblocked it - // so failover could occur - - // So we just need to return our connections and flag for retry - - returnConnection(connection.getID()); - - retry = true; - - continue; - } - else - { - throw e; - } - } - - CreateSessionResponseMessage response = (CreateSessionResponseMessage)pResponse; - - Channel sessionChannel = connection.getChannel(sessionChannelID, - producerWindowSize, - producerWindowSize != -1); - - ClientSessionInternal session = new ClientSessionImpl(this, - name, - username, - password, - xa, - autoCommitSends, - autoCommitAcks, - preAcknowledge, - blockOnAcknowledge, - autoGroup, - ackBatchSize, - consumerWindowSize, - consumerMaxRate, - producerWindowSize, - producerMaxRate, - blockOnNonPersistentSend, - blockOnPersistentSend, - cacheLargeMessageClient, - minLargeMessageSize, - connection, - response.getServerVersion(), - sessionChannel, - orderedExecutorFactory.getExecutor()); - - sessions.put(session, connection); - - ChannelHandler handler = new ClientSessionPacketHandler(session, sessionChannel); - - sessionChannel.setHandler(handler); - - return new DelegatingSession(session); - } - catch (Throwable t) - { - if (lock != null) - { - lock.unlock(); - - lock = null; - } - - if (connection != null) - { - returnConnection(connection.getID()); - } - - if (t instanceof HornetQException) - { - throw (HornetQException)t; - } - else - { - HornetQException me = new HornetQException(HornetQException.INTERNAL_ERROR, - "Failed to create session"); - - me.initCause(t); - - throw me; - } - } - finally - { - if (lock != null) - { - lock.unlock(); - } - - // Execution has finished so notify any failover thread that may be waiting for us to be done - synchronized (exitLock) - { - inCreateSession = false; - - exitLock.notify(); - } - } - } - while (retry); - } - - // Should never get here - throw new IllegalStateException("Oh my God it's full of stars!"); - } - - // Must be synchronized to prevent it happening concurrently with failover which can lead to - // inconsistencies - public void removeSession(final ClientSessionInternal session) - { - // TODO - can we simplify this locking? - synchronized (createSessionLock) - { - synchronized (failoverLock) - { - sessions.remove(session); - - returnConnection(session.getConnection().getID()); - } - } - } - - public synchronized int numConnections() - { - return connections.size(); - } - - public int numSessions() - { - return sessions.size(); - } - - public void addFailureListener(FailureListener listener) - { - listeners.add(listener); - } - - public boolean removeFailureListener(FailureListener listener) - { - return listeners.remove(listener); - } - - public void causeExit() - { - exitLoop = true; - } - - // Public - // --------------------------------------------------------------------------------------- - - private volatile boolean stopPingingAfterOne; - - public void stopPingingAfterOne() - { - this.stopPingingAfterOne = true; - } - - // Protected - // ------------------------------------------------------------------------------------ - - // Package Private - // ------------------------------------------------------------------------------ - - // Private - // -------------------------------------------------------------------------------------- - - private void handleConnectionFailure(final HornetQException me, final Object connectionID) - { - failoverOrReconnect(me, connectionID); - } - - private void failoverOrReconnect(final HornetQException me, final Object connectionID) - { - boolean done = false; - - synchronized (failoverLock) - { - if (connectionID != null && !connections.containsKey(connectionID)) - { - // We already failed over/reconnected - probably the first failure came in, all the connections were failed - // over then a async connection exception or disconnect - // came in for one of the already exitLoop connections, so we return true - we don't want to call the - // listeners again - - return; - } - - // Now get locks on all channel 1s, whilst holding the failoverLock - this makes sure - // There are either no threads executing in createSession, or one is blocking on a createSession - // result. - - // Then interrupt the channel 1 that is blocking (could just interrupt them all) - - // Then release all channel 1 locks - this allows the createSession to exit the monitor - - // Then get all channel 1 locks again - this ensures the any createSession thread has executed the section and - // returned all its connections to the connection manager (the code to return connections to connection manager - // must be inside the lock - - // Then perform failover - - // Then release failoverLock - - // The other side of the bargain - during createSession: - // The calling thread must get the failoverLock and get its' connections when this is locked. - // While this is still locked it must then get the channel1 lock - // It can then release the failoverLock - // It should catch HornetQException.INTERRUPTED in the call to channel.sendBlocking - // It should then return its connections, with channel 1 lock still held - // It can then release the channel 1 lock, and retry (which will cause locking on failoverLock - // until failover is complete - - boolean serverShutdown = me.getCode() == HornetQException.DISCONNECTED; - - //We will try to failover if there is a backup connector factory, but we don't do this if the server - //has been shutdown cleanly unless failoverOnServerShutdown is true - boolean attemptFailover = backupConnectorFactory != null && (failoverOnServerShutdown || !serverShutdown); - - boolean attemptReconnect; - - if (attemptFailover) - { - attemptReconnect = false; - } - else - { - attemptReconnect = reconnectAttempts != 0; - } - - if (attemptFailover || attemptReconnect) - { - lockAllChannel1s(); - - final boolean needToInterrupt; - - synchronized (exitLock) - { - needToInterrupt = inCreateSession; - } - - unlockAllChannel1s(); - - if (needToInterrupt) - { - // Forcing return all channels won't guarantee that any blocked thread will return immediately - // So we need to wait for it - forceReturnAllChannel1s(); - - // Now we need to make sure that the thread has actually exited and returned it's connections - // before failover occurs - - synchronized (exitLock) - { - while (inCreateSession) - { - try - { - exitLock.wait(5000); - } - catch (InterruptedException e) - { - } - } - } - } - - // Now we absolutely know that no threads are executing in or blocked in createSession, and no - // more will execute it until failover is complete - - // So.. do failover / reconnection - - Set<RemotingConnection> oldConnections = new HashSet<RemotingConnection>(); - - for (ConnectionEntry entry : connections.values()) - { - oldConnections.add(entry.connection); - } - - connections.clear(); - - refCount = 0; - - mapIterator = null; - - try - { - connector.close(); - } - catch (Exception ignore) - { - } - - connector = null; - - if (attemptFailover) - { - // Now try failing over to backup - - connectorFactory = backupConnectorFactory; - - transportParams = backupTransportParams; - - backupConnectorFactory = null; - - backupTransportParams = null; - - done = reattachSessions(reconnectAttempts == -1 ? -1 : reconnectAttempts + 1, false); - } - else - { - done = reattachSessions(reconnectAttempts, useReattach); - } - - if (done) - { - // Destroy the old connections - for (RemotingConnection connection : oldConnections) - { - connection.destroy(); - } - } - else - { - for (RemotingConnection connection : oldConnections) - { - connection.destroy(); - } - - closeAllConnections(); - } - } - else - { - closeAllConnections(); - } - - //We always call the failure listeners - callFailureListeners(me); - } - } - - private void closeAllConnections() - { - refCount = 0; - mapIterator = null; - checkCloseConnections(); - } - - private void callFailureListeners(final HornetQException me) - { - final List<FailureListener> listenersClone = new ArrayList<FailureListener>(listeners); - - for (final FailureListener listener : listenersClone) - { - try - { - listener.connectionFailed(me); - } - catch (final Throwable t) - { - // Failure of one listener to execute shouldn't prevent others - // from - // executing - log.error("Failed to execute failure listener", t); - } - } - } - - /* - * Re-attach sessions all pre-existing sessions to new remoting connections - */ - private boolean reattachSessions(final int reconnectAttempts, final boolean reattach) - { - // We re-attach sessions per connection to ensure there is the same mapping of channel id - // on live and backup connections - - Map<RemotingConnection, List<ClientSessionInternal>> sessionsPerConnection = new HashMap<RemotingConnection, List<ClientSessionInternal>>(); - - for (Map.Entry<ClientSessionInternal, RemotingConnection> entry : sessions.entrySet()) - { - ClientSessionInternal session = entry.getKey(); - - RemotingConnection connection = entry.getValue(); - - List<ClientSessionInternal> sessions = sessionsPerConnection.get(connection); - - if (sessions == null) - { - sessions = new ArrayList<ClientSessionInternal>(); - - sessionsPerConnection.put(connection, sessions); - } - - sessions.add(session); - } - - boolean ok = true; - - for (Map.Entry<RemotingConnection, List<ClientSessionInternal>> entry : sessionsPerConnection.entrySet()) - { - List<ClientSessionInternal> theSessions = entry.getValue(); - - RemotingConnection backupConnection = getConnectionWithRetry(theSessions.size(), reconnectAttempts); - - if (backupConnection == null) - { - log.warn("Failed to connect to server."); - - ok = false; - - break; - } - - List<FailureListener> oldListeners = entry.getKey().getFailureListeners(); - - List<FailureListener> newListeners = new ArrayList<FailureListener>(backupConnection.getFailureListeners()); - - for (FailureListener listener : oldListeners) - { - // Add all apart from the first one which is the old DelegatingFailureListener - - if (listener instanceof DelegatingFailureListener == false) - { - newListeners.add(listener); - } - } - - backupConnection.setFailureListeners(newListeners); - - for (ClientSessionInternal session : theSessions) - { - sessions.put(session, backupConnection); - } - } - - if (ok) - { - // If all connections got ok, then handle failover - for (Map.Entry<ClientSessionInternal, RemotingConnection> entry : sessions.entrySet()) - { - boolean b; - - if (reattach) - { - b = entry.getKey().handleReattach(entry.getValue()); - } - else - { - b = entry.getKey().handleFailover(entry.getValue()); - } - - if (!b) - { - // If a session fails to re-attach we doom the lot, but we make sure we try all sessions and don't exit - // early - // or connections might be left lying around - ok = false; - } - } - - log.info("Reconnected ok"); - } - - return ok; - } - - private RemotingConnection getConnectionWithRetry(final int initialRefCount, final int reconnectAttempts) - { - long interval = retryInterval; - - int count = 0; - - while (true) - { - if (exitLoop) - { - return null; - } - - RemotingConnection connection = getConnection(initialRefCount); - - if (connection == null) - { - // Failed to get connection - - if (reconnectAttempts != 0) - { - count++; - - if (reconnectAttempts != -1 && count == reconnectAttempts) - { - log.warn("Tried " + reconnectAttempts + " times to connect. Now giving up."); - - return null; - } - - try - { - log.info("sleeping " + interval); - - Thread.sleep(interval); - } - catch (InterruptedException ignore) - { - } - - // Exponential back-off - long newInterval = (long)((double)interval * retryIntervalMultiplier); - - if (newInterval > maxRetryInterval) - { - newInterval = maxRetryInterval; - } - - interval = newInterval; - } - else - { - return null; - } - } - else - { - return connection; - } - } - } - - private void checkCloseConnections() - { - if (refCount == 0) - { - // Close connections - - Set<ConnectionEntry> copy = new HashSet<ConnectionEntry>(connections.values()); - - if (pingerFuture != null) - { - pingRunnable.cancel(); - - boolean ok = pingerFuture.cancel(false); - - pingRunnable = null; - - pingerFuture = null; - } - - connections.clear(); - - for (ConnectionEntry entry : copy) - { - try - { - entry.connection.destroy(); - } - catch (Throwable ignore) - { - } - } - - mapIterator = null; - - try - { - if (connector != null) - { - connector.close(); - } - } - catch (Throwable ignore) - { - } - - connector = null; - } - - } - - public RemotingConnection getConnection(final int initialRefCount) - { - RemotingConnection conn; - - if (connections.size() < maxConnections) - { - // Create a new one - - Connection tc = null; - - try - { - if (connector == null) - { - DelegatingBufferHandler handler = new DelegatingBufferHandler(); - - connector = connectorFactory.createConnector(transportParams, - handler, - this, - threadPool, - scheduledThreadPool); - - if (connector != null) - { - connector.start(); - } - } - - if (connector != null) - { - tc = connector.createConnection(); - - if (tc == null) - { - try - { - connector.close(); - } - catch (Throwable t) - { - } - - connector = null; - } - } - } - catch (Exception e) - { - // Sanity catch for badly behaved remoting plugins - - log.warn("connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we'll deal with it anyway.", - e); - - if (tc != null) - { - try - { - tc.close(); - } - catch (Throwable t) - { - } - } - - if (connector != null) - { - try - { - connector.close(); - } - catch (Throwable t) - { - } - } - - tc = null; - - connector = null; - } - - if (tc == null) - { - return null; - } - - conn = new RemotingConnectionImpl(tc, callTimeout, interceptors); - - conn.addFailureListener(new DelegatingFailureListener(conn.getID())); - - conn.getChannel(0, -1, false).setHandler(new Channel0Handler(conn)); - - connections.put(conn.getID(), new ConnectionEntry(conn, - connector, - clientFailureCheckPeriod, - System.currentTimeMillis())); - - if (clientFailureCheckPeriod != -1) - { - if (pingerFuture == null) - { - pingRunnable = new PingRunnable(); - - pingerFuture = scheduledThreadPool.scheduleWithFixedDelay(new ActualScheduled(pingRunnable), - 0, - clientFailureCheckPeriod, - TimeUnit.MILLISECONDS); - } - // send a ping every time we create a new remoting connection - // to set up its TTL on the server side - else - { - pingRunnable.run(); - } - } - - if (debug) - { - checkAddDebug(conn); - } - } - else - { - // Return one round-robin from the list - - if (mapIterator == null || !mapIterator.hasNext()) - { - mapIterator = connections.values().iterator(); - } - - ConnectionEntry entry = mapIterator.next(); - - conn = entry.connection; - } - - refCount += initialRefCount; - - return conn; - } - - private void returnConnection(final Object connectionID) - { - ConnectionEntry entry = connections.get(connectionID); - - if (refCount != 0) - { - refCount--; - } - - if (entry != null) - { - checkCloseConnections(); - } - else - { - // Can be legitimately null if session was exitLoop before then went to remove session from csf - // and locked since failover had started then after failover removes it but it's already been failed - } - } - - private ConnectorFactory instantiateConnectorFactory(final String connectorFactoryClassName) - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - try - { - Class<?> clazz = loader.loadClass(connectorFactoryClassName); - return (ConnectorFactory)clazz.newInstance(); - } - catch (Exception e) - { - throw new IllegalArgumentException("Error instantiating connector factory \"" + connectorFactoryClassName + - "\"", e); - } - } - - private void lockAllChannel1s() - { - for (ConnectionEntry entry : connections.values()) - { - Channel channel1 = entry.connection.getChannel(1, -1, false); - - channel1.getLock().lock(); - } - } - - private void unlockAllChannel1s() - { - for (ConnectionEntry entry : connections.values()) - { - Channel channel1 = entry.connection.getChannel(1, -1, false); - - channel1.getLock().unlock(); - } - } - - private void forceReturnAllChannel1s() - { - for (ConnectionEntry entry : connections.values()) - { - Channel channel1 = entry.connection.getChannel(1, -1, false); - - channel1.returnBlocking(); - } - } - - private void failConnection(final Object connectionID, final HornetQException me) - { - ConnectionEntry entry = connections.get(connectionID); - - if (entry != null) - { - RemotingConnection conn = entry.connection; - - conn.fail(me); - } - } - - private class Channel0Handler implements ChannelHandler - { - private final RemotingConnection conn; - - private Channel0Handler(final RemotingConnection conn) - { - this.conn = conn; - } - - public void handlePacket(final Packet packet) - { - final byte type = packet.getType(); - - if (type == PacketImpl.DISCONNECT) - { - threadPool.execute(new Runnable() - { - // Must be executed on new thread since cannot block the netty thread for a long time and fail can - // cause reconnect loop - public void run() - { - conn.fail(new HornetQException(HornetQException.DISCONNECTED, - "The connection was disconnected because of server shutdown")); - } - }); - } - } - } - - private static class ConnectionEntry - { - ConnectionEntry(final RemotingConnection connection, - final Connector connector, - final long expiryPeriod, - final long createTime) - { - this.connection = connection; - - this.connector = connector; - - this.expiryPeriod = expiryPeriod; - - this.lastCheck = createTime; - } - - final RemotingConnection connection; - - final Connector connector; - - volatile long lastCheck; - - final long expiryPeriod; - } - - private class DelegatingBufferHandler extends AbstractBufferHandler - { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) - { - ConnectionEntry entry = connections.get(connectionID); - - if (entry != null) - { - entry.connection.bufferReceived(connectionID, buffer); - } - } - } - - private class DelegatingFailureListener implements FailureListener - { - final Object connectionID; - - DelegatingFailureListener(final Object connectionID) - { - this.connectionID = connectionID; - } - - public void connectionFailed(final HornetQException me) - { - handleConnectionFailure(me, connectionID); - } - } - - // Debug only - - private void checkAddDebug(final RemotingConnection conn) - { - Set<RemotingConnection> conns; - - synchronized (debugConns) - { - conns = debugConns.get(connectorConfig); - - if (conns == null) - { - conns = new HashSet<RemotingConnection>(); - - debugConns.put(connectorConfig, conns); - } - - conns.add(conn); - } - } - - public static void failAllConnectionsForConnector(final TransportConfiguration config) - { - Set<RemotingConnection> conns; - - synchronized (debugConns) - { - conns = debugConns.get(config); - - if (conns != null) - { - conns = new HashSet<RemotingConnection>(debugConns.get(config)); - } - } - - if (conns != null) - { - for (RemotingConnection conn : conns) - { - conn.fail(new HornetQException(HornetQException.INTERNAL_ERROR, "blah")); - } - } - } - - private static final class ActualScheduled implements Runnable - { - private final WeakReference<PingRunnable> pingRunnable; - - ActualScheduled(final PingRunnable runnable) - { - this.pingRunnable = new WeakReference<PingRunnable>(runnable); - } - - public void run() - { - PingRunnable runnable = pingRunnable.get(); - - if (runnable != null) - { - runnable.run(); - } - } - - } - - private final class PingRunnable implements Runnable - { - private boolean cancelled; - - private boolean first; - - public synchronized void run() - { - if (cancelled || (stopPingingAfterOne && !first)) - { - return; - } - - first = false; - - synchronized (connections) - { - long now = System.currentTimeMillis(); - - for (ConnectionEntry entry : connections.values()) - { - final RemotingConnection connection = entry.connection; - - if (entry.expiryPeriod != -1 && now >= entry.lastCheck + entry.expiryPeriod) - { - if (!connection.checkDataReceived()) - { - final HornetQException me = new HornetQException(HornetQException.CONNECTION_TIMEDOUT, - "Did not receive data from server for " + connection.getTransportConnection()); - - threadPool.execute(new Runnable() - { - // Must be executed on different thread - public void run() - { - connection.fail(me); - } - }); - - return; - } - else - { - entry.lastCheck = now; - } - } - - // Send a ping - - Ping ping = new Ping(connectionTTL); - - Channel channel0 = connection.getChannel(0, -1, false); - - channel0.send(ping); - } - } - } - - public synchronized void cancel() - { - cancelled = true; - } - } - -} Modified: trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -498,7 +498,7 @@ session.stop(); } - public ConnectionManager getConnectionManager() + public FailoverManager getConnectionManager() { return session.getConnectionManager(); } Copied: trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java (from rev 8035, trunk/src/main/org/hornetq/core/client/impl/ConnectionManager.java) =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java (rev 0) +++ trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -0,0 +1,61 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.client.impl; + +import org.hornetq.core.client.ClientSession; +import org.hornetq.core.exception.HornetQException; +import org.hornetq.core.remoting.FailureListener; +import org.hornetq.core.remoting.RemotingConnection; + +/** + * A ConnectionManager + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 27 Nov 2008 18:45:46 + * + * + */ +public interface FailoverManager +{ + ClientSession createSession(final String username, + final String password, + final boolean xa, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge, + final int ackBatchSize, + final boolean cacheLargeMessageClient, + final int minLargeMessageSize, + final boolean blockOnAcknowledge, + final boolean autoGroup, + final int producerWindowSize, + final int consumerWindowSize, + final int producerMaxRate, + final int consumerMaxRate, + final boolean blockOnNonPersistentSend, + final boolean blockOnPersistentSend) throws HornetQException; + + void removeSession(final ClientSessionInternal session); + + int numConnections(); + + int numSessions(); + + void addFailureListener(FailureListener listener); + + boolean removeFailureListener(FailureListener listener); + + void causeExit(); +} Copied: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java (from rev 8035, trunk/src/main/org/hornetq/core/client/impl/ConnectionManagerImpl.java) =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java (rev 0) +++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -0,0 +1,1097 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.client.impl; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Lock; + +import org.hornetq.core.client.ClientSession; +import org.hornetq.core.client.ClientSessionFactory; +import org.hornetq.core.config.TransportConfiguration; +import org.hornetq.core.exception.HornetQException; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.Channel; +import org.hornetq.core.remoting.ChannelHandler; +import org.hornetq.core.remoting.FailureListener; +import org.hornetq.core.remoting.Interceptor; +import org.hornetq.core.remoting.Packet; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.remoting.impl.AbstractBufferHandler; +import org.hornetq.core.remoting.impl.RemotingConnectionImpl; +import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; +import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; +import org.hornetq.core.remoting.impl.wireformat.PacketImpl; +import org.hornetq.core.remoting.impl.wireformat.Ping; +import org.hornetq.core.remoting.spi.Connection; +import org.hornetq.core.remoting.spi.ConnectionLifeCycleListener; +import org.hornetq.core.remoting.spi.Connector; +import org.hornetq.core.remoting.spi.ConnectorFactory; +import org.hornetq.core.remoting.spi.HornetQBuffer; +import org.hornetq.core.version.Version; +import org.hornetq.utils.ConcurrentHashSet; +import org.hornetq.utils.ExecutorFactory; +import org.hornetq.utils.OrderedExecutorFactory; +import org.hornetq.utils.UUIDGenerator; +import org.hornetq.utils.VersionLoader; + +/** + * A ConnectionManagerImpl + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 27 Nov 2008 18:46:06 + * + */ +public class FailoverManagerImpl implements FailoverManager, ConnectionLifeCycleListener +{ + // Constants + // ------------------------------------------------------------------------------------ + + private static final long serialVersionUID = 2512460695662741413L; + + private static final Logger log = Logger.getLogger(FailoverManagerImpl.class); + + // Attributes + // ----------------------------------------------------------------------------------- + + // We hold this reference for GC reasons + private final ClientSessionFactory sessionFactory; + + private final TransportConfiguration connectorConfig; + + private final TransportConfiguration backupConfig; + + private ConnectorFactory connectorFactory; + + private Map<String, Object> transportParams; + + private ConnectorFactory backupConnectorFactory; + + private Map<String, Object> backupTransportParams; + + private final long callTimeout; + + private final long clientFailureCheckPeriod; + + private final long connectionTTL; + + private final Set<ClientSessionInternal> sessions = new HashSet<ClientSessionInternal>(); + + private final Object exitLock = new Object(); + + private final Object createSessionLock = new Object(); + + private boolean inCreateSession; + + private final Object failoverLock = new Object(); + + private final ExecutorFactory orderedExecutorFactory; + + private final ExecutorService threadPool; + + private final ScheduledExecutorService scheduledThreadPool; + + private RemotingConnection connection; + + private final long retryInterval; + + private final double retryIntervalMultiplier; // For exponential backoff + + private final long maxRetryInterval; + + private final int reconnectAttempts; + + private boolean failoverOnServerShutdown; + + private Set<FailureListener> listeners = new ConcurrentHashSet<FailureListener>(); + + private Connector connector; + + private Future<?> pingerFuture; + + private PingRunnable pingRunnable; + + private volatile boolean exitLoop; + + private final List<Interceptor> interceptors; + + private final boolean useReattach; + + // Static + // --------------------------------------------------------------------------------------- + + // Constructors + // --------------------------------------------------------------------------------- + + public FailoverManagerImpl(final ClientSessionFactory sessionFactory, + final TransportConfiguration connectorConfig, + final TransportConfiguration backupConfig, + final boolean failoverOnServerShutdown, + final long callTimeout, + final long clientFailureCheckPeriod, + final long connectionTTL, + final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, + final boolean useReattach, + final ExecutorService threadPool, + final ScheduledExecutorService scheduledThreadPool, + final List<Interceptor> interceptors) + { + this.sessionFactory = sessionFactory; + + this.connectorConfig = connectorConfig; + + this.backupConfig = backupConfig; + + this.failoverOnServerShutdown = failoverOnServerShutdown; + + connectorFactory = instantiateConnectorFactory(connectorConfig.getFactoryClassName()); + + transportParams = connectorConfig.getParams(); + + if (backupConfig != null) + { + backupConnectorFactory = instantiateConnectorFactory(backupConfig.getFactoryClassName()); + + backupTransportParams = backupConfig.getParams(); + } + else + { + backupConnectorFactory = null; + + backupTransportParams = null; + } + + this.callTimeout = callTimeout; + + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + + this.connectionTTL = connectionTTL; + + this.retryInterval = retryInterval; + + this.retryIntervalMultiplier = retryIntervalMultiplier; + + this.maxRetryInterval = maxRetryInterval; + + this.reconnectAttempts = reconnectAttempts; + + this.useReattach = useReattach; + + this.scheduledThreadPool = scheduledThreadPool; + + this.threadPool = threadPool; + + this.orderedExecutorFactory = new OrderedExecutorFactory(threadPool); + + this.interceptors = interceptors; + } + + // ConnectionLifeCycleListener implementation -------------------------------------------------- + + public void connectionCreated(final Connection connection) + { + } + + public void connectionDestroyed(final Object connectionID) + { + this.handleConnectionFailure(connectionID, new HornetQException(HornetQException.NOT_CONNECTED, + "Channel disconnected")); + } + + public void connectionException(final Object connectionID, final HornetQException me) + { + this.handleConnectionFailure(connectionID, me); + } + + // ConnectionManager implementation ------------------------------------------------------------------ + + public ClientSession createSession(final String username, + final String password, + final boolean xa, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge, + final int ackBatchSize, + final boolean cacheLargeMessageClient, + final int minLargeMessageSize, + final boolean blockOnAcknowledge, + final boolean autoGroup, + final int producerWindowSize, + final int consumerWindowSize, + final int producerMaxRate, + final int consumerMaxRate, + final boolean blockOnNonPersistentSend, + final boolean blockOnPersistentSend) throws HornetQException + { + synchronized (createSessionLock) + { + String name = UUIDGenerator.getInstance().generateSimpleStringUUID().toString(); + + boolean retry = false; + do + { + Version clientVersion = VersionLoader.getVersion(); + + RemotingConnection connection = null; + + Lock lock = null; + + try + { + Channel channel1; + + synchronized (failoverLock) + { + connection = getConnectionWithRetry(reconnectAttempts); + + if (connection == null) + { + if (exitLoop) + { + return null; + } + // This can happen if the connection manager gets exitLoop - e.g. the server gets shut down + + throw new HornetQException(HornetQException.NOT_CONNECTED, + "Unable to connect to server using configuration " + connectorConfig); + + } + + channel1 = connection.getChannel(1, -1, false); + + // Lock it - this must be done while the failoverLock is held + channel1.getLock().lock(); + + lock = channel1.getLock(); + } // We can now release the failoverLock + + // We now set a flag saying createSession is executing + synchronized (exitLock) + { + inCreateSession = true; + } + + long sessionChannelID = connection.generateChannelID(); + + Packet request = new CreateSessionMessage(name, + sessionChannelID, + clientVersion.getIncrementingVersion(), + username, + password, + minLargeMessageSize, + xa, + autoCommitSends, + autoCommitAcks, + preAcknowledge, + producerWindowSize); + + Packet pResponse; + try + { + pResponse = channel1.sendBlocking(request); + } + catch (HornetQException e) + { + if (e.getCode() == HornetQException.UNBLOCKED) + { + // This means the thread was blocked on create session and failover unblocked it + // so failover could occur + + // So we just need to return our connections and flag for retry + + checkCloseConnection(); + + retry = true; + + continue; + } + else + { + throw e; + } + } + + CreateSessionResponseMessage response = (CreateSessionResponseMessage)pResponse; + + Channel sessionChannel = connection.getChannel(sessionChannelID, + producerWindowSize, + producerWindowSize != -1); + + ClientSessionInternal session = new ClientSessionImpl(this, + name, + username, + password, + xa, + autoCommitSends, + autoCommitAcks, + preAcknowledge, + blockOnAcknowledge, + autoGroup, + ackBatchSize, + consumerWindowSize, + consumerMaxRate, + producerWindowSize, + producerMaxRate, + blockOnNonPersistentSend, + blockOnPersistentSend, + cacheLargeMessageClient, + minLargeMessageSize, + connection, + response.getServerVersion(), + sessionChannel, + orderedExecutorFactory.getExecutor()); + + sessions.add(session); + + ChannelHandler handler = new ClientSessionPacketHandler(session, sessionChannel); + + sessionChannel.setHandler(handler); + + return new DelegatingSession(session); + } + catch (Throwable t) + { + if (lock != null) + { + lock.unlock(); + + lock = null; + } + + checkCloseConnection(); + + if (t instanceof HornetQException) + { + throw (HornetQException)t; + } + else + { + HornetQException me = new HornetQException(HornetQException.INTERNAL_ERROR, + "Failed to create session"); + + me.initCause(t); + + throw me; + } + } + finally + { + if (lock != null) + { + lock.unlock(); + } + + // Execution has finished so notify any failover thread that may be waiting for us to be done + synchronized (exitLock) + { + inCreateSession = false; + + exitLock.notify(); + } + } + } + while (retry); + } + + // Should never get here + throw new IllegalStateException("Oh my God it's full of stars!"); + } + + // Must be synchronized to prevent it happening concurrently with failover which can lead to + // inconsistencies + public void removeSession(final ClientSessionInternal session) + { + // TODO - can we simplify this locking? + synchronized (createSessionLock) + { + synchronized (failoverLock) + { + sessions.remove(session); + + checkCloseConnection(); + } + } + } + + public synchronized int numConnections() + { + return connection != null ? 1 : 0; + } + + public int numSessions() + { + return sessions.size(); + } + + public void addFailureListener(FailureListener listener) + { + listeners.add(listener); + } + + public boolean removeFailureListener(FailureListener listener) + { + return listeners.remove(listener); + } + + public void causeExit() + { + exitLoop = true; + } + + // Public + // --------------------------------------------------------------------------------------- + + private volatile boolean stopPingingAfterOne; + + public void stopPingingAfterOne() + { + this.stopPingingAfterOne = true; + } + + // Protected + // ------------------------------------------------------------------------------------ + + // Package Private + // ------------------------------------------------------------------------------ + + // Private + // -------------------------------------------------------------------------------------- + + private void handleConnectionFailure(final Object connectionID, final HornetQException me) + { + failoverOrReconnect(connectionID, me); + } + + private void failoverOrReconnect(final Object connectionID, final HornetQException me) + { + boolean done = false; + + synchronized (failoverLock) + { + if (connection == null || connection.getID() != connectionID) + { + // We already failed over/reconnected - probably the first failure came in, all the connections were failed + // over then a async connection exception or disconnect + // came in for one of the already exitLoop connections, so we return true - we don't want to call the + // listeners again + return; + } + + // Now get locks on all channel 1s, whilst holding the failoverLock - this makes sure + // There are either no threads executing in createSession, or one is blocking on a createSession + // result. + + // Then interrupt the channel 1 that is blocking (could just interrupt them all) + + // Then release all channel 1 locks - this allows the createSession to exit the monitor + + // Then get all channel 1 locks again - this ensures the any createSession thread has executed the section and + // returned all its connections to the connection manager (the code to return connections to connection manager + // must be inside the lock + + // Then perform failover + + // Then release failoverLock + + // The other side of the bargain - during createSession: + // The calling thread must get the failoverLock and get its' connections when this is locked. + // While this is still locked it must then get the channel1 lock + // It can then release the failoverLock + // It should catch HornetQException.INTERRUPTED in the call to channel.sendBlocking + // It should then return its connections, with channel 1 lock still held + // It can then release the channel 1 lock, and retry (which will cause locking on failoverLock + // until failover is complete + + boolean serverShutdown = me.getCode() == HornetQException.DISCONNECTED; + + // We will try to failover if there is a backup connector factory, but we don't do this if the server + // has been shutdown cleanly unless failoverOnServerShutdown is true + boolean attemptFailover = backupConnectorFactory != null && (failoverOnServerShutdown || !serverShutdown); + + boolean attemptReconnect; + + if (attemptFailover) + { + attemptReconnect = false; + } + else + { + attemptReconnect = reconnectAttempts != 0; + } + + if (attemptFailover || attemptReconnect) + { + lockChannel1(); + + final boolean needToInterrupt; + + synchronized (exitLock) + { + needToInterrupt = inCreateSession; + } + + unlockChannel1(); + + if (needToInterrupt) + { + // Forcing return all channels won't guarantee that any blocked thread will return immediately + // So we need to wait for it + forceReturnChannel1(); + + // Now we need to make sure that the thread has actually exited and returned it's connections + // before failover occurs + + synchronized (exitLock) + { + while (inCreateSession) + { + try + { + exitLock.wait(5000); + } + catch (InterruptedException e) + { + } + } + } + } + + // Now we absolutely know that no threads are executing in or blocked in createSession, and no + // more will execute it until failover is complete + + // So.. do failover / reconnection + + RemotingConnection oldConnection = connection; + + connection = null; + + try + { + connector.close(); + } + catch (Exception ignore) + { + } + + connector = null; + + if (attemptFailover) + { + // Now try failing over to backup + + connectorFactory = backupConnectorFactory; + + transportParams = backupTransportParams; + + backupConnectorFactory = null; + + backupTransportParams = null; + + done = reattachSessions(reconnectAttempts == -1 ? -1 : reconnectAttempts + 1, false); + } + else + { + done = reattachSessions(reconnectAttempts, useReattach); + } + + if (done) + { + // Destroy the old connection + + oldConnection.destroy(); + } + else + { + oldConnection.destroy(); + } + } + + // We always call the failure listeners + callFailureListeners(me); + } + } + + private void callFailureListeners(final HornetQException me) + { + final List<FailureListener> listenersClone = new ArrayList<FailureListener>(listeners); + + for (final FailureListener listener : listenersClone) + { + try + { + listener.connectionFailed(me); + } + catch (final Throwable t) + { + // Failure of one listener to execute shouldn't prevent others + // from + // executing + log.error("Failed to execute failure listener", t); + } + } + } + + /* + * Re-attach sessions all pre-existing sessions to the new remoting connection + */ + private boolean reattachSessions(final int reconnectAttempts, final boolean reattach) + { + RemotingConnection backupConnection = getConnectionWithRetry(reconnectAttempts); + + if (backupConnection == null) + { + log.warn("Failed to connect to server."); + + return false; + } + + List<FailureListener> oldListeners = connection.getFailureListeners(); + + List<FailureListener> newListeners = new ArrayList<FailureListener>(backupConnection.getFailureListeners()); + + for (FailureListener listener : oldListeners) + { + // Add all apart from the first one which is the old DelegatingFailureListener + + if (listener instanceof DelegatingFailureListener == false) + { + newListeners.add(listener); + } + } + + backupConnection.setFailureListeners(newListeners); + + boolean ok = true; + + // If all connections got ok, then handle failover + for (ClientSessionInternal session : sessions) + { + boolean b; + + if (reattach) + { + b = session.handleReattach(backupConnection); + } + else + { + b = session.handleFailover(backupConnection); + } + + if (!b) + { + // If a session fails to re-attach we doom the lot, but we make sure we try all sessions and don't exit + // early + // or connections might be left lying around + ok = false; + } + } + + return ok; + } + + private RemotingConnection getConnectionWithRetry(final int reconnectAttempts) + { + long interval = retryInterval; + + int count = 0; + + while (true) + { + if (exitLoop) + { + return null; + } + + RemotingConnection connection = getConnection(); + + if (connection == null) + { + // Failed to get connection + + if (reconnectAttempts != 0) + { + count++; + + if (reconnectAttempts != -1 && count == reconnectAttempts) + { + log.warn("Tried " + reconnectAttempts + " times to connect. Now giving up."); + + return null; + } + + try + { + Thread.sleep(interval); + } + catch (InterruptedException ignore) + { + } + + // Exponential back-off + long newInterval = (long)((double)interval * retryIntervalMultiplier); + + if (newInterval > maxRetryInterval) + { + newInterval = maxRetryInterval; + } + + interval = newInterval; + } + else + { + return null; + } + } + else + { + return connection; + } + } + } + + private void checkCloseConnection() + { + if (connection != null && sessions.size() == 0) + { + if (pingerFuture != null) + { + pingRunnable.cancel(); + + boolean ok = pingerFuture.cancel(false); + + pingRunnable = null; + + pingerFuture = null; + } + + try + { + connection.destroy(); + } + catch (Throwable ignore) + { + } + + connection = null; + + try + { + if (connector != null) + { + connector.close(); + } + } + catch (Throwable ignore) + { + } + + connector = null; + } + } + + public RemotingConnection getConnection() + { + if (connection == null) + { + Connection tc = null; + + try + { + if (connector == null) + { + DelegatingBufferHandler handler = new DelegatingBufferHandler(); + + connector = connectorFactory.createConnector(transportParams, + handler, + this, + threadPool, + scheduledThreadPool); + + if (connector != null) + { + connector.start(); + } + } + + if (connector != null) + { + tc = connector.createConnection(); + + if (tc == null) + { + try + { + connector.close(); + } + catch (Throwable t) + { + } + + connector = null; + } + } + } + catch (Exception e) + { + // Sanity catch for badly behaved remoting plugins + + log.warn("connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we'll deal with it anyway.", + e); + + if (tc != null) + { + try + { + tc.close(); + } + catch (Throwable t) + { + } + } + + if (connector != null) + { + try + { + connector.close(); + } + catch (Throwable t) + { + } + } + + tc = null; + + connector = null; + } + + if (tc == null) + { + return connection; + } + + connection = new RemotingConnectionImpl(tc, callTimeout, interceptors); + + connection.addFailureListener(new DelegatingFailureListener(connection.getID())); + + connection.getChannel(0, -1, false).setHandler(new Channel0Handler(connection)); + + if (clientFailureCheckPeriod != -1) + { + if (pingerFuture == null) + { + pingRunnable = new PingRunnable(); + + pingerFuture = scheduledThreadPool.scheduleWithFixedDelay(new ActualScheduled(pingRunnable), + 0, + clientFailureCheckPeriod, + TimeUnit.MILLISECONDS); + } + // send a ping every time we create a new remoting connection + // to set up its TTL on the server side + else + { + pingRunnable.run(); + } + } + } + + return connection; + } + + private ConnectorFactory instantiateConnectorFactory(final String connectorFactoryClassName) + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + try + { + Class<?> clazz = loader.loadClass(connectorFactoryClassName); + return (ConnectorFactory)clazz.newInstance(); + } + catch (Exception e) + { + throw new IllegalArgumentException("Error instantiating connector factory \"" + connectorFactoryClassName + + "\"", e); + } + } + + private void lockChannel1() + { + Channel channel1 = connection.getChannel(1, -1, false); + + channel1.getLock().lock(); + } + + private void unlockChannel1() + { + Channel channel1 = connection.getChannel(1, -1, false); + + channel1.getLock().unlock(); + } + + private void forceReturnChannel1() + { + Channel channel1 = connection.getChannel(1, -1, false); + + channel1.returnBlocking(); + } + + private class Channel0Handler implements ChannelHandler + { + private final RemotingConnection conn; + + private Channel0Handler(final RemotingConnection conn) + { + this.conn = conn; + } + + public void handlePacket(final Packet packet) + { + final byte type = packet.getType(); + + if (type == PacketImpl.DISCONNECT) + { + threadPool.execute(new Runnable() + { + // Must be executed on new thread since cannot block the netty thread for a long time and fail can + // cause reconnect loop + public void run() + { + conn.fail(new HornetQException(HornetQException.DISCONNECTED, + "The connection was disconnected because of server shutdown")); + } + }); + } + } + } + + private class DelegatingBufferHandler extends AbstractBufferHandler + { + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + { + // ConnectionEntry entry = connections.get(connectionID); + + if (connection != null && connectionID == connection.getID()) + { + connection.bufferReceived(connectionID, buffer); + } + } + } + + private class DelegatingFailureListener implements FailureListener + { + private final Object connectionID; + + DelegatingFailureListener(final Object connectionID) + { + this.connectionID = connectionID; + } + + public void connectionFailed(final HornetQException me) + { + handleConnectionFailure(connectionID, me); + } + } + + private static final class ActualScheduled implements Runnable + { + private final WeakReference<PingRunnable> pingRunnable; + + ActualScheduled(final PingRunnable runnable) + { + this.pingRunnable = new WeakReference<PingRunnable>(runnable); + } + + public void run() + { + PingRunnable runnable = pingRunnable.get(); + + if (runnable != null) + { + runnable.run(); + } + } + + } + + private final class PingRunnable implements Runnable + { + private boolean cancelled; + + private boolean first; + + private long lastCheck = System.currentTimeMillis(); + + public synchronized void run() + { + if (cancelled || (stopPingingAfterOne && !first)) + { + return; + } + + first = false; + + long now = System.currentTimeMillis(); + + if (clientFailureCheckPeriod != -1 && now >= lastCheck + clientFailureCheckPeriod) + { + if (!connection.checkDataReceived()) + { + final HornetQException me = new HornetQException(HornetQException.CONNECTION_TIMEDOUT, + "Did not receive data from server for " + connection.getTransportConnection()); + + threadPool.execute(new Runnable() + { + // Must be executed on different thread + public void run() + { + connection.fail(me); + } + }); + + return; + } + else + { + lastCheck = now; + } + } + + // Send a ping + + Ping ping = new Ping(connectionTTL); + + Channel channel0 = connection.getChannel(0, -1, false); + + channel0.send(ping); + } + + public synchronized void cancel() + { + cancelled = true; + } + } + +} Modified: trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -381,11 +381,11 @@ public void replayCommands(final int otherLastReceivedCommandID, final long newChannelID) { clearUpTo(otherLastReceivedCommandID); - + for (final Packet packet : resendCache) { packet.setChannelID(newChannelID); - + doWrite(packet); } } Modified: trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -20,6 +20,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; +import org.hornetq.core.client.ClientMessage; import org.hornetq.core.exception.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Channel; @@ -29,9 +30,11 @@ 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.impl.wireformat.SessionReceiveMessage; import org.hornetq.core.remoting.spi.Connection; import org.hornetq.core.remoting.spi.HornetQBuffer; import org.hornetq.utils.SimpleIDGenerator; +import org.hornetq.utils.SimpleString; /** * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> @@ -330,11 +333,11 @@ public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { final Packet packet = decoder.decode(buffer); - + if (executor == null || packet.getType() == PacketImpl.PING) { // Pings must always be handled out of band so we can send pings back to the client quickly - // otherwise they would get in the queue with everything else which might give a intolerable delay + // otherwise they would get in the queue with everything else which might give an intolerable delay doBufferReceived(packet); } else Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java =================================================================== --- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -109,8 +109,6 @@ SimpleString getNodeID(); - // void initialiseBackup(UUID nodeID, long currentMessageID) throws Exception; - boolean isInitialised(); Queue createQueue(SimpleString address, Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -537,6 +537,7 @@ { if (flowRecord != null) { + if (notifConsumer != null) { try Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -32,7 +32,7 @@ import javax.management.MBeanServer; -import org.hornetq.core.client.impl.ConnectionManager; +import org.hornetq.core.client.impl.FailoverManager; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.cluster.DivertConfiguration; import org.hornetq.core.config.cluster.QueueConfiguration; @@ -189,7 +189,7 @@ private static AtomicInteger managementConnectorSequence = new AtomicInteger(0); - private ConnectionManager replicatingConnectionManager; + private FailoverManager replicatingFailoverManager; private final Set<ActivateCallback> activateCallbacks = new HashSet<ActivateCallback>(); Modified: trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -46,6 +46,7 @@ import org.hornetq.core.server.ServerSession; import org.hornetq.core.transaction.Transaction; import org.hornetq.core.transaction.impl.TransactionImpl; +import org.hornetq.utils.SimpleString; import org.hornetq.utils.TypedProperties; /** @@ -485,7 +486,7 @@ } final ServerMessage message = ref.getMessage(); - + if (filter != null && !filter.match(message)) { return HandleStatus.NO_MATCH; Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -1572,7 +1572,7 @@ public int transferConnection(final RemotingConnection newConnection, final int lastReceivedCommandID) { boolean wasStarted = this.started; - + if (wasStarted) { this.setStarted(false); @@ -1589,7 +1589,7 @@ // received responses that the backup did not know about. channel.transferConnection(newConnection); - + newConnection.syncIDGeneratorSequence(remotingConnection.getIDGeneratorSequence()); remotingConnection = newConnection; @@ -1605,7 +1605,7 @@ { this.setStarted(true); } - + return serverLastReceivedCommandID; } Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -413,16 +413,6 @@ sessionFactory.setAutoGroup(autoGroup); } - public synchronized int getMaxConnections() - { - return sessionFactory.getMaxConnections(); - } - - public synchronized void setMaxConnections(int maxConnections) - { - sessionFactory.setMaxConnections(maxConnections); - } - public synchronized boolean isPreAcknowledge() { return sessionFactory.isPreAcknowledge(); Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -141,8 +141,7 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessagesClient, int minLargeMessageSize, int consumerWindowSize, @@ -174,8 +173,7 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessagesClient, int minLargeMessageSize, int consumerWindowSize, Modified: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -63,10 +63,6 @@ void setCallTimeout(long callTimeout); - int getMaxConnections(); - - void setMaxConnections(int maxConnections); - boolean isCacheLargeMessagesClient(); void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient); Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -30,7 +30,6 @@ */ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConfiguration { - // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -55,8 +54,6 @@ public long callTimeout = ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT; - public int maxConnections = ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; - public boolean cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; public int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; @@ -232,16 +229,6 @@ this.callTimeout = callTimeout; } - public int getMaxConnections() - { - return maxConnections; - } - - public void setMaxConnections(int maxConnections) - { - this.maxConnections = maxConnections; - } - public boolean isCacheLargeMessagesClient() { return cacheLargeMessagesClient; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -139,8 +139,7 @@ boolean blockOnAcknowledge = getBoolean(e, "block-on-acknowledge", ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); boolean blockOnNonPersistentSend = getBoolean(e, "block-on-non-persistent-send", ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND); boolean blockOnPersistentSend = getBoolean(e, "block-on-persistent-send", ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND); - boolean autoGroup = getBoolean(e, "auto-group", ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - int maxConnections = getInteger(e, "max-connections", ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, GT_ZERO); + boolean autoGroup = getBoolean(e, "auto-group", ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); boolean preAcknowledge = getBoolean(e, "pre-acknowledge", ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); long retryInterval = getLong(e, "retry-interval", ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, GT_ZERO); double retryIntervalMultiplier = getDouble(e, "retry-interval-multiplier", ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, GT_ZERO); @@ -236,8 +235,7 @@ discoveryGroupConfiguration.getRefreshTimeout(), clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessagesClient, minLargeMessageSize, consumerWindowSize, @@ -270,8 +268,7 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessagesClient, minLargeMessageSize, consumerWindowSize, Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -365,8 +365,7 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessagesClient, int minLargeMessageSize, int consumerWindowSize, @@ -399,8 +398,7 @@ cf.setClientID(clientID); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); cf.setConnectionTTL(connectionTTL); - cf.setCallTimeout(callTimeout); - cf.setMaxConnections(maxConnections); + cf.setCallTimeout(callTimeout); cf.setCacheLargeMessagesClient(cacheLargeMessagesClient); cf.setMinLargeMessageSize(minLargeMessageSize); cf.setConsumerWindowSize(consumerWindowSize); @@ -435,8 +433,7 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessagesClient, int minLargeMessageSize, int consumerWindowSize, @@ -471,8 +468,7 @@ cf.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); cf.setConnectionTTL(connectionTTL); - cf.setCallTimeout(callTimeout); - cf.setMaxConnections(maxConnections); + cf.setCallTimeout(callTimeout); cf.setCacheLargeMessagesClient(cacheLargeMessagesClient); cf.setMinLargeMessageSize(minLargeMessageSize); cf.setConsumerWindowSize(consumerWindowSize); @@ -752,8 +748,7 @@ config.getDiscoveryRefreshTimeout(), config.getClientFailureCheckPeriod(), config.getConnectionTTL(), - config.getCallTimeout(), - config.getMaxConnections(), + config.getCallTimeout(), config.isCacheLargeMessagesClient(), config.getMinLargeMessageSize(), config.getConsumerWindowSize(), @@ -786,8 +781,7 @@ config.getClientID(), config.getClientFailureCheckPeriod(), config.getConnectionTTL(), - config.getCallTimeout(), - config.getMaxConnections(), + config.getCallTimeout(), config.isCacheLargeMessagesClient(), config.getMinLargeMessageSize(), config.getConsumerWindowSize(), Modified: trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -60,8 +60,6 @@ boolean isAutoGroup(); - int getMaxConnections(); - long getRetryInterval(); double getRetryIntervalMultiplier(); Modified: trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -98,8 +98,7 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, @@ -132,8 +131,7 @@ @Parameter(name = "clientID") String clientID, @Parameter(name = "clientFailureCheckPeriod") long clientFailureCheckPeriod, @Parameter(name = "connectionTTL") long connectionTTL, - @Parameter(name = "callTimeout") long callTimeout, - @Parameter(name = "maxConnections") int maxConnections, + @Parameter(name = "callTimeout") long callTimeout, @Parameter(name = "cacheLargemessageClient") boolean cacheLargeMessageClient, @Parameter(name = "minLargeMessageSize") int minLargeMessageSize, @Parameter(name = "consumerWindowSize") int consumerWindowSize, @@ -178,8 +176,7 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, @@ -213,8 +210,7 @@ @Parameter(name = "discoveryRefreshTimeout") long discoveryRefreshTimeout, @Parameter(name = "clientFailureCheckPeriod") long clientFailureCheckPeriod, @Parameter(name = "connectionTTL") long connectionTTL, - @Parameter(name = "callTimeout") long callTimeout, - @Parameter(name = "maxConnections") int maxConnections, + @Parameter(name = "callTimeout") long callTimeout, @Parameter(name = "cacheLargemessageClient") boolean cacheLargeMessageClient, @Parameter(name = "minLargeMessageSize") int minLargeMessageSize, @Parameter(name = "consumerWindowSize") int consumerWindowSize, Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -130,11 +130,6 @@ return cf.getConnectionTTL(); } - public int getMaxConnections() - { - return cf.getMaxConnections(); - } - public int getReconnectAttempts() { return cf.getReconnectAttempts(); Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -225,8 +225,7 @@ final String clientID, final long clientFailureCheckPeriod, final long connectionTTL, - final long callTimeout, - final int maxConnections, + final long callTimeout, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int consumerWindowSize, @@ -263,8 +262,7 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, @@ -300,8 +298,7 @@ final String clientID, final long clientFailureCheckPeriod, final long connectionTTL, - final long callTimeout, - final int maxConnections, + final long callTimeout, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int consumerWindowSize, @@ -340,8 +337,7 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, @@ -398,8 +394,7 @@ final long discoveryRefreshTimeout, final long clientFailureCheckPeriod, final long connectionTTL, - final long callTimeout, - final int maxConnections, + final long callTimeout, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int consumerWindowSize, @@ -434,8 +429,7 @@ discoveryRefreshTimeout, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, @@ -471,8 +465,7 @@ final long discoveryRefreshTimeout, final long clientFailureCheckPeriod, final long connectionTTL, - final long callTimeout, - final int maxConnections, + final long callTimeout, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int consumerWindowSize, @@ -507,8 +500,7 @@ discoveryRefreshTimeout, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, Modified: trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java =================================================================== --- trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -89,8 +89,6 @@ private Boolean autoGroup; - private Integer maxConnections; - private Boolean preAcknowledge; private Long retryInterval; @@ -555,26 +553,7 @@ this.autoGroup = autoGroup; } - public Integer getMaxConnections() - { - if (trace) - { - log.trace("getMaxConnections()"); - } - hasBeenUpdated = true; - return maxConnections; - } - - public void setMaxConnections(Integer maxConnections) - { - if (trace) - { - log.trace("setMaxConnections(" + maxConnections + ")"); - } - hasBeenUpdated = true; - this.maxConnections = maxConnections; - } - + public Boolean isPreAcknowledge() { if (trace) Modified: trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -604,17 +604,7 @@ { mcfProperties.setAutoGroup(autoGroup); } - - public Integer getMaxConnections() - { - return mcfProperties.getMaxConnections(); - } - - public void setMaxConnections(Integer maxConnections) - { - mcfProperties.setMaxConnections(maxConnections); - } - + public Boolean isPreAcknowledge() { return mcfProperties.isPreAcknowledge(); Modified: trunk/src/main/org/hornetq/ra/HornetQRAMetaData.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQRAMetaData.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/ra/HornetQRAMetaData.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -81,21 +81,6 @@ } /** - * Get the maximum number of connections -- RETURNS 0 - * @return The number - * @exception ResourceException Thrown if operation fails - */ - public int getMaxConnections() throws ResourceException - { - if (trace) - { - log.trace("getMaxConnections()"); - } - - return 0; - } - - /** * Get the user name * @return The user name * @exception ResourceException Thrown if operation fails @@ -109,4 +94,13 @@ return mc.getUserName(); } + + /* (non-Javadoc) + * @see javax.resource.spi.ManagedConnectionMetaData#getMaxConnections() + */ + public int getMaxConnections() throws ResourceException + { + // TODO Auto-generated method stub + return 0; + } } Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -836,38 +836,8 @@ raProperties.setAutoGroup(autoGroup); } - + /** - * Get max connections - * - * @return The value - */ - public Integer getMaxConnections() - { - if (trace) - { - log.trace("getMaxConnections()"); - } - - return raProperties.getMaxConnections(); - } - - /** - * Set max connections - * - * @param maxConnections The value - */ - public void setMaxConnections(final Integer maxConnections) - { - if (trace) - { - log.trace("setMaxConnections(" + maxConnections + ")"); - } - - raProperties.setMaxConnections(maxConnections); - } - - /** * Get pre acknowledge * * @return The value @@ -1494,12 +1464,7 @@ { cf.setDupsOKBatchSize(val2); } - val2 = overrideProperties.getMaxConnections() != null ? overrideProperties.getMaxConnections() - : raProperties.getMaxConnections(); - if (val2 != null) - { - cf.setMaxConnections(val2); - } + val2 = overrideProperties.getMinLargeMessageSize() != null ? overrideProperties.getMinLargeMessageSize() : raProperties.getMinLargeMessageSize(); if (val2 != null) Modified: trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml =================================================================== --- trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2009-10-02 15:47:08 UTC (rev 8036) @@ -29,7 +29,6 @@ <discovery-initial-wait-timeout>678</discovery-initial-wait-timeout> <failover-on-server-shutdown>false</failover-on-server-shutdown> <connection-load-balancing-policy-class-name>FooClass</connection-load-balancing-policy-class-name> - <max-connections>12</max-connections> <reconnect-attempts>34</reconnect-attempts> <retry-interval>5</retry-interval> <retry-interval-multiplier>6.0</retry-interval-multiplier> Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -23,7 +23,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; @@ -44,7 +43,6 @@ import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.utils.Pair; @@ -93,8 +91,7 @@ null, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, DEFAULT_CONNECTION_TTL, - DEFAULT_CALL_TIMEOUT, - DEFAULT_MAX_CONNECTIONS, + DEFAULT_CALL_TIMEOUT, DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, DEFAULT_MIN_LARGE_MESSAGE_SIZE, DEFAULT_CONSUMER_WINDOW_SIZE, Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -23,7 +23,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; @@ -41,7 +40,6 @@ import javax.naming.InitialContext; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.utils.Pair; @@ -89,8 +87,7 @@ null, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, DEFAULT_CONNECTION_TTL, - DEFAULT_CALL_TIMEOUT, - DEFAULT_MAX_CONNECTIONS, + DEFAULT_CALL_TIMEOUT, DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, DEFAULT_MIN_LARGE_MESSAGE_SIZE, DEFAULT_CONSUMER_WINDOW_SIZE, Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -22,7 +22,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; @@ -48,7 +47,6 @@ import javax.management.ObjectName; import javax.naming.InitialContext; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.ObjectNames; @@ -318,8 +316,7 @@ clientId, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, DEFAULT_CONNECTION_TTL, - DEFAULT_CALL_TIMEOUT, - DEFAULT_MAX_CONNECTIONS, + DEFAULT_CALL_TIMEOUT, DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, DEFAULT_MIN_LARGE_MESSAGE_SIZE, prefetchSize, Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -118,8 +118,7 @@ ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -179,8 +178,7 @@ ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -230,8 +228,7 @@ ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -281,8 +278,7 @@ ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -332,8 +328,7 @@ ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -380,7 +375,6 @@ long clientFailureCheckPeriod = RandomUtil.randomPositiveLong(); long connectionTTL = RandomUtil.randomPositiveLong(); long callTimeout = RandomUtil.randomPositiveLong(); - int maxConnections = RandomUtil.randomPositiveInt(); int minLargeMessageSize = RandomUtil.randomPositiveInt(); int consumerWindowSize = RandomUtil.randomPositiveInt(); int consumerMaxRate = RandomUtil.randomPositiveInt(); @@ -409,7 +403,6 @@ cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); cf.setConnectionTTL(connectionTTL); cf.setCallTimeout(callTimeout); - cf.setMaxConnections(maxConnections); cf.setMinLargeMessageSize(minLargeMessageSize); cf.setConsumerWindowSize(consumerWindowSize); cf.setConsumerMaxRate(consumerMaxRate); @@ -437,8 +430,7 @@ assertEquals(discoveryRefreshTimeout, cf.getDiscoveryRefreshTimeout()); assertEquals(clientFailureCheckPeriod, cf.getClientFailureCheckPeriod()); assertEquals(connectionTTL, cf.getConnectionTTL()); - assertEquals(callTimeout, cf.getCallTimeout()); - assertEquals(maxConnections, cf.getMaxConnections()); + assertEquals(callTimeout, cf.getCallTimeout()); assertEquals(minLargeMessageSize, cf.getMinLargeMessageSize()); assertEquals(consumerWindowSize, cf.getConsumerWindowSize()); assertEquals(consumerMaxRate, cf.getConsumerMaxRate()); @@ -474,8 +466,7 @@ long discoveryRefreshTimeout = RandomUtil.randomPositiveLong(); long clientFailureCheckPeriod = RandomUtil.randomPositiveLong(); long connectionTTL = RandomUtil.randomPositiveLong(); - long callTimeout = RandomUtil.randomPositiveLong(); - int maxConnections = RandomUtil.randomPositiveInt(); + long callTimeout = RandomUtil.randomPositiveLong(); int minLargeMessageSize = RandomUtil.randomPositiveInt(); int consumerWindowSize = RandomUtil.randomPositiveInt(); int consumerMaxRate = RandomUtil.randomPositiveInt(); @@ -562,15 +553,6 @@ } try { - cf.setMaxConnections(maxConnections); - fail("Should throw exception"); - } - catch (IllegalStateException e) - { - // OK - } - try - { cf.setMinLargeMessageSize(minLargeMessageSize); fail("Should throw exception"); } @@ -757,7 +739,6 @@ cf.getClientFailureCheckPeriod(); cf.getConnectionTTL(); cf.getCallTimeout(); - cf.getMaxConnections(); cf.getMinLargeMessageSize(); cf.getConsumerWindowSize(); cf.getConsumerMaxRate(); @@ -788,8 +769,7 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, int minLargeMessageSize, int consumerWindowSize, int consumerMaxRate, @@ -831,7 +811,6 @@ assertEquals(cf.getClientFailureCheckPeriod(), clientFailureCheckPeriod); assertEquals(cf.getConnectionTTL(), connectionTTL); assertEquals(cf.getCallTimeout(), callTimeout); - assertEquals(cf.getMaxConnections(), maxConnections); assertEquals(cf.getMinLargeMessageSize(), minLargeMessageSize); assertEquals(cf.getConsumerWindowSize(), consumerWindowSize); assertEquals(cf.getConsumerMaxRate(), consumerMaxRate); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -29,7 +29,7 @@ import org.hornetq.core.client.ClientSession; import org.hornetq.core.client.ClientSessionFactory; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.client.impl.ConnectionManagerImpl; +import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.config.cluster.BroadcastGroupConfiguration; @@ -135,11 +135,6 @@ private ClientSessionFactory[] sfs = new ClientSessionFactory[MAX_SERVERS]; - protected void failNode(TransportConfiguration conf) - { - ConnectionManagerImpl.failAllConnectionsForConnector(conf); - } - protected void waitForMessages(int node, final String address, final int count) throws Exception { HornetQServer server = this.servers[node]; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -126,6 +126,8 @@ boolean ok = latch.await(1000, TimeUnit.MILLISECONDS); assertTrue(ok); + + log.info("got here 1"); ClientConsumer consumer = session.createConsumer(ADDRESS); @@ -149,6 +151,7 @@ } } + log.info("closing session"); session.close(); assertEquals(0, sf.numSessions()); @@ -1291,117 +1294,7 @@ assertEquals(0, sf.numConnections()); } - public void testFailoverFailMultipleUnderlyingConnections() throws Exception - { - ClientSessionFactoryInternal sf = getSessionFactory(); - - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); - - class MyListener implements FailureListener - { - CountDownLatch latch = new CountDownLatch(1); - - public void connectionFailed(HornetQException me) - { - latch.countDown(); - } - } - - ClientSession session1 = sf.createSession(true, true); - ClientSession session2 = sf.createSession(true, true); - ClientSession session3 = sf.createSession(true, true); - - SimpleString queueName1 = new SimpleString("queue1"); - session1.createQueue(ADDRESS, queueName1, null, true); - MyListener listener1 = new MyListener(); - session1.addFailureListener(listener1); - - SimpleString queueName2 = new SimpleString("queue2"); - session2.createQueue(ADDRESS, queueName2, null, true); - MyListener listener2 = new MyListener(); - session2.addFailureListener(listener2); - - SimpleString queueName3 = new SimpleString("queue3"); - session3.createQueue(ADDRESS, queueName3, null, true); - MyListener listener3 = new MyListener(); - session3.addFailureListener(listener3); - - ClientConsumer consumer1 = session1.createConsumer(queueName1); - ClientConsumer consumer2 = session1.createConsumer(queueName2); - ClientConsumer consumer3 = session1.createConsumer(queueName3); - - ClientProducer producer = session1.createProducer(ADDRESS); - - final int numMessages = 100; - - for (int i = 0; i < numMessages; i++) - { - ClientMessage message = session1.createClientMessage(true); - - message.getBody().writeString("message" + i); - - message.putIntProperty("counter", i); - - producer.send(message); - } - - // Fail all the connections - - RemotingConnection conn1 = ((ClientSessionInternal)session1).getConnection(); - RemotingConnection conn2 = ((ClientSessionInternal)session2).getConnection(); - RemotingConnection conn3 = ((ClientSessionInternal)session3).getConnection(); - - assertTrue(conn1 != conn2); - assertTrue(conn2 != conn3); - assertTrue(conn1 != conn3); - - conn2.fail(new HornetQException(HornetQException.NOT_CONNECTED)); - conn3.fail(new HornetQException(HornetQException.NOT_CONNECTED)); - - // Wait to be informed of failure - - boolean ok = listener1.latch.await(1000, TimeUnit.MILLISECONDS); - assertTrue(ok); - ok = listener2.latch.await(1000, TimeUnit.MILLISECONDS); - assertTrue(ok); - ok = listener3.latch.await(1000, TimeUnit.MILLISECONDS); - assertTrue(ok); - - session1.start(); - session2.start(); - session3.start(); - - for (int i = 0; i < numMessages; i++) - { - ClientMessage message = consumer1.receive(1000); - assertNotNull(message); - assertEquals("message" + i, message.getBody().readString()); - assertEquals(i, message.getProperty("counter")); - message.acknowledge(); - - message = consumer2.receive(1000); - assertNotNull(message); - assertEquals("message" + i, message.getBody().readString()); - assertEquals(i, message.getProperty("counter")); - message.acknowledge(); - - message = consumer3.receive(1000); - assertNotNull(message); - assertEquals("message" + i, message.getBody().readString()); - assertEquals(i, message.getProperty("counter")); - message.acknowledge(); - } - - session1.close(); - session2.close(); - session3.close(); - - assertEquals(0, sf.numSessions()); - - assertEquals(0, sf.numConnections()); - } - + /* * Browser will get reset to beginning after failover */ Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -85,13 +85,13 @@ session.createQueue(ADDRESS, ADDRESS, null, false); - final int numIterations = 100; + final int numIterations = 10; for (int j = 0; j < numIterations; j++) { ClientProducer producer = session.createProducer(ADDRESS); - final int numMessages = 1000; + final int numMessages = 100; for (int i = 0; i < numMessages; i++) { @@ -290,19 +290,10 @@ InVMConnector.numberOfFailures = 10; InVMConnector.failOnCreateConnection = true; - // We need to fail on different connections. - - // We fail on one connection then the connection manager tries to reconnect all connections - // Then we fail the other, and the connection manager is then called while the reconnection is occurring - // We can't use the same connection since RemotingConnectionImpl only allows one fail to be in process - // at same time - final RemotingConnection conn = ((ClientSessionInternal)session).getConnection(); final RemotingConnection conn2 = ((ClientSessionInternal)session2).getConnection(); - assertTrue(conn != conn2); - Thread t = new Thread() { public void run() @@ -315,8 +306,6 @@ { } - log.info("calling fail async"); - conn2.fail(new HornetQException(HornetQException.NOT_CONNECTED, "Did not receive pong from server")); } }; @@ -416,8 +405,6 @@ t.start(); - log.info("Failing connection"); - conn.fail(new HornetQException(HornetQException.NOT_CONNECTED)); session.start(); @@ -637,7 +624,7 @@ RemotingConnection conn = ((ClientSessionInternal)session).getConnection(); long start = System.currentTimeMillis(); - + conn.fail(new HornetQException(HornetQException.NOT_CONNECTED)); session.start(); @@ -662,8 +649,6 @@ long end = System.currentTimeMillis(); double wait = retryInterval + retryMultiplier * retryInterval + retryMultiplier * retryMultiplier * retryInterval; - - log.info("wait is " + wait); assertTrue((end - start) >= wait); @@ -679,7 +664,7 @@ final double retryMultiplier = 2d; final int reconnectAttempts = -1; - + final long maxRetryInterval = 1000; ClientSessionFactoryInternal sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); @@ -718,7 +703,7 @@ RemotingConnection conn = ((ClientSessionInternal)session).getConnection(); long start = System.currentTimeMillis(); - + conn.fail(new HornetQException(HornetQException.NOT_CONNECTED)); session.start(); @@ -743,11 +728,9 @@ long end = System.currentTimeMillis(); double wait = retryInterval + retryMultiplier * 2 * retryInterval + retryMultiplier; - - log.info("wait is " + wait); assertTrue((end - start) >= wait); - + assertTrue((end - start) < wait + 500); session.close(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -19,7 +19,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; @@ -150,8 +149,7 @@ null, 1000, DEFAULT_CONNECTION_TTL, - callTimeout, - DEFAULT_MAX_CONNECTIONS, + callTimeout, DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, DEFAULT_MIN_LARGE_MESSAGE_SIZE, DEFAULT_CONSUMER_WINDOW_SIZE, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -73,8 +73,7 @@ null, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -144,8 +143,7 @@ null, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -192,8 +190,7 @@ null, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -241,8 +238,7 @@ null, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -290,8 +286,7 @@ null, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, @@ -336,8 +331,7 @@ long discoveryRefreshTimeout = RandomUtil.randomPositiveLong(); long clientFailureCheckPeriod = RandomUtil.randomPositiveLong(); long connectionTTL = RandomUtil.randomPositiveLong(); - long callTimeout = RandomUtil.randomPositiveLong(); - int maxConnections = RandomUtil.randomPositiveInt(); + long callTimeout = RandomUtil.randomPositiveLong(); int minLargeMessageSize = RandomUtil.randomPositiveInt(); int consumerWindowSize = RandomUtil.randomPositiveInt(); int consumerMaxRate = RandomUtil.randomPositiveInt(); @@ -365,8 +359,7 @@ cf.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); cf.setConnectionTTL(connectionTTL); - cf.setCallTimeout(callTimeout); - cf.setMaxConnections(maxConnections); + cf.setCallTimeout(callTimeout); cf.setMinLargeMessageSize(minLargeMessageSize); cf.setConsumerWindowSize(consumerWindowSize); cf.setConsumerMaxRate(consumerMaxRate); @@ -394,8 +387,7 @@ assertEquals(discoveryRefreshTimeout, cf.getDiscoveryRefreshTimeout()); assertEquals(clientFailureCheckPeriod, cf.getClientFailureCheckPeriod()); assertEquals(connectionTTL, cf.getConnectionTTL()); - assertEquals(callTimeout, cf.getCallTimeout()); - assertEquals(maxConnections, cf.getMaxConnections()); + assertEquals(callTimeout, cf.getCallTimeout()); assertEquals(minLargeMessageSize, cf.getMinLargeMessageSize()); assertEquals(consumerWindowSize, cf.getConsumerWindowSize()); assertEquals(consumerMaxRate, cf.getConsumerMaxRate()); @@ -432,8 +424,7 @@ String clientID = RandomUtil.randomString(); long clientFailureCheckPeriod = RandomUtil.randomPositiveLong(); long connectionTTL = RandomUtil.randomPositiveLong(); - long callTimeout = RandomUtil.randomPositiveLong(); - int maxConnections = RandomUtil.randomPositiveInt(); + long callTimeout = RandomUtil.randomPositiveLong(); int minLargeMessageSize = RandomUtil.randomPositiveInt(); int consumerWindowSize = RandomUtil.randomPositiveInt(); int consumerMaxRate = RandomUtil.randomPositiveInt(); @@ -530,15 +521,6 @@ } try { - cf.setMaxConnections(maxConnections); - fail("Should throw exception"); - } - catch (IllegalStateException e) - { - // OK - } - try - { cf.setMinLargeMessageSize(minLargeMessageSize); fail("Should throw exception"); } @@ -734,8 +716,7 @@ cf.getClientID(); cf.getClientFailureCheckPeriod(); cf.getConnectionTTL(); - cf.getCallTimeout(); - cf.getMaxConnections(); + cf.getCallTimeout(); cf.getMinLargeMessageSize(); cf.getConsumerWindowSize(); cf.getConsumerMaxRate(); @@ -768,8 +749,7 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, int minLargeMessageSize, int consumerWindowSize, int consumerMaxRate, @@ -812,8 +792,7 @@ assertEquals(cf.getClientID(), clientID); assertEquals(cf.getClientFailureCheckPeriod(), clientFailureCheckPeriod); assertEquals(cf.getConnectionTTL(), connectionTTL); - assertEquals(cf.getCallTimeout(), callTimeout); - assertEquals(cf.getMaxConnections(), maxConnections); + assertEquals(cf.getCallTimeout(), callTimeout); assertEquals(cf.getMinLargeMessageSize(), minLargeMessageSize); assertEquals(cf.getConsumerWindowSize(), consumerWindowSize); assertEquals(cf.getConsumerMaxRate(), consumerMaxRate); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -24,7 +24,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; @@ -260,8 +259,7 @@ null, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, DEFAULT_CONNECTION_TTL, - callTimeout, - DEFAULT_MAX_CONNECTIONS, + callTimeout, DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, DEFAULT_MIN_LARGE_MESSAGE_SIZE, DEFAULT_CONSUMER_WINDOW_SIZE, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -24,7 +24,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; @@ -42,7 +41,6 @@ import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.utils.Pair; @@ -225,8 +223,7 @@ null, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, DEFAULT_CONNECTION_TTL, - callTimeout, - DEFAULT_MAX_CONNECTIONS, + callTimeout, DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, DEFAULT_MIN_LARGE_MESSAGE_SIZE, DEFAULT_CONSUMER_WINDOW_SIZE, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ResendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/ResendTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ResendTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -23,7 +23,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; @@ -264,8 +263,7 @@ null, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, DEFAULT_CONNECTION_TTL, - callTimeout, - DEFAULT_MAX_CONNECTIONS, + callTimeout, true, DEFAULT_MIN_LARGE_MESSAGE_SIZE, DEFAULT_CONSUMER_WINDOW_SIZE, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -103,8 +103,6 @@ Session sess6 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE); Session sess7 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE); - assertEquals(ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, server.getRemotingService().getConnections().size()); - sess1 = sess2 = sess3 = sess4 = sess5 = sess6 = sess7 = null; conn1 = null; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -15,7 +15,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; @@ -24,7 +23,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; @@ -37,7 +35,11 @@ import java.util.ArrayList; import java.util.List; -import javax.jms.*; +import javax.jms.Connection; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.TransportConfiguration; @@ -161,8 +163,7 @@ null, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, DEFAULT_CONNECTION_TTL, - callTimeout, - DEFAULT_MAX_CONNECTIONS, + callTimeout, DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, DEFAULT_MIN_LARGE_MESSAGE_SIZE, DEFAULT_CONSUMER_WINDOW_SIZE, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -206,8 +206,7 @@ assertEquals(false, cf.isAutoGroup()); assertEquals(true, cf.isPreAcknowledge()); assertEquals(2345, cf.getConnectionTTL()); - assertEquals(false, cf.isFailoverOnServerShutdown()); - assertEquals(12, cf.getMaxConnections()); + assertEquals(false, cf.isFailoverOnServerShutdown()); assertEquals(34, cf.getReconnectAttempts()); assertEquals(5, cf.getRetryInterval()); assertEquals(6.0, cf.getRetryIntervalMultiplier()); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -431,8 +431,7 @@ clientID, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, @@ -477,8 +476,7 @@ clientID, ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS, + ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -99,8 +99,7 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, @@ -133,8 +132,7 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, @@ -168,8 +166,7 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, @@ -202,8 +199,7 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, @@ -386,8 +382,7 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, @@ -421,8 +416,7 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, @@ -457,8 +451,7 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, - int maxConnections, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, @@ -492,8 +485,7 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, - maxConnections, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -19,7 +19,7 @@ import org.hornetq.core.client.ClientSessionFactory; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.ConnectionManagerImpl; +import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.exception.HornetQException; @@ -223,7 +223,7 @@ // We need to get it to stop pinging after one - ((ConnectionManagerImpl)csf.getConnectionManagers()[0]).stopPingingAfterOne(); + ((FailoverManagerImpl)csf.getFailoverManagers()[0]).stopPingingAfterOne(); RemotingConnection serverConn = null; Modified: trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -80,8 +80,7 @@ assertEquals(factory.getDiscoveryInitialWaitTimeout(), ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); assertEquals(factory.getDiscoveryPort(), 0); assertEquals(factory.getDiscoveryRefreshTimeout(), ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); - assertEquals(factory.getDupsOKBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - assertEquals(factory.getMaxConnections(), ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS); + assertEquals(factory.getDupsOKBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); assertEquals(factory.getMinLargeMessageSize(), ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE); assertEquals(factory.getProducerWindowSize(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE); @@ -125,8 +124,7 @@ assertEquals(factory.getDiscoveryInitialWaitTimeout(), ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); assertEquals(factory.getDiscoveryPort(), 0); assertEquals(factory.getDiscoveryRefreshTimeout(), ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); - assertEquals(factory.getDupsOKBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - assertEquals(factory.getMaxConnections(), ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS); + assertEquals(factory.getDupsOKBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); assertEquals(factory.getMinLargeMessageSize(), ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE); assertEquals(factory.getProducerWindowSize(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE); @@ -163,8 +161,7 @@ ra.setDiscoveryInitialWaitTimeout(6l); ra.setDiscoveryRefreshTimeout(7l); ra.setDupsOKBatchSize(8); - ra.setFailoverOnServerShutdown(!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - ra.setMaxConnections(9); + ra.setFailoverOnServerShutdown(!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ra.setMinLargeMessageSize(10); ra.setPreAcknowledge(!ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); ra.setProducerMaxRate(11); @@ -188,8 +185,7 @@ assertEquals(factory.getDiscoveryInitialWaitTimeout(), 6); assertEquals(factory.getDiscoveryPort(), 0); assertEquals(factory.getDiscoveryRefreshTimeout(), 7); - assertEquals(factory.getDupsOKBatchSize(), 8); - assertEquals(factory.getMaxConnections(), 9); + assertEquals(factory.getDupsOKBatchSize(), 8); assertEquals(factory.getMinLargeMessageSize(), 10); assertEquals(factory.getProducerMaxRate(), 11); assertEquals(factory.getProducerWindowSize(), 12); @@ -227,8 +223,7 @@ connectionFactoryProperties.setDiscoveryInitialWaitTimeout(6l); connectionFactoryProperties.setDiscoveryRefreshTimeout(7l); connectionFactoryProperties.setDupsOKBatchSize(8); - connectionFactoryProperties.setFailoverOnServerShutdown(!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - connectionFactoryProperties.setMaxConnections(9); + connectionFactoryProperties.setFailoverOnServerShutdown(!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); connectionFactoryProperties.setMinLargeMessageSize(10); connectionFactoryProperties.setPreAcknowledge(!ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); connectionFactoryProperties.setProducerMaxRate(11); @@ -252,8 +247,7 @@ assertEquals(factory.getDiscoveryInitialWaitTimeout(), 6); assertEquals(factory.getDiscoveryPort(), 0); assertEquals(factory.getDiscoveryRefreshTimeout(), 7); - assertEquals(factory.getDupsOKBatchSize(), 8); - assertEquals(factory.getMaxConnections(), 9); + assertEquals(factory.getDupsOKBatchSize(), 8); assertEquals(factory.getMinLargeMessageSize(), 10); assertEquals(factory.getProducerMaxRate(), 11); assertEquals(factory.getProducerWindowSize(), 12); Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-10-02 13:56:28 UTC (rev 8035) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-10-02 15:47:08 UTC (rev 8036) @@ -24,7 +24,6 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; @@ -41,7 +40,6 @@ import javax.jms.Queue; import javax.naming.NamingException; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.server.HornetQ; @@ -204,8 +202,7 @@ null, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, DEFAULT_CONNECTION_TTL, - callTimeout, - DEFAULT_MAX_CONNECTIONS, + callTimeout, DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, DEFAULT_MIN_LARGE_MESSAGE_SIZE, DEFAULT_CONSUMER_WINDOW_SIZE,

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8035 - in trunk/examples: core/embedded and 73 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-02 09:56:28 -0400 (Fri, 02 Oct 2009) New Revision: 8035 Added: trunk/examples/common/prettify.css trunk/examples/common/prettify.js Modified: trunk/examples/common/common.css trunk/examples/core/embedded-remote/readme.html trunk/examples/core/embedded/readme.html trunk/examples/core/microcontainer/readme.html trunk/examples/javaee/ejb-jms-transaction/readme.html trunk/examples/javaee/hajndi/readme.html trunk/examples/javaee/jca-config/readme.html trunk/examples/javaee/jms-bridge/readme.html trunk/examples/javaee/mdb-bmt/readme.html trunk/examples/javaee/mdb-cmt-setrollbackonly/readme.html trunk/examples/javaee/mdb-cmt-tx-local/readme.html trunk/examples/javaee/mdb-cmt-tx-not-supported/readme.html trunk/examples/javaee/mdb-cmt-tx-required/readme.html trunk/examples/javaee/mdb-message-selector/readme.html trunk/examples/javaee/mdb-tx-send/readme.html trunk/examples/javaee/servlet-ssl/readme.html trunk/examples/javaee/servlet-transport/readme.html trunk/examples/javaee/xarecovery/readme.html trunk/examples/jms/applet/readme.html trunk/examples/jms/application-layer-failover/readme.html trunk/examples/jms/automatic-failover/readme.html trunk/examples/jms/bridge/readme.html trunk/examples/jms/browser/readme.html trunk/examples/jms/client-kickoff/readme.html trunk/examples/jms/client-side-load-balancing/readme.html trunk/examples/jms/clustered-durable-subscription/readme.html trunk/examples/jms/clustered-queue/readme.html trunk/examples/jms/clustered-standalone/readme.html trunk/examples/jms/clustered-topic/readme.html trunk/examples/jms/consumer-rate-limit/readme.html trunk/examples/jms/dead-letter/readme.html trunk/examples/jms/delayed-redelivery/readme.html trunk/examples/jms/divert/readme.html trunk/examples/jms/durable-subscription/readme.html trunk/examples/jms/embedded/readme.html trunk/examples/jms/expiry/readme.html trunk/examples/jms/http-transport/readme.html trunk/examples/jms/instantiate-connection-factory/readme.html trunk/examples/jms/interceptor/readme.html trunk/examples/jms/jaas/readme.html trunk/examples/jms/jmx/readme.html trunk/examples/jms/large-message/readme.html trunk/examples/jms/last-value-queue/readme.html trunk/examples/jms/management-notifications/readme.html trunk/examples/jms/management/readme.html trunk/examples/jms/message-counters/readme.html trunk/examples/jms/message-group/readme.html trunk/examples/jms/message-priority/readme.html trunk/examples/jms/no-consumer-buffering/readme.html trunk/examples/jms/paging/readme.html trunk/examples/jms/pre-acknowledge/readme.html trunk/examples/jms/producer-rate-limit/readme.html trunk/examples/jms/queue-message-redistribution/readme.html trunk/examples/jms/queue-requestor/readme.html trunk/examples/jms/queue-selector/readme.html trunk/examples/jms/queue/readme.html trunk/examples/jms/reconnect-same-node/readme.html trunk/examples/jms/request-reply/readme.html trunk/examples/jms/scheduled-message/readme.html trunk/examples/jms/security/readme.html trunk/examples/jms/send-acknowledgements/readme.html trunk/examples/jms/ssl-enabled/readme.html trunk/examples/jms/static-selector-jms/readme.html trunk/examples/jms/static-selector/readme.html trunk/examples/jms/symmetric-cluster/readme.html trunk/examples/jms/temp-queue/readme.html trunk/examples/jms/topic-hierarchies/readme.html trunk/examples/jms/topic-selector-example1/readme.html trunk/examples/jms/topic-selector-example2/readme.html trunk/examples/jms/topic/readme.html trunk/examples/jms/transactional/readme.html trunk/examples/jms/xa-heuristic/readme.html trunk/examples/jms/xa-receive/readme.html trunk/examples/jms/xa-send/readme.html trunk/examples/jms/xa-with-jta/readme.html Log: prettified code of examples' readmes Modified: trunk/examples/common/common.css =================================================================== --- trunk/examples/common/common.css 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/common/common.css 2009-10-02 13:56:28 UTC (rev 8035) @@ -7,12 +7,13 @@ font-size: 250%; } -pre, code { +code { background-color: lightgrey; color:#333; } pre { + background-color: lightgrey; display:block; overflow:auto; border: dotted grey 1px; Added: trunk/examples/common/prettify.css =================================================================== --- trunk/examples/common/prettify.css (rev 0) +++ trunk/examples/common/prettify.css 2009-10-02 13:56:28 UTC (rev 8035) @@ -0,0 +1 @@ +.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun{color:#660}.pln{color:#000}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec{color:#606}pre.prettyprint{padding:2px;border:1px solid #888}@media print{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun{color:#440}.pln{color:#000}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}} \ No newline at end of file Property changes on: trunk/examples/common/prettify.css ___________________________________________________________________ Name: svn:executable + * Added: trunk/examples/common/prettify.js =================================================================== --- trunk/examples/common/prettify.js (rev 0) +++ trunk/examples/common/prettify.js 2009-10-02 13:56:28 UTC (rev 8035) @@ -0,0 +1,23 @@ +function H(){var x=navigator&&navigator.userAgent&&/\bMSIE 6\./.test(navigator.userAgent);H=function(){return x};return x}(function(){function x(b){b=b.split(/ /g);var a={};for(var c=b.length;--c>=0;){var d=b[c];if(d)a[d]=null}return a}var y="break continue do else for if return while ",U=y+"auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile ",D=U+"catch class delete false import new operator private protected public this throw true try ", +I=D+"alignof align_union asm axiom bool concept concept_map const_cast constexpr decltype dynamic_cast explicit export friend inline late_check mutable namespace nullptr reinterpret_cast static_assert static_cast template typeid typename typeof using virtual wchar_t where ",J=D+"boolean byte extends final finally implements import instanceof null native package strictfp super synchronized throws transient ",V=J+"as base by checked decimal delegate descending event fixed foreach from group implicit in interface internal into is lock object out override orderby params readonly ref sbyte sealed stackalloc string select uint ulong unchecked unsafe ushort var ", +K=D+"debugger eval export function get null set undefined var with Infinity NaN ",L="caller delete die do dump elsif eval exit foreach for goto if import last local my next no our print package redo require sub undef unless until use wantarray while BEGIN END ",M=y+"and as assert class def del elif except exec finally from global import in is lambda nonlocal not or pass print raise try with yield False True None ",N=y+"alias and begin case class def defined elsif end ensure false in module next nil not or redo rescue retry self super then true undef unless until when yield BEGIN END ", +O=y+"case done elif esac eval fi function in local set then until ",W=I+V+K+L+M+N+O;function X(b){return b>="a"&&b<="z"||b>="A"&&b<="Z"}function u(b,a,c,d){b.unshift(c,d||0);try{a.splice.apply(a,b)}finally{b.splice(0,2)}}var Y=(function(){var b=["!","!=","!==","#","%","%=","&","&&","&&=","&=","(","*","*=","+=",",","-=","->","/","/=",":","::",";","<","<<","<<=","<=","=","==","===",">",">=",">>",">>=",">>>",">>>=","?","@","[","^","^=","^^","^^=","{","|","|=","||","||=","~","break","case","continue", +"delete","do","else","finally","instanceof","return","throw","try","typeof"],a="(?:(?:(?:^|[^0-9.])\\.{1,3})|(?:(?:^|[^\\+])\\+)|(?:(?:^|[^\\-])-)";for(var c=0;c<b.length;++c){var d=b[c];a+=X(d.charAt(0))?"|\\b"+d:"|"+d.replace(/([^=<>:&])/g,"\\$1")}a+="|^)\\s*$";return new RegExp(a)})(),P=/&/g,Q=/</g,R=/>/g,Z=/\"/g;function $(b){return b.replace(P,"&").replace(Q,"<").replace(R,">").replace(Z,""")}function E(b){return b.replace(P,"&").replace(Q,"<").replace(R,">")}var aa= +/</g,ba=/>/g,ca=/'/g,da=/"/g,ea=/&/g,fa=/ /g;function ga(b){var a=b.indexOf("&");if(a<0)return b;for(--a;(a=b.indexOf("&#",a+1))>=0;){var c=b.indexOf(";",a);if(c>=0){var d=b.substring(a+3,c),g=10;if(d&&d.charAt(0)==="x"){d=d.substring(1);g=16}var e=parseInt(d,g);if(!isNaN(e))b=b.substring(0,a)+String.fromCharCode(e)+b.substring(c+1)}}return b.replace(aa,"<").replace(ba,">").replace(ca,"'").replace(da,'"').replace(ea,"&").replace(fa," ")}function S(b){return"XMP"===b.tagName} +function z(b,a){switch(b.nodeType){case 1:var c=b.tagName.toLowerCase();a.push("<",c);for(var d=0;d<b.attributes.length;++d){var g=b.attributes[d];if(!g.specified)continue;a.push(" ");z(g,a)}a.push(">");for(var e=b.firstChild;e;e=e.nextSibling)z(e,a);if(b.firstChild||!/^(?:br|link|img)$/.test(c))a.push("</",c,">");break;case 2:a.push(b.name.toLowerCase(),'="',$(b.value),'"');break;case 3:case 4:a.push(E(b.nodeValue));break}}var F=null;function ha(b){if(null===F){var a=document.createElement("PRE"); +a.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />'));F=!/</.test(a.innerHTML)}if(F){var c=b.innerHTML;if(S(b))c=E(c);return c}var d=[];for(var g=b.firstChild;g;g=g.nextSibling)z(g,d);return d.join("")}function ia(b){var a=0;return function(c){var d=null,g=0;for(var e=0,h=c.length;e<h;++e){var f=c.charAt(e);switch(f){case "\t":if(!d)d=[];d.push(c.substring(g,e));var i=b-a%b;a+=i;for(;i>=0;i-=" ".length)d.push(" ".substring(0,i));g=e+1;break; +case "\n":a=0;break;default:++a}}if(!d)return c;d.push(c.substring(g));return d.join("")}}var ja=/(?:[^<]+| + <bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JAASSecurityManager"> + <property name="configurationName">org.hornetq.jms.example.ExampleLoginModule</property> + <property name="configuration"> + <inject bean="ExampleConfiguration"/> + </property> + <property name="callbackHandler"> + <inject bean="ExampleCallbackHandler" /> + </property> + </bean> - &lt;!-- JAAS uses a simple LoginModule where the user credentials and roles are - specified as options in the constructor --&gt; - &lt;bean name="ExampleConfiguration" class="org.hornetq.jms.example.ExampleConfiguration"&gt; - &lt;constructor&gt; - &lt;parameter&gt;org.hornetq.jms.example.ExampleLoginModule&lt;/parameter&gt; - &lt;parameter&gt; - &lt;map class="java.util.HashMap" keyClass="java.lang.String" - valueClass="java.lang.String"&gt; - &lt;entry&gt; - &lt;key&gt;user&lt;/key&gt; - &lt;value&gt;jboss&lt;/value&gt; - &lt;/entry&gt; - &lt;entry&gt; - &lt;key&gt;pass&lt;/key&gt; - &lt;value&gt;redhat&lt;/value&gt; - &lt;/entry&gt; - &lt;entry&gt; - &lt;key&gt;role&lt;/key&gt; - &lt;value&gt;guest&lt;/value&gt; - &lt;/entry&gt; - &lt;/map&gt; - &lt;/parameter&gt; - &lt;/constructor&gt; - &lt;/bean&gt; +  + <bean name="ExampleConfiguration" class="org.hornetq.jms.example.ExampleConfiguration"> + <constructor> + <parameter>org.hornetq.jms.example.ExampleLoginModule</parameter> + <parameter> + <map class="java.util.HashMap" keyClass="java.lang.String" + valueClass="java.lang.String"> + <entry> + <key>user</key> + <value>jboss</value> + </entry> + <entry> + <key>pass</key> + <value>redhat</value> + </entry> + <entry> + <key>role</key> + <value>guest</value> + </entry> + </map> + </parameter> + </constructor> + </bean> - &lt;!-- the CallbackHandler does nothing as we don't have any user interaction --&gt; - &lt;bean name="ExampleCallbackHandler" class="org.hornetq.jms.example.ExampleCallbackHandler" - /&gt; - </code> +  + <bean name="ExampleCallbackHandler" class="org.hornetq.jms.example.ExampleCallbackHandler" + /> </pre> <ul> @@ -81,7 +81,7 @@ <ol start="4"> <li>We create a JMS Connection with user "jboss" and password "redhat". Any other combination of name and password won't be valid for the ExampleLoginModule</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection("jboss", "redhat");</code> </pre> </ol> Modified: trunk/examples/jms/jmx/readme.html =================================================================== --- trunk/examples/jms/jmx/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/jmx/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMX Management Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMX Management Example</h1> <br> <p>This example shows how to manage HornetQ using <a href="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/">JMX</a></p> @@ -12,7 +14,7 @@ <p>HornetQ exposes its managed resources by default on the platform MBeanServer.</p> <p>To access this MBeanServer remotely, the Java Virtual machine must be started with system properties: - <pre> + <pre class="prettyprint"> <code>-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=3000 -Dcom.sun.management.jmxremote.ssl=false @@ -27,42 +29,42 @@ <p><em>To run the example, simply type <code>ant</code> from this directory</em></p> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from <a href="server0/client-jndi.properties">client-jndi.properties</a></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext(0);</code> </pre> <li>We look up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We create a JMS text message that we are going to send.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a text message");</code> </pre> <li>We send message to the queue</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> @@ -70,22 +72,22 @@ (i.e. 1) and by removing the message which has been sent in step 8.</em></p> <li>We retrieve the <code>ObjectName</code> corresponding to the queue using a helper class <code>ObjectNames</code></li> - <pre> + <pre class="prettyprint"> <code>ObjectName on = ObjectNames.getJMSQueueObjectName(queue.getQueueName());</code> </pre> <li>We create a JMX Connector to connect to the server's MBeanServer using the <a href="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html#connecting">standard JMX service URL</a></li> - <pre> + <pre class="prettyprint"> <code>JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(JMX_URL), new HashMap());</code> </pre> <li>We retrieve a <code>MBeanServerConnection</code> from the JMX connector</li> - <pre> + <pre class="prettyprint"> <code>TextMessage messageReceived = (TextMessage) messageConsumer.receive(5000);</code> </pre> <li>We create a <a href="../../../docs/api/org/jboss/messaging/jms/server/management/JMSQueueControl.html">JMSQueueControl</a> proxy to manage the queue on the server</li> - <pre> + <pre class="prettyprint"> <code>JMSQueueControl queueControl = (JMSQueueControl)MBeanServerInvocationHandler.newProxyInstance(mbsc, on, JMSQueueControl.class, @@ -94,47 +96,47 @@ </pre> <li>We use this mbean proxy to retrieve the number of messages in the queue using the <code>getMessageCount</code> method</li> - <pre> + <pre class="prettyprint"> <code>System.out.println(queueControl.getName() + " contains " + queueControl.getMessageCount() + " messages");</code> </pre> <li>We will now remove the message sent at step 8 using the <code>removeMessage</code> method with the JMS Message ID of the message</li> - <pre> + <pre class="prettyprint"> <code>System.out.println("message has been removed: " + queueControl.removeMessage(message.getJMSMessageID()));</code> </pre> <li>We use again the mbean proxy to retrieve the number of messages. This time, it will display <code>0</code> messages</li> - <pre> + <pre class="prettyprint"> <code>System.out.println(queueControl.getName() + " contains " + queueControl.getMessageCount() + " messages");</code> </pre> <li>Now we have finish the management operations, we close the JMX connector</li> - <pre> + <pre class="prettyprint"> <code>connector.close()</code> </pre> <p><em>We will now try to consume the message sent to the queue but it won't be there: it has been removed by the management operation</em></p> <li>We create a JMS message consumer on the queue</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We try to receive a message from the queue. Since there is none, the call will timeout after 5000ms and messageReceived will be null </li> - <pre> + <pre class="prettyprint"> <code>TextMessage messageReceived = (TextMessage) messageConsumer.receive(5000); System.out.println("Received message: " + messageReceived);</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/large-message/readme.html =================================================================== --- trunk/examples/jms/large-message/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/large-message/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Large Message Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>Large Message Example</h1> <br> <p>This example shows you how to send and receive very large messages with HornetQ.</p> @@ -27,23 +29,23 @@ <br> <ol> <li>Create an initial context to perform the JNDI lookup.</li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext(0);</code> </pre> <li>Perfom a lookup on the queue.</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>Perform a lookup on the Connection Factory. This ConnectionFactory has a special attribute set on it. hornetq-jms.xml) Messages with more than 10K are considered large.</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");</code> </pre> <li>Create the JMS objects for sending the message.</li> - <pre> + <pre class="prettyprint"> <code> connection = cf.createConnection(); @@ -54,7 +56,7 @@ </pre> <li>Create a huge file - this will form the body of the message we will send.</li> - <pre> + <pre class="prettyprint"> <code> File fileInput = new File("huge_message_to_send.dat"); @@ -65,14 +67,14 @@ </pre> <li>Create a BytesMessage</li> - <pre> + <pre class="prettyprint"> <code>BytesMessage message = session.createBytesMessage();</code> </pre> <li>We set the InputStream on the message. When sending the message will read the InputStream until it gets EOF. In this case we point the InputStream at a file on disk, and it will suck up the entire file, however we could use any InputStream not just a FileInputStream.</li> - <pre><code> + <pre class="prettyprint"><code> FileInputStream fileInputStream = new FileInputStream(fileInput); BufferedInputStream bufferedInput = new BufferedInputStream(fileInputStream); @@ -81,13 +83,13 @@ </code></pre> <li>Send the Message.</li> - <pre><code> + <pre class="prettyprint"><code> producer.send(message); </code></pre> <li>We send message to the queue. After the send completion the message file will be located at ./build/data/largeMessages</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> @@ -97,7 +99,7 @@ normal persistent message, on the server. If you look at ./build/data/largeMessages you will see the largeMessage stored on disk the server. </li> - <pre> + <pre class="prettyprint"> <code> connection.close(); @@ -113,7 +115,7 @@ </pre> <li>Now the server is restarted we can recreate the JMS Objects, and start the new connection.</li> - <pre> + <pre class="prettyprint"> <code> initialContext = getContext(0); @@ -134,7 +136,7 @@ <li>Receive the message. When we receive the large message we initially just receive the message with an empty body.</li> - <pre><code>BytesMessage messageReceived = (BytesMessage)messageConsumer.receive(120000); + <pre class="prettyprint"><code>BytesMessage messageReceived = (BytesMessage)messageConsumer.receive(120000); </code></pre> <li>We set an OutputStream on the message. This causes the message body to be written to the @@ -142,7 +144,7 @@ You don't have to use a FileOutputStream, you can use any OutputStream. You may choose to use the regular BytesMessage or StreamMessage interface but this method is much faster for large messages.</li> - <pre><code> + <pre class="prettyprint"><code> File outputFile = new File("huge_message_received.dat"); FileOutputStream fileOutputStream = new FileOutputStream(outputFile); @@ -152,13 +154,13 @@ </code></pre> <li>This will save the stream and wait until the entire message is written before continuing.</li> - <pre><code> + <pre class="prettyprint"><code> messageReceived.setObjectProperty("JMS_HQ_SaveStream", bufferedOutput); </code></pre> <li>Be sure to close our resources!</li> - <pre> + <pre class="prettyprint"> <code> finally { Modified: trunk/examples/jms/last-value-queue/readme.html =================================================================== --- trunk/examples/jms/last-value-queue/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/last-value-queue/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Last-Value Queue Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>Last Value Queue Example</h1> <p>This example shows you how to define and deal with last-value queues.</p> @@ -17,7 +19,7 @@ <h2>Example setup</h2> <p>Last-Value queues are defined in the configuration file <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a>:</p> - <pre> + <pre class="prettyprint"> <code><address-setting match="jms.queue.lastValueQueue"> <last-value-queue>true</last-value-queue> </address-setting></code> @@ -27,29 +29,29 @@ <p><i>To run the example, simply type <code>ant</code> from this directory</i></p> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <a href="server0/client-jndi.properties">client-jndi.properties</a></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/lastValueQueue");</code> </pre> <li>We look up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection, a session and a producer for the queue</li> - <pre> + <pre class="prettyprint"> <code> connection = cf.createConnection(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = session.createProducer(queue);</code> </pre> <li>We will create and send a text message with the Last-Value property set to <code>STOCK_NAME</code></li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("1st message with Last-Value property set"); message.setStringProperty("_HQ_LVQ_NAME", "STOCK_NAME"); producer.send(message); @@ -59,7 +61,7 @@ <p><em>The <em>Last-Value</em> key is defined in HornetQ's MessageImpl class. Its value is <code>"_HQ_LVQ_NAME"</code></em></p> <li>We will create and send a <em>second</em> text message with the Last-Value property set to <code>STOCK_NAME</code></li> - <pre> + <pre class="prettyprint"> <code>message = session.createTextMessage("2nd message with Last-Value property set"); message.setStringProperty("_HQ_LVQ_NAME", "STOCK_NAME"); producer.send(message); @@ -67,7 +69,7 @@ </pre> <li>We will create and send a <em>third</em> text message with the Last-Value property set to <code>STOCK_NAME</code></li> - <pre> + <pre class="prettyprint"> <code>message = session.createTextMessage("3rd message with Last-Value property set"); message.setStringProperty("_HQ_LVQ_NAME", "STOCK_NAME"); producer.send(message); @@ -79,7 +81,7 @@ Only the 3<sup>rd</sup> message remains in the queue.</em></p> <li>We will browse the queue. There will be a single message displayed: the 3<sup>rd</sup> message</li> - <pre> + <pre class="prettyprint"> <code>QueueBrowser browser = session.createBrowser(queue); Enumeration enumeration = browser.getEnumeration(); while (enumeration.hasMoreElements()) @@ -94,29 +96,29 @@ <p><em>We will now consume the message on the queue</em></p> <li>We create a JMS message consumer on the queue</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We try to receive a message from the queue. It will be the 3<sup>rd</sup> message</li> - <pre> + <pre class="prettyprint"> <code> TextMessage messageReceived = (TextMessage)messageConsumer.receive(5000); System.out.format("Received message: %s\n", messageReceived.getText());</code> </pre> <li>We will try to receive another message but there is no other on the queue. The <code>receive</code> method will timeout after 5 seconds</li> - <pre> + <pre class="prettyprint"> <code> messageReceived = (TextMessage)messageConsumer.receive(5000); System.out.format("Received message: %s\n", messageReceived);</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/management/readme.html =================================================================== --- trunk/examples/jms/management/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/management/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Management Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1> Management Example</h1> <p>This example shows how to manage HornetQ using JMS Messages to invoke management operations on the server.</a></p> <p>To manage HornetQ using JMX, see the <a href="../jmx/readme.html">JMX</a> example.</p> @@ -12,13 +14,13 @@ <p>HornetQ can be managed by sending JMS messages with specific properties to its <em>management</em> queue.</p> </p>By default, the management name is called <code>hornetq.management</code> but this can be configured in <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a> - <pre> + <pre class="prettyprint"> <code><management-address>hornetq.management</management-address></code> </pre> <p>The management queue requires a "special" user permission <code>manage</code> to be able to receive management messages. This is also configured in <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a></p> - <pre> + <pre class="prettyprint"> <code><security-setting match="hornetq.management"> <permission type="manage" roles="guest" /> </security-setting></code> @@ -28,42 +30,42 @@ <p><em>To run the example, simply type <code>ant</code> from this directory</em></p> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from <a href="server0/client-jndi.properties">client-jndi.properties</a></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext(0);</code> </pre> <li>We look up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We create a JMS text message that we are going to send.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a text message");</code> </pre> <li>We send message to the queue</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> @@ -71,26 +73,22 @@ (i.e. 1) and by removing the message which has been sent in step 8.</em></p> <li>We create the JMS management queue. This is a <em>special</em> queue which is not looked up from JNDI but instantiated directly</li> - <pre> -<<<<<<< .mine + <pre class="prettyprint"> <code>Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management");</code> -======= - <code>Queue managementQueue = new JBossQueue("hornetq.management", "hornetq.management");</code> ->>>>>>> .r7829 </pre> <li>We create a <code>QueueRequestor</code> to send messages to the management queue and receive replies (see <a href="../queue-requestor/readme.html">queue-requestor example</a>)</li> - <pre> + <pre class="prettyprint"> <code>QueueRequestor requestor = new QueueRequestor(session, managementQueue);</code> </pre> <li>We start the connection to receive replies on the requestor</li> - <pre> + <pre class="prettyprint"> <code>connection.start()</code> </pre> <li>We create a JMS message which will be used as a <em>management</em> message</li> - <pre> + <pre class="prettyprint"> <code>Message m = session.createMessage();</code> </pre> @@ -102,23 +100,23 @@ <li>In our case, the name of the attribute to retrieve <code>MessageCount</code></li> </ul> </li> - <pre> + <pre class="prettyprint"> <code>JMSManagementHelper.putAttribute(m, "jms.queue.exampleQueue", "MessageCount");</code> </pre> <li>We send the <em>management</em> message using the requestor and wait for a reply</li> - <pre> + <pre class="prettyprint"> <code>Message reply = requestor.request(m);</code> </pre> <li>We use a helper class <a href="../../../docs/api/org/jboss/messaging/jms/server/management/impl/JMSManagementHelper.html">JMSManagementHelper</a> to retrieve the result from the reply message: - <pre> + <pre class="prettyprint"> <code>int messageCount = (Integer)JMSManagementHelper.getResult(reply); System.out.println(queue.getQueueName() + " contains " + messageCount + " messages");</code> </pre> <li>We create another JMS message to use as a management message</li> - <pre> + <pre class="prettyprint"> <code>m = session.createMessage();</code> </pre> @@ -129,24 +127,24 @@ <li>any parameters required to invoke the management operations (in our case, the JMS Message ID of the message sent in step 8)</li> </ul> </li> - <pre> + <pre class="prettyprint"> <code>JMSManagementHelper.putOperationInvocation(m, "jms.queue.exampleQueue", "removeMessage", message.getJMSMessageID());</code> </pre> <li>Again, we use the requestor to send the management message and wait for a reply</li> - <pre> + <pre class="prettyprint"> <code>reply = requestor.request(m);</code> </pre> <li>We use the helper class to check that the operation was successfully invoked on the server</li> - <pre> + <pre class="prettyprint"> <code>boolean success = JMSManagementHelper.hasOperationSucceeded(reply); System.out.println("operation invocation has succeeded: " + success);</code> </pre> <li>We use a helper class <a href="../../../docs/api/org/jboss/messaging/jms/server/management/impl/JMSManagementHelper.html">JMSManagementHelper</a> to retrieve the result from the reply message: (in our case, the <code>removeMessage</code> method returns a boolean)</li> - <pre> + <pre class="prettyprint"> <code>boolean messageRemoved = (Boolean)JMSManagementHelper.getResult(reply); System.out.println("message has been removed: " + messageRemoved);</code> </pre> @@ -154,20 +152,20 @@ <p><em>We will now consume the message from the queue but there will be none: the message sent at step 8 was removed by the management operation</em></p> <li>We create a JMS message consumer on the queue</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code> </pre> <li>We try to receive a message from the queue. Since there is none, the call will timeout after 5000ms and messageReceived will be null </li> - <pre> + <pre class="prettyprint"> <code>TextMessage messageReceived = (TextMessage) messageConsumer.receive(5000); System.out.println("Received message: " + messageReceived);</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/management-notifications/readme.html =================================================================== --- trunk/examples/jms/management-notifications/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/management-notifications/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Management Notification Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>Management Notification Example</h1> <p>This example shows how to receive management notifications from HornetQ using JMS Messages.</p> <p>HornetQ servers emit management notifications when events of interest occur (consumers are created or closed, @@ -18,12 +20,12 @@ <p>HornetQ can configured to send JMS messages when management notifications are emitted on the server.</p> <p>By default, the management name is called <code>hornetq.notifications</code> but this can be configured in <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a>. For this example, we will set it to <code>example.notifications</code>.</p> - <pre> + <pre class="prettyprint"> <code><management-notification-address>example.notifications</management-notification-address></code> </pre> <p>We will also create a queue corresponding to the example's address to hold notifications</p> - <pre> + <pre class="prettyprint"> <code><queues> <queue name="jms.queue.notificationsQueue"> <address>example.notifications</address> @@ -32,14 +34,14 @@ </pre> <p>Since we want to lookup the notifications queue using JNDI, we also declare it in <a href="server0/hornetq-jms.xml">hornetq-jms.xml</a> - <pre> + <pre class="prettyprint"> <code><queue name="notificationsQueue"> <entry name="/queue/notificationsQueue"/> </queue></code> </pre> <p>The notification queue requires permission to create/delete temporary queues and consume messages. This is also configured in <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a></p> - <pre> + <pre class="prettyprint"> <code> <security-setting match="example.notifications"> <permission type="consume" roles="guest"/> @@ -52,34 +54,34 @@ <p><em>To run the example, simply type <code>ant</code> from this directory</em></p> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from <a href="server0/client-jndi.properties">client-jndi.properties</a></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext(0);</code> </pre> <li>We look up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection, a session and a message producer for the example queue</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = session.createProducer(queue);</code> </pre> <li>We look up the JMS queue used to receive the notifications from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue notificationsQueue = (Queue) initialContext.lookup("/queue/notificationsQueue");</code> </pre> <li>We create a MessageConsumer for the notification queue and set its MessageListener. When a notification is received, we will simply display all the message properties</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer notificationConsumer = session.createConsumer(notificationsTopic); notificationConsumer.setMessageListener(new MessageListener() { @@ -105,7 +107,7 @@ </pre> <li>We start the connection to receive messages</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> @@ -113,12 +115,12 @@ see what kind of notifications are triggered</em></p> <li>We create a JMS message consumer on the example queue</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer consumer = session.createConsumer(queue);</code> </pre> <p>This will generate a <code>CONSUMER_CREATED</code> notification: - <pre> + <pre class="prettyprint"> <code>------------------------ Received notification: _HQ_RoutingName: jms.queue.exampleQueue @@ -133,12 +135,12 @@ was emitted, this consumer was the only one for the queue</p> <li>We close this consumer</li> - <pre> + <pre class="prettyprint"> <code>consumer.close();</code> </pre> <p>This will generate a <code>CONSUMER_CLOSED</code> notification: - <pre> + <pre class="prettyprint"> <code>------------------------ Received notification: _HQ_RoutingName: jms.queue.exampleQueue @@ -153,7 +155,7 @@ was emitted, there were no other consumers on the queue</p> <li>As a last example, we will create a connection with invalid user credentials</li> - <pre> + <pre class="prettyprint"> <code>try { cf.createConnection("not.a.valid.user", "not.a.valid.password"); @@ -163,7 +165,7 @@ </pre> <p>This will generate a <code>SECURITY_AUTHENTICATION_VIOLATION</code> notification: - <pre> + <pre class="prettyprint"> <code>------------------------ Received notification: _HQ_User: not.a.valid.user @@ -176,7 +178,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/message-counters/readme.html =================================================================== --- trunk/examples/jms/message-counters/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/message-counters/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Message Counter Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Message Counter Example</h1> <p>This example shows you how to use message counters to obtain message information for a JMS queue.</p> @@ -13,7 +15,7 @@ </p> <h2>Example setup</h2> <p>Message counter is configured in the server configuration file <a href="server0/hornetq-configuration.xml">hornetq-configuration.xml</a>:</p> - <pre> + <pre class="prettyprint"> <code><message-counter-enabled>true</message-counter-enabled> <message-counter-sample-period>2000</message-counter-sample-period> <message-counter-max-day-history>2</message-counter-max-day-history></code> @@ -29,29 +31,29 @@ <p><i>To run the example, simply type <code>ant</code> from this directory</i></p> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection, session and producer for the queue</li> - <pre> + <pre class="prettyprint"> <code> connection = cf.createQueueConnection(); QueueSession session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = session.createProducer(queue);</code> </pre> <li>We create and send a JMS text message</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a text message"); producer.send(message); System.out.println("Sent message: " + message.getText());</code> @@ -59,7 +61,7 @@ <li>We will now sleep a little bit to be sure the queue is sample. Since we have configure the sample period to be 2 seconds, we will sleep for 3 seconds to be sure that a sample is taken</li> - <pre> + <pre class="prettyprint"> <code>System.out.println("Sleep a little bit to have the queue sampled..."); Thread.sleep(3000);</code> </pre> @@ -69,7 +71,7 @@ learn about managing HornetQ using JMS messages).</p> <li>We retrieve the JMX MBean used to manage the JMS queue</li> - <pre> + <pre class="prettyprint"> <code>ObjectName on = ObjectNames.getJMSQueueObjectName(queue.getQueueName()); JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(JMX_URL), new HashMap()); MBeanServerConnection mbsc = connector.getMBeanServerConnection(); @@ -81,19 +83,19 @@ <li>We retrieve the message counter and display them. MessageCounters are retrieved as <code>JSON Strings</code> for portability reason (wether JMX is used for management or JMS messages). To make it simpler to use them in the code, there is a <code>MessageCounterInfo</code> data structure.</li> - <pre> + <pre class="prettyprint"> <code>String counters = queueControl.listMessageCounter(); MessageCounterInfo messageCounter = MessageCounterInfo.fromJSON(counters);</code>> </pre> <li>We display the message counters</li> - <pre> + <pre class="prettyprint"> <code>displayMessageCounter(messageCounter);</code> </pre> <p>The message counter contains a variety of metrics on the queue which is sampled (total messages added to the queue, current depth of the queue, deltas since the last sample, timestamp of the last message added, timestamp of the last sample, etc.)</p> - <pre> + <pre class="prettyprint"> <code>private void displayMessageCounter(MessageCounterInfo counter) { System.out.format("%s (sample updated at %s)\n", counter.getName(), counter.getUdpateTimestamp()); @@ -106,13 +108,13 @@ </pre> <li>We sleep again to have the queue sampled</li> - <pre> + <pre class="prettyprint"> <code>System.out.println("Sleep a little bit again..."); Thread.sleep(3000);</code> </pre> <li>We list the message counters again</li> - <pre> + <pre class="prettyprint"> <code>counters = queueControl.listMessageCounter(); messageCounter = MessageCounterInfo.fromJSON(counters); displayMessageCounter(messageCounter);</code> @@ -121,29 +123,29 @@ <p>We will now consume a message from the queue before listing a last time the message counters</p> <li>We create a consumer for the queue</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer consumer = session.createConsumer(queue);</code> </pre> <li>We start the connection to receive messages on the consumer</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We receive a message from the queue</li> - <pre> + <pre class="prettyprint"> <code>TextMessage messageReceived = (TextMessage)consumer.receive(5000); System.out.format("Received message: %s\n\n", messageReceived.getText());</code> </pre> <li>We sleep one last time to have the queue sampled</li> - <pre> + <pre class="prettyprint"> <code>System.out.println("Sleep a little bit one last time..."); Thread.sleep(3000);</code> </pre> <li>We list the message counters a final time (this time with no message in the queue)</li> - <pre> + <pre class="prettyprint"> <code>counters = queueControl.listMessageCounter(); messageCounter = MessageCounterInfo.fromJSON(counters); displayMessageCounter(messageCounter);</code> @@ -152,7 +154,7 @@ </p> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/message-group/readme.html =================================================================== --- trunk/examples/jms/message-group/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/message-group/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Message Group Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>Message Group Example</h1> <br> <p>This example shows you how to configure and use message groups with HornetQ.</p> @@ -29,37 +31,37 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We create two consumers.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer consumer1 = session.createConsumer(queue); consumer1.setMessageListener(new SimpleMessageListener("consumer-1")); @@ -69,7 +71,7 @@ </pre> <li>We create and send 10 text messages with group id 'Group-0'</li> - <pre> + <pre class="prettyprint"> <code> int msgCount = 10; TextMessage[] groupMessages = new TextMessage[msgCount]; @@ -85,12 +87,12 @@ </pre> <li>We start the connection.</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We check the group messages are received by only one consumer</li> - <pre> + <pre class="prettyprint"> <code> String trueReceiver = messageReceiverMap.get(groupMessages[0].getText()); for (TextMessage grpMsg : groupMessages) @@ -107,7 +109,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/message-priority/readme.html =================================================================== --- trunk/examples/jms/message-priority/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/message-priority/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Message Priority Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Message Priority Example</h1> <br> <p>This example shows how messages with priorities are delivered.</p> @@ -28,37 +30,37 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We Create a JMS Message Consumer.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer redConsumer = session.createConsumer(queue); redConsumer.setMessageListener(new SimpleMessageListener()); @@ -66,7 +68,7 @@ </pre> <li>We Create three messages.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage[] sentMessages = new TextMessage[3]; sentMessages[0] = session.createTextMessage("first message"); @@ -76,7 +78,7 @@ </pre> <li>Send the Messages, each has a different priority.</li> - <pre> + <pre class="prettyprint"> <code> producer.send(sentMessages[0]); System.out.println("Message sent: " + sentMessages[0].getText() + " with priority: " + sentMessages[0].getJMSPriority()); @@ -88,21 +90,21 @@ </pre> <li>We start the connection now.</li> - <pre> + <pre class="prettyprint"> <code> connection.start(); </code> </pre> <li>We wait for message delivery completion</li> - <pre> + <pre class="prettyprint"> <code> Thread.sleep(5000); </code> </pre> <li>We wait for message delivery completion</li> - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < 3; i++) { @@ -118,7 +120,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/no-consumer-buffering/readme.html =================================================================== --- trunk/examples/jms/no-consumer-buffering/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/no-consumer-buffering/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ No Consumer Buffering Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>HornetQ <br>No Consumer Buffering Example</h1> <br><br> <p>By default, HornetQ consumers buffer messages from the server in a client side buffer @@ -27,7 +29,7 @@ <h2>Example step-by-step</h2> <p>In this example we specify a <code>consumer-window-size</code> of <code>0</code> bytes in the <code>hornetq-jms.xml</code> file when deploying the connection factory:</p> - <pre> + <pre class="prettyprint"> <code> <connection-factory name="ConnectionFactory"> <connector-ref connector-name="netty-connector"/> @@ -53,43 +55,43 @@ <br> <ol> <li>Create an initial context to perform the JNDI lookup.</li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext(0);</code> </pre> <li>Perfom a lookup on the queue</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>Perform a lookup on the Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");</code> </pre> <li>Create a JMS Connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>Create a JMS Session</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>Create a JMS MessageProducer</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(queue);</code> </pre> <li>Create a JMS MessageConsumer</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer consumer1 = session.createConsumer(queue);</code> </pre> <li>Start the connection</li> - <pre> + <pre class="prettyprint"> <code> connection.start(); </code> @@ -97,7 +99,7 @@ <li>Send 10 messages to the queue</li> - <pre> + <pre class="prettyprint"> <code> final int numMessages = 10; @@ -111,13 +113,13 @@ </pre> <li>Create another JMS MessageConsumer on the same queue.</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer consumer2 = session.createConsumer(queue);</code> </pre> <li>Consume three messages from consumer2</li> - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < 3; i++) { @@ -130,7 +132,7 @@ <li>Consume five messages from consumer1</li> - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < 5; i++) { @@ -143,7 +145,7 @@ <li>Consume two more messages from consumer2</li> - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < 2; i++) { @@ -157,7 +159,7 @@ <li>Be sure to close our resources!</li> - <pre> + <pre class="prettyprint"> <code> finally { Modified: trunk/examples/jms/paging/readme.html =================================================================== --- trunk/examples/jms/paging/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/paging/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Paging Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"/> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>Paging Example</h1> <br> <p>This example shows how HornetQ would avoid running out of resources by paging messages.</p> @@ -18,55 +20,55 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We look-up the JMS queue object from JNDI. pagingQueue is configured to hold a very limited number of bytes in memory</li> - <pre> + <pre class="prettyprint"> <code>Queue pageQueue = (Queue) initialContext.lookup("/queue/pagingQueue");</code> </pre> <li>We look-up the JMS queue object from JNDI.</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted. We will use client acknowledgement on this example.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);</code> </pre> <li>Create a JMS Message Producer for pageQueueAddress</li> - <pre><code> + <pre class="prettyprint"><code> MessageProducer pageMessageProducer = session.createProducer(pageQueue); </pre></code> <li>We don't need persistent messages in order to use paging. (This step is optional)</li> - <pre><code> + <pre class="prettyprint"><code> pageMessageProducer.setDeliveryMode(DeliveryMode.NON_PERSISTENT); </pre></code> <li>Create a Binary Bytes Message with 10K arbitrary bytes</li> - <pre><code> + <pre class="prettyprint"><code> BytesMessage message = session.createBytesMessage(); message.writeBytes(new byte[10 * 1024]); </pre></code> <li>Send only 20 messages to the Queue. This will be already enough for pagingQueue. Look at ./paging/config/hornetq-queues.xml for the config.</li> - <pre><code> + <pre class="prettyprint"><code> for (int i = 0; i < 20; i++) { pageMessageProducer.send(message); @@ -74,17 +76,17 @@ </pre></code> <li>Create a JMS Message Producer</li> - <pre><code> + <pre class="prettyprint"><code> MessageProducer messageProducer = session.createProducer(queue); </pre></code> <li>We don't need persistent messages in order to use paging. (This step is optional)</li> - <pre><code> + <pre class="prettyprint"><code> messageProducer.setDeliveryMode(DeliveryMode.NON_PERSISTENT); </pre></code> <li>Send the message for about 30K, which should be over the memory limit imposed by the server</li> - <pre><code> + <pre class="prettyprint"><code> for (int i = 0; i < 30000; i++) { messageProducer.send(message); @@ -93,26 +95,26 @@ <li>if you pause the example here, you will several files under ./build/data/paging</li> - <pre><code> + <pre class="prettyprint"><code> // Thread.sleep(30000); // if you want to just our of curiosity, you can sleep here and inspect the created files just for </pre></code> <li>Create a JMS Message Consumer</li> - <pre><code> + <pre class="prettyprint"><code> MessageConsumer messageConsumer = session.createConsumer(queue); </pre></code> <li>Start the JMS Connection. This step will activate the subscribers to receive messages.</li> - <pre><code> + <pre class="prettyprint"><code> connection.start(); </pre></code> <li>Receive the messages. It's important to ACK for messages as HornetQ will not read messages from paging until messages are ACKed</li> - <pre><code> + <pre class="prettyprint"><code> for (int i = 0; i < 30000; i++) { message = (BytesMessage)messageConsumer.receive(1000); @@ -127,7 +129,7 @@ </pre></code> <li>Receive the messages from the Queue names pageQueue. Create the proper consumer for that.</li> - <pre><code> + <pre class="prettyprint"><code> messageConsumer.close(); messageConsumer = session.createConsumer(pageQueue); @@ -143,7 +145,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/pre-acknowledge/readme.html =================================================================== --- trunk/examples/jms/pre-acknowledge/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/pre-acknowledge/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Pre-Acknowledge Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>HornetQ JMS Pre-Acknowledge Example</h1> <br> <p>Standard JMS supports three acknowledgement modes: AUTO_ACKNOWLEDGE, CLIENT_ACKNOWLEDGE, and @@ -29,14 +31,14 @@ <br> <ol> <li>Create an initial context to perform the JNDI lookup.</li> - <pre> + <pre class="prettyprint"> <code> initialContext = getContext(0); </code> </pre> <li>Perform the look-ups</li> - <pre> + <pre class="prettyprint"> <code> Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); @@ -45,7 +47,7 @@ </pre> <li>Create a the JMS objects.</li> - <pre> + <pre class="prettyprint"> <code> connection = cf.createConnection(); @@ -58,7 +60,7 @@ </pre> <li>Create and send a message.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage message1 = session.createTextMessage("This is a text message 1"); @@ -70,7 +72,7 @@ <li>Print out the message count of the queue. The queue contains one message as expected delivery has not yet started on the queue.</li> - <pre> + <pre class="prettyprint"> <code> int count = getMessageCount(connection); @@ -79,7 +81,7 @@ </pre> <li>Start the Connection, delivery will now start. Give a little time for delivery to occur.</li> - <pre> + <pre class="prettyprint"> <code> connection.start(); @@ -89,7 +91,7 @@ <li>Print out the message count of the queue. It should now be zero, since the message has already been acknowledged even before the consumer has received it.</li> - <pre> + <pre class="prettyprint"> <code> count = getMessageCount(connection); @@ -98,7 +100,7 @@ </pre> <li>Finally, receive the message.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage messageReceived = (TextMessage)messageConsumer.receive(5000); @@ -107,7 +109,7 @@ </pre> <li>Be sure to close our resources!</li> - <pre> + <pre class="prettyprint"> <code> if (initialContext != null) { Modified: trunk/examples/jms/producer-rate-limit/readme.html =================================================================== --- trunk/examples/jms/producer-rate-limit/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/producer-rate-limit/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Message Producer Rate Limiting</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>HornetQ JMS Message Producer Rate Limiting</h1> <br> <p>With HornetQ you can specify a maximum send rate at which a JMS MessageProducer will send messages. @@ -13,7 +15,7 @@ <h2>Example step-by-step</h2> <p>In this example we specify a <code>producer-max-rate</code> of <code>50</code> messages per second in the <code>hornetq-jms.xml</code> file when deploying the connection factory:</p> - <pre> + <pre class="prettyprint"> <code> <connection-factory name="ConnectionFactory"> <connector-ref connector-name="netty-connector"/> @@ -35,37 +37,37 @@ <br> <ol> <li>Create an initial context to perform the JNDI lookup.</li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext(0);</code> </pre> <li>Perfom a lookup on the queue</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>Perform a lookup on the Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");</code> </pre> <li>Create a JMS Connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>Create a JMS Session</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>Create a JMS Message Producer</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(queue);</code> </pre> <li>Send as many messages as we can in 10 seconds</li> - <pre> + <pre class="prettyprint"> <code> final long duration = 10000; @@ -93,7 +95,7 @@ <li>We note that the sending rate doesn't exceed 50 messages per second. Here's some example output from a real run</li> - <pre> + <pre class="prettyprint"> <code> [java] Will now send as many messages as we can in 10 seconds... [java] We sent 500 messages in 10072 milliseconds @@ -103,7 +105,7 @@ <li>For good measure we consumer the messages we produced.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer messageConsumer = session.createConsumer(queue); @@ -131,7 +133,7 @@ <li>Be sure to close our resources!</li> - <pre> + <pre class="prettyprint"> <code> finally { Modified: trunk/examples/jms/queue/readme.html =================================================================== --- trunk/examples/jms/queue/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/queue/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Queue Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Queue Example</h1> <br> <p>This example shows you how to send and receive a message to a JMS Queue with HornetQ.</p> @@ -15,63 +17,63 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We create a JMS text message that we are going to send.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a text message");</code> </pre> <li>We send message to the queue</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> <li>We create a JMS Message Consumer to receive the message.</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>The message arrives at the consumer. In this case we use a timeout of 5000 milliseconds but we could use a blocking 'receive()'</li> - <pre> + <pre class="prettyprint"> <code>TextMessage messageReceived = (TextMessage) messageConsumer.receive(5000);</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/queue-message-redistribution/readme.html =================================================================== --- trunk/examples/jms/queue-message-redistribution/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/queue-message-redistribution/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Message Redistribution Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>HornetQ Message Redistribution Example</h1> <br> <p>This example demonstrates message redistribution between queues with the same name deployed in different @@ -24,7 +26,7 @@ <p>Here's the relevant snippet from the <code>hornetq-queues.xml</code> configuration, which tells the server to use a redistribution delay of <code>0</code> on any jms queues, i.e. any queues whose name starts with <code>jms.</code></p> - <pre> + <pre class="prettyprint"> <code> <address-setting match="jms.#"> <redistribution-delay>0</redistribution-delay> @@ -38,63 +40,63 @@ <br> <ol> <li>Get an initial context for looking up JNDI from server 0</li> - <pre> + <pre class="prettyprint"> <code> ic0 = getContext(0); </code> </pre> <li>Look-up the JMS Queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue)ic0.lookup("/queue/exampleQueue");</code> </pre> <li>Look-up a JMS Connection Factory object from JNDI on server 0</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("/ConnectionFactory");</code> </pre> <li>Get an initial context for looking up JNDI from server 1.</li> - <pre> + <pre class="prettyprint"> <code>ic1 = getContext(1);</code> </pre> <li>Look-up a JMS Connection Factory object from JNDI on server 1</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("/ConnectionFactory"); </code> </pre> <li>We create a JMS Connection connection0 which is a connection to server 0</li> - <pre> + <pre class="prettyprint"> <code> connection0 = cf0.createConnection(); </code> </pre> <li>We create a JMS Connection connection1 which is a connection to server 1</li> - <pre> + <pre class="prettyprint"> <code> connection1 = cf1.createConnection(); </code> </pre> <li>We create a JMS Session on server 0, note the session is CLIENT_ACKNOWLEDGE</li> - <pre> + <pre class="prettyprint"> <code> Session session0 = connection0.createSession(false, Session.AUTO_ACKNOWLEDGE); </code> </pre> <li>We create a JMS Session on server 1, note the session is CLIENT_ACKNOWLEDGE</li> - <pre> + <pre class="prettyprint"> <code> Session session1 = connection1.createSession(false, Session.AUTO_ACKNOWLEDGE); </code> </pre> <li>We start the connections to ensure delivery occurs on them</li> - <pre> + <pre class="prettyprint"> <code> connection0.start(); @@ -103,7 +105,7 @@ </pre> <li>We create JMS MessageConsumer objects on server 0 and server 1</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer consumer0 = session0.createConsumer(queue); @@ -112,13 +114,13 @@ </pre> <li>We create a JMS MessageProducer object on server 0.</li> - <pre> + <pre class="prettyprint"> <code> MessageProducer producer = session0.createProducer(queue);</code> </pre> <li>We send some messages to server 0.</li> - <pre> + <pre class="prettyprint"> <code> final int numMessages = 10; @@ -140,7 +142,7 @@ to nodes which have consumers with no or matching selectors. See the user manual for more details.</li> JMS Queues implement point-to-point message where each message is only ever consumed by a maximum of one consumer. - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < numMessages; i += 2) { @@ -158,7 +160,7 @@ <li>We acknowledge the messages consumed on node 0. The sessions are CLIENT_ACKNOWLEDGE so messages will not get acknowledged until they are explicitly acknowledged. Note that we <b>do not</b> acknowledge the message consumed on node 1 yet.</li> - <pre> + <pre class="prettyprint"> <code> message0.acknowledge(); </code> @@ -166,14 +168,14 @@ <li>We now close the session and consumer on node 1. (Closing the session automatically closes the consumer) </li> - <pre> + <pre class="prettyprint"> <code>session1.close();</code> </pre> <li>Since there is no more consumer on node 1, the messages on node 1 are now stranded (no local consumers) so HornetQ will redistribute them to node 0 so they can be consumed. We consume them from node 0.</li> - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < numMessages; i += 2) { @@ -185,14 +187,14 @@ </pre> <li>We ack the redistributed messages.</li> - <pre> + <pre class="prettyprint"> <code>message0.acknowledge();</code> </pre> <li>And finally (no pun intended), <b>always</b> remember to close your resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code> finally { Modified: trunk/examples/jms/queue-requestor/readme.html =================================================================== --- trunk/examples/jms/queue-requestor/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/queue-requestor/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS QueueRequestor Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS QueueRequestor Example</h1> <br> <p>This example shows you how to use a <a href="http://java.sun.com/javaee/5/docs/api/javax/jms/QueueRequestor.html">QueueRequestor</a> with HornetQ.</p> @@ -25,47 +27,47 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look up the JMS queue from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look up JMS queue connection factory from JNDI</li> - <pre> + <pre class="prettyprint"> <code>QueueConnectionFactory cf = (QueueConnectionFactory)initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create the TextReverserService which will consume messages from the queue</li> - <pre> + <pre class="prettyprint"> <code> TextReverserService reverserService = new TextReverserService(cf, queue);</code> </pre> <li>We Create a JMS queue connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createQueueConnection();</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS queue session. The session is created as non transacted and will auto acknowledge messages (this is mandatory to use it to create a QueueRequestor)</li> - <pre> + <pre class="prettyprint"> <code>QueueSession session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS QueueRequestor using the session and the queue</li> - <pre> + <pre class="prettyprint"> <code>QueueRequestor queueRequestor = new QueueRequestor(session, queue);</code> </pre> <li>We create a JMS text message to send as a request</li> - <pre> + <pre class="prettyprint"> <code>TextMessage request = session.createTextMessage("Hello, World!");</code> </pre> @@ -75,29 +77,29 @@ sending the request with the producer, consuming the message from the consumer). All this code is replaced by a single call to <code>QueueRequestor.request()</code> method.</p> </li> - <pre> + <pre class="prettyprint"> <code>TextMessage reply = (TextMessage)queueRequestor.request(request);</code> </pre> <li>The reply's text contains the reverse of the request's text</li> - <pre> + <pre class="prettyprint"> <code>System.out.println("Send request: " + request.getText()); System.out.println("Received reply:" + reply.getText());</code> </pre> <li>We close the queue requestor to release all the JMS resources it created to provide request/reply mechanism</li> - <pre> + <pre class="prettyprint"> <code>queueRequestor.close()</code> </pre> <li>We do the same for the text reverser service</li> - <pre> + <pre class="prettyprint"> <code>reverserService.close()</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/queue-selector/readme.html =================================================================== --- trunk/examples/jms/queue-selector/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/queue-selector/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Queue Selector Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Queue Selector Example</h1> <br> <p>This example shows you how to selectively consume messages using message selectors with queue consumers.</p> @@ -32,42 +34,42 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(queue);</code> </pre> <li>We create two selectors.</li> - <pre> + <pre class="prettyprint"> <code> String redSelector = "color='red'"; String greenSelector = "color='green'"; @@ -75,7 +77,7 @@ </pre> <li>We Create a JMS Message Consumer that receives 'red' messages.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer redConsumer = session.createConsumer(queue, redSelector); redConsumer.setMessageListener(new SimpleMessageListener("red")); @@ -83,7 +85,7 @@ </pre> <li>We Create a second JMS Message Consumer that receives 'green' messages.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer greenConsumer = session.createConsumer(queue, greenSelector); greenConsumer.setMessageListener(new SimpleMessageListener("green")); @@ -93,7 +95,7 @@ <li>We Create another JMS Message Consumer that receives all messages. Please not that the order of consumers on a queue is of significance. If the anyConsumer is created before the above two, the result will be totally different.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer anyConsumer = session.createConsumer(queue); anyConsumer.setMessageListener(new SimpleMessageListener("any")); @@ -101,7 +103,7 @@ </pre> <li>We Create three messages, each has a different color property.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage redMessage = session.createTextMessage("Red"); redMessage.setStringProperty("color", "red"); @@ -113,7 +115,7 @@ </pre> <li>We send the messages to the topic</li> - <pre> + <pre class="prettyprint"> <code> producer.send(redMessage); System.out.println("Message sent: " + redMessage.getText()); @@ -126,7 +128,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/reconnect-same-node/readme.html =================================================================== --- trunk/examples/jms/reconnect-same-node/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/reconnect-same-node/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Automatic Reconnect Same Server Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>HornetQ JMS Reconnect Same Server Example</h1> <br> <p>This example demonstrates how HornetQ connections can be configured to be resilient to @@ -37,65 +39,65 @@ <br> <ol> <li>Create an initial context to perform the JNDI lookup.</li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext(0);</code> </pre> <li>Perform a lookup on the queue</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>Perform a lookup on the Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. </li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We create a JMS text message that we are going to send.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a text message");</code> </pre> <li>We send message to the queue</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> <li>We create a JMS Message Consumer to receive the message.</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>To simulate a temporary problem on the network, we stop the remoting acceptor on the server which will casue all client connections to fail.</li> - <pre> + <pre class="prettyprint"> <code>stopAcceptor(initialContext);</code> </pre> <li>We wait 10 seconds, before restarting the acceptor. During this period the client will be retrying to connect. When the acceptor is restarted it will be successful in reconnecting.</li> - <pre> + <pre class="prettyprint"> <code> Thread.sleep(10000); @@ -105,7 +107,7 @@ <li>We receive the message after reconnection! Note that no exceptions were received by the client.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage messageReceived = (TextMessage)messageConsumer.receive(5000); </code> @@ -113,7 +115,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/request-reply/readme.html =================================================================== --- trunk/examples/jms/request-reply/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/request-reply/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Request-Reply Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Request-Reply Example</h1> <br> <p>This example shows you how to handle a request message and receive a reply. To get a reply message, the requesting client creates a temporary queue. Then it sends out the request message with JMSReplyTo set to the temporary queue. The request message is handled by a SimpleRequestServer, who is listening to the request queue for incoming requests. If a request message has arrived, it extracts the reply queue from the request message by JMSReplyTo header, and sends back a reply message. To let the client know to which request message a reply message is related, the server also set the JMSCorrelationID with the request message's JMSMessageID header to the reply message.</p> @@ -17,104 +19,104 @@ <ol> <li>We start the request server</li> - <pre> + <pre class="prettyprint"> <code>SimpleRequestServer server = new SimpleRequestServer();</code> <code>server.start();</code> </pre> <li>We need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext();</code> </pre> <li>We lookup the queue for sending the request message</li> - <pre> + <pre class="prettyprint"> <code>Queue requestQueue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We lookup for the Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS Connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS Session</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS Message Producer to send request message</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(requestQueue);</code> </pre> <li>We create a temporary queue used to send reply message to and receive reply from</li> - <pre> + <pre class="prettyprint"> <code>TemporaryQueue replyQueue = session.createTemporaryQueue();</code> </pre> <li>We create a consumer to receive reply message</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer replyConsumer = session.createConsumer(replyQueue);</code> </pre> <li>We create a request Text Message</li> - <pre> + <pre class="prettyprint"> <code>TextMessage requestMsg = session.createTextMessage("A request message");</code> </pre> <li>We set the ReplyTo header so that the request receiver knows where to send the reply.</li> - <pre> + <pre class="prettyprint"> <code>requestMsg.setJMSReplyTo(replyQueue);</code> </pre> <li>We sent the request message</li> - <pre> + <pre class="prettyprint"> <code>producer.send(requestMsg);</code> </pre> <li>We put the request message to the map. Later we use it to check out which request message a reply message is for. Here we use the MessageID as the correlation id (JMSCorrelationID). You don't have to use it though. You can use some arbitrary string for example.</li> - <pre> + <pre class="prettyprint"> <code>requestMap.put(requestMsg.getJMSMessageID(), requestMsg);</code> </pre> <li>We receive the reply message</li> - <pre> + <pre class="prettyprint"> <code>TextMessage replyMessageReceived = (TextMessage)replyConsumer.receive();</code> </pre> <li>We check out which request message is this reply message sent for. Here we just have one request message for illustrative purpose. In real world there may be many requests and many replies.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage matchedMessage = requestMap.get(replyMessageReceived.getJMSCorrelationID());</code> </pre> <li>We close the consumer and producer on the replyQueue</li> - <pre> + <pre class="prettyprint"> <code>replyConsumer.close();</code> </pre> <li>We delete the temporary queue</li> - <pre> + <pre class="prettyprint"> <code>replyQueue.delete();</code> </pre> <li>We shutdown the request server</li> - <pre> + <pre class="prettyprint"> <code>server.shutdown();</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) @@ -133,22 +135,22 @@ <ol> <li>Extract the ReplyTo destination</li> - <pre> + <pre class="prettyprint"> <code>Destination replyDestination = request.getJMSReplyTo();</code> </pre> <li>Create the reply message</li> - <pre> + <pre class="prettyprint"> <code>TextMessage replyMessage = session.createTextMessage("A reply message");</code> </pre> <li>Set the CorrelationID</li> - <pre> + <pre class="prettyprint"> <code>replyMessage.setJMSCorrelationID(request.getJMSCorrelationID());</code> </pre> <li>Send out the reply message</li> - <pre> + <pre class="prettyprint"> <code>replyProducer.send(replyMessage);</code> </pre> </ol> Modified: trunk/examples/jms/scheduled-message/readme.html =================================================================== --- trunk/examples/jms/scheduled-message/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/scheduled-message/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Scheduled Message Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Scheduled Message Example</h1> <br> <p>This example shows you how to send a scheduled message to a JMS Queue with HornetQ.</p> @@ -19,42 +21,42 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(queue);</code> </pre> <li>We create a JMS text message that we are going to send.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a scheduled message message which will be delivered in 5 sec.");</code> </pre> <li>We schedule the delivery time to be 5 sec later.</li> - <pre> + <pre class="prettyprint"> <code> long time = System.currentTimeMillis(); time += 5000; @@ -63,28 +65,28 @@ </pre> <li>We send message to the queue</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> <li>We create a JMS Message Consumer to receive the message.</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We use a blocking receive() to consume the message and see when the message arrives.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage messageReceived = (TextMessage) messageConsumer.receive();</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/security/readme.html =================================================================== --- trunk/examples/jms/security/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/security/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Security Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Security Example</h1> <br> <p>This example shows you how configure and use security with HornetQ.</p> @@ -24,7 +26,7 @@ <p>First we need to configure users with roles. Users and Roles are configured in <code>hornetq-users.xml</code>. This example has four users configured as below </p> - <pre> + <pre class="prettyprint"> <code> <user name="bill" password="hornetq"> <role name="user"/> @@ -58,7 +60,7 @@ roles are used in controling the access privileges against HornetQ topics and queues. You can achieve this control by configuring proper permissions in <code>hornetq-configuration.xml</code>, like in the following </p> - <pre><code> + <pre class="prettyprint"><code> <security-settings>  <security-setting match="jms.topic.#"> @@ -115,14 +117,14 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code> InitialContext initialContext = getContext(0); </code> </pre> <li>We perform lookup on the topics</li> - <pre> + <pre class="prettyprint"> <code> Topic genericTopic = (Topic) initialContext.lookup("/topic/genericTopic"); Topic europeTopic = (Topic) initialContext.lookup("/topic/europeTopic"); @@ -131,14 +133,14 @@ </pre> <li>We perform a lookup on the Connection Factory</li> - <pre> + <pre class="prettyprint"> <code> ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory"); </code> </pre> <li>We try to create a JMS Connection without user/password. It will fail.</li> - <pre> + <pre class="prettyprint"> <code> try { @@ -153,7 +155,7 @@ </pre> <li>Bill tries to make a connection using wrong password</li> - <pre> + <pre class="prettyprint"> <code> billConnection = null; try @@ -169,7 +171,7 @@ </pre> <li>Bill makes a good connection.</li> - <pre> + <pre class="prettyprint"> <code> billConnection = createConnection("bill", "hornetq", cf); billConnection.start(); @@ -177,7 +179,7 @@ </pre> <li>Andrew makes a good connection</li> - <pre> + <pre class="prettyprint"> <code> andrewConnection = createConnection("andrew", "hornetq1", cf); andrewConnection.start(); @@ -185,7 +187,7 @@ </pre> <li>Frank makes a good connection</li> - <pre> + <pre class="prettyprint"> <code> frankConnection = createConnection("frank", "hornetq2", cf); frankConnection.start(); @@ -193,7 +195,7 @@ </pre> <li>Sam makes a good connection</li> - <pre> + <pre class="prettyprint"> <code> samConnection = createConnection("sam", "hornetq3", cf); samConnection.start(); @@ -201,7 +203,7 @@ </pre> <li>We check every user can publish/subscribe genericTopics</li> - <pre> + <pre class="prettyprint"> <code> checkUserSendAndReceive(genericTopic, billConnection, "bill"); checkUserSendAndReceive(genericTopic, andrewConnection, "andrew"); @@ -211,56 +213,56 @@ </pre> <li>We check permissions on news.europe.europeTopic for bill: can't send and can't receive</li> - <pre> + <pre class="prettyprint"> <code> checkUserNoSendNoReceive(europeTopic, billConnection, "bill", andrewConnection, frankConnection); </code> </pre> <li>We check permissions on news.europe.europeTopic for andrew: can send but can't receive</li> - <pre> + <pre class="prettyprint"> <code> checkUserSendNoReceive(europeTopic, andrewConnection, "andrew", frankConnection); </code> </pre> <li>We check permissions on news.europe.europeTopic for frank: can't send but can receive</li> - <pre> + <pre class="prettyprint"> <code> checkUserReceiveNoSend(europeTopic, frankConnection, "frank", andrewConnection); </code> </pre> <li>We check permissions on news.europe.europeTopic for sam: can't send but can receive</li> - <pre> + <pre class="prettyprint"> <code> checkUserReceiveNoSend(europeTopic, samConnection, "sam", andrewConnection); </code> </pre> <li>We check permissions on news.us.usTopic for bill: can't send and can't receive</li> - <pre> + <pre class="prettyprint"> <code> checkUserNoSendNoReceive(usTopic, billConnection, "bill"); </code> </pre> <li>We check permissions on news.us.usTopic for andrew: can't send and can't receive</li> - <pre> + <pre class="prettyprint"> <code> checkUserNoSendNoReceive(usTopic, andrewConnection, "andrew"); </code> </pre> <li>We check permissions on news.us.usTopic for frank: can both send and receive</li> - <pre> + <pre class="prettyprint"> <code> checkUserSendAndReceive(usTopic, frankConnection, "frank"); </code> </pre> <li>We check permissions on news.us.usTopic for sam: can't send but can receive</li> - <pre> + <pre class="prettyprint"> <code> checkUserReceiveNoSend(usTopic, samConnection, "sam", frankConnection); </code> @@ -268,7 +270,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code> finally { Modified: trunk/examples/jms/send-acknowledgements/readme.html =================================================================== --- trunk/examples/jms/send-acknowledgements/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/send-acknowledgements/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Asynchronous Send Acknowledgements Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>Asynchronous Send Acknowledgements Example</h1> <br> <p>Asynchronous Send Acknowledgements are an advanced feature of HornetQ which allow you to @@ -19,27 +21,27 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>Define a SendAcknowledgementHandler which will receive asynchronous acknowledgements</li> - <pre> + <pre class="prettyprint"> <code> class MySendAcknowledgementsHandler implements SendAcknowledgementHandler { @@ -54,12 +56,12 @@ </pre> <li>Create a JMS session</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>Set the handler on the underlying core session</li> - <pre> + <pre class="prettyprint"> <code> ClientSession coreSession = ((HornetQSession)session).getCoreSession(); @@ -69,7 +71,7 @@ </pre> <li>Create a JMS Message Producer</li> - <pre> + <pre class="prettyprint"> <code> MessageProducer producer = session.createProducer(queue); @@ -78,7 +80,7 @@ </pre> <li>Send 5000 messages, the handler will get called asynchronously some time later after the messages are sent.</li> - <pre> + <pre class="prettyprint"> <code> final int numMessages = 5000; @@ -96,7 +98,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/ssl-enabled/readme.html =================================================================== --- trunk/examples/jms/ssl-enabled/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/ssl-enabled/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS SSL Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS SSL Example</h1> <br> <p>This example shows you how to configure SSL with HornetQ to send and receive message. </p> @@ -12,7 +14,7 @@ be secured transparently without extra coding effort. To secure your messaging application with SSL, you need to configure connector and acceptor as follows:</p> <p> - <pre> + <pre class="prettyprint"> <code>  @@ -51,63 +53,63 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We create a JMS text message that we are going to send.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a text message");</code> </pre> <li>We send message to the queue</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> <li>We create a JMS Message Consumer to receive the message.</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>The message arrives at the consumer. In this case we use a timeout of 5000 milliseconds but we could use a blocking 'receive()'</li> - <pre> + <pre class="prettyprint"> <code>TextMessage messageReceived = (TextMessage) messageConsumer.receive(5000);</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/static-selector/readme.html =================================================================== --- trunk/examples/jms/static-selector/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/static-selector/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Static Message Selector Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>Static Message Selector Example</h1> <br> <p>This example shows you how to configure a HornetQ queue with static message selectors (filters) @@ -15,7 +17,7 @@ HornetQ's configuration files, hornetq-configuration.xml, as an element called 'filter' inside each queue definition, like</p> - <pre><code> + <pre class="prettyprint"><code> <queues> <queue name="jms.queue.selectorQueue"> <address>jms.queue.selectorQueue</address> @@ -38,43 +40,43 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI, this is the queue that has filter configured with it.</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/selectorQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(queue);</code> </pre> <li>We create a JMS message consumer that receives 'red' messages. The message listener will check the 'color' property on each received message.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer redConsumer = session.createConsumer(queue); redConsumer.setMessageListener(new SimpleMessageListener("red")); @@ -82,7 +84,7 @@ </pre> <li>We reate five messages with different 'color' properties.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage redMessage1 = session.createTextMessage("Red-1"); redMessage1.setStringProperty("color", "red"); @@ -97,7 +99,7 @@ </pre> <li>We send those messages.</li> - <pre> + <pre class="prettyprint"> <code> producer.send(redMessage1); System.out.println("Message sent: " + redMessage1.getText()); @@ -113,7 +115,7 @@ </pre> <li>Waiting for the message listener to check the received messages.</li> - <pre> + <pre class="prettyprint"> <code> Thread.sleep(5000); </code> @@ -121,7 +123,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/static-selector-jms/readme.html =================================================================== --- trunk/examples/jms/static-selector-jms/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/static-selector-jms/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Static Message Selector Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>Static Message Selector Example</h1> <br> <p>This example shows you how to configure a JMS queue with static message selectors (filters).</p> @@ -13,7 +15,7 @@ HornetQ's configuration files, hornetq-jms.xml, as an element called 'selector' inside each JMS queue definition:</p> - <pre><code> + <pre class="prettyprint"><code> <queue name="selectorQueue"> <entry name="/queue/selectorQueue"> <selector string="color='red'"/> @@ -36,43 +38,43 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI, this is the queue that has the selector configured with it.</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/selectorQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(queue);</code> </pre> <li>We create a JMS message consumer that receives 'red' messages. The message listener will check the 'color' property on each received message.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer redConsumer = session.createConsumer(queue); redConsumer.setMessageListener(new SimpleMessageListener("red")); @@ -80,7 +82,7 @@ </pre> <li>We create five messages with different 'color' properties.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage redMessage1 = session.createTextMessage("Red-1"); redMessage1.setStringProperty("color", "red"); @@ -95,7 +97,7 @@ </pre> <li>We send those messages.</li> - <pre> + <pre class="prettyprint"> <code> producer.send(redMessage1); System.out.println("Message sent: " + redMessage1.getText()); @@ -111,7 +113,7 @@ </pre> <li>Waiting for the message listener to check the received messages.</li> - <pre> + <pre class="prettyprint"> <code> Thread.sleep(5000); </code> @@ -119,7 +121,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/symmetric-cluster/readme.html =================================================================== --- trunk/examples/jms/symmetric-cluster/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/symmetric-cluster/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Symmetric Cluster Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>HornetQ Symmetric Cluster Example</h1> <br> <p>This examples demonstrates a <b>symmetric cluster</b> set-up with HornetQ.</p> @@ -26,7 +28,7 @@ available at any one time.</p> <p>Here's the relevant snippet from the server configuration, which tells the server to form a cluster with the other nodes:</p> - <pre> + <pre class="prettyprint"> <code> <cluster-connection name="my-cluster"> <address>jms</address> @@ -62,14 +64,14 @@ having to know about a specific one. </li> - <pre> + <pre class="prettyprint"> <code> ConnectionFactory cf = new HornetQConnectionFactory("231.7.7.7", 9876); </code> </pre> <li>Directly instantiate JMS Queue and Topic objects</li> - <pre> + <pre class="prettyprint"> <code> Queue queue = new HornetQQueue("exampleQueue"); @@ -79,7 +81,7 @@ <li>We create three connections, they should be to different nodes of the cluster in a round-robin fashion and start them.</li> - <pre> + <pre class="prettyprint"> <code> connection0 = cf.createConnection(); @@ -96,7 +98,7 @@ </pre> <li>We create a session on each connection.</li> - <pre> + <pre class="prettyprint"> <code> Session session0 = connection0.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -107,7 +109,7 @@ </pre> <li>We create a topic subscriber on each server.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer subscriber0 = session0.createConsumer(topic); @@ -118,21 +120,21 @@ </pre> <li>We create a queue consumer on server 0.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer consumer0 = session0.createConsumer(queue); </code> </pre> <li>We create an anonymous message producer on server 2.</li> - <pre> + <pre class="prettyprint"> <code> MessageProducer producer2 = session2.createProducer(null); </code> </pre> <li>We send 500 messages each to the queue and topic.</li> - <pre> + <pre class="prettyprint"> <code> final int numMessages = 500; @@ -150,14 +152,14 @@ </pre> <li>We kill live server 1, this will cause connection1 to transparently fail over onto server 4.</li> - <pre> + <pre class="prettyprint"> <code> killServer(1); </code> </pre> <li>Verify all subscribers receive the messages.</li> - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < numMessages; i++) { @@ -193,7 +195,7 @@ </pre> <li>Send 500 more messages to the queue and topic.</li> - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < numMessages; i++) { @@ -201,7 +203,7 @@ </pre> <li>Half way through sending we kill server 2</li> - <pre> + <pre class="prettyprint"> <code> if (i == numMessages / 2) { @@ -219,7 +221,7 @@ </pre> <li>Verify all the messages are received by the subscribers.</li> - <pre> + <pre class="prettyprint"> <code> for (int i = 0; i < numMessages; i++) { @@ -227,7 +229,7 @@ </pre> <li>Half way through receiving, we kill server 0.</li> - <pre> + <pre class="prettyprint"> <code> if (i == numMessages / 2) { @@ -267,7 +269,7 @@ <li>Be sure to close our resources!</li> - <pre> + <pre class="prettyprint"> <code> finally { Modified: trunk/examples/jms/temp-queue/readme.html =================================================================== --- trunk/examples/jms/temp-queue/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/temp-queue/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Temporary Queue Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Temporary Queue Example</h1> <br> <p>This example shows you how to use a TemporaryQueue object with HornetQ. First it creates a temporary queue to send and receive a message, then delete it. Then it creates another temporary queue and tries to use it after its connection is closed -- to illustrate its scope.</p> @@ -14,93 +16,93 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext();</code> </pre> <li>We look-up JMS connection factory from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We Create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a Temporary Queue</li> - <pre> + <pre class="prettyprint"> <code>Queue tempQueue = session.createTemporaryQueue();</code> </pre> <li>We create a JMS message producer to the temporary queue. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(tempQueue);</code> </pre> <li>We create a JMS text message to send </li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a text message");</code> </pre> <li>We send the message to the temporary queue</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> <li>We create a message consumer of the temporary queue</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(tempQueue);</code> </pre> <li>We receive the message from the temporary queue</li> - <pre> + <pre class="prettyprint"> <code>message = (TextMessage) messageConsumer.receive(5000);</code> </pre> <li>We close the consumer and producer before destroying the temporary queue</li> - <pre> + <pre class="prettyprint"> <code>messageConsumer.close();</code> <code>messageProducer.close();</code> </pre> <li>We delete the temporary queue</li> - <pre> + <pre class="prettyprint"> <code>tempQueue.delete();</code> </pre> <li>We create another temporary queue</li> - <pre> + <pre class="prettyprint"> <code>TemporaryQueue tempQueue2 = session.createTemporaryQueue();</code> </pre> <li>We close the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.close();</code> </pre> <li>We create a new connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a new session</li> - <pre> + <pre class="prettyprint"> <code>session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We try to access the tempQueue2 outside its lifetime, this will cause exception thrown</li> - <pre> + <pre class="prettyprint"> <code> try { @@ -116,7 +118,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/topic/readme.html =================================================================== --- trunk/examples/jms/topic/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/topic/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Topic Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Topic Example</h1> <br> <p>This example shows you how to send and receive a message to a JMS Topic with HornetQ.</p> @@ -15,73 +17,73 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS topic object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Topic topic = (Topic) initialContext.lookup("/topic/exampleTopic");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We create a JMS Message Consumer, messageConsumer1, to receive the message.</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(topic);</code> </pre> <li>We create a JMS Message Consumer, messageConsumer2, to also receive the message.</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer2 = session.createConsumer(topic);</code> </pre> <li>We create a JMS text message that we are going to send.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message = session.createTextMessage("This is a text message");</code> </pre> <li>We send message to the topic</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message);</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>The message arrives at the first consumer</li> - <pre> + <pre class="prettyprint"> <code>TextMessage messageReceived = (TextMessage) messageConsumer1.receive();</code> </pre> <li>The message arrives at the second consumer</li> - <pre> + <pre class="prettyprint"> <code>messageReceived = (TextMessage) messageConsumer2.receive();</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/topic-hierarchies/readme.html =================================================================== --- trunk/examples/jms/topic-hierarchies/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/topic-hierarchies/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ Topic Hierarchy Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>HornetQ Topic Hierarchy Example</h1> <br> <p>HornetQ supports topic hierarchies. With a topic hierarchy you can register a subscriber with a wild-card @@ -17,7 +19,7 @@ <h2>Example step-by-step</h2> <p><i>To run the example, simply type <code>ant</code> from this directory</i></p> <p>In this example we will define a hierarchy of topics in the file <code>hornetq-jms.xml</code></p> - <pre> + <pre class="prettyprint"> <code> <topic name="news"> <entry name="/topic/news"/> @@ -52,44 +54,44 @@ <br> <ol> <li>Create an initial context to perform the JNDI lookup.</code></li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext(0);</code> </pre> <li>Perform a lookup on the Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>Create a JMS Connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>Create a JMS Session</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>Instantiate a topic representing the wildcard we're going to subscribe to.</li> - <pre> + <pre class="prettyprint"> <code>Topic topicSubscribe = new HornetQTopic("news.europe.#");</code> </pre> <li>Create a consumer (topic subscriber) that will consume using that wildcard. The consumer will receive any messages sent to any topic that starts with news.europe</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(topicSubscribe);</code> </pre> <li>Create an anonymous producer. The sending address is specified at send time.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(null);</code> </pre> <li>Instantiate some more topic objects corresponding to the individual topics we're going to send messages to. You could look these up from JNDI if you wanted to.</li> - <pre> + <pre class="prettyprint"> <code> Topic topicNewsUsaWrestling = new HornetQTopic("news.usa.wrestling"); @@ -99,7 +101,7 @@ </pre> <li>Send a message destined for the usa wrestling topic.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage messageWrestlingNews = session.createTextMessage("Hulk Hogan starts ballet classes"); @@ -108,7 +110,7 @@ </pre> <li>Send a message destined for the europe sport topic.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage messageEuropeSport = session.createTextMessage("Lewis Hamilton joins European synchronized swimming team"); @@ -117,7 +119,7 @@ </pre> <li>Send a message destined for the europe entertainment topic</li> - <pre> + <pre class="prettyprint"> <code> TextMessage messageEuropeEntertainment = session.createTextMessage("John Lennon resurrected from dead"); @@ -126,7 +128,7 @@ </pre> <li>Start the connection</li> - <pre> + <pre class="prettyprint"> <code> connection.start(); </code> @@ -135,7 +137,7 @@ <li>We don't receive the usa wrestling message since we subscribed to news.europe.# and that doesn't match news.usa.wrestling. However we do receive the Europe sport message, and the europe entertainment message, since these match the wildcard.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage messageReceived1 = (TextMessage)messageConsumer.receive(5000); @@ -158,7 +160,7 @@ <li>Be sure to close our resources!</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/topic-selector-example1/readme.html =================================================================== --- trunk/examples/jms/topic-selector-example1/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/topic-selector-example1/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Topic Selector Example 1</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Topic Selector Example 1</h1> <br> <p>This example shows you how to send message to a JMS Topic, and subscribe them using selectors with HornetQ, also creating 3 non durable subscribers. 2 subscriptions using selectors, and a third one that should receive the complete set of messages.</p> @@ -15,52 +17,52 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext();</code> </pre> <li>We look-up the JMS topic object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Topic topic = (Topic) initialContext.lookup("/topic/exampleTopic");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>Create one non-durable subscriber with a specific filter</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer1 = session.createConsumer(topic, "someID=1", false);</code> </pre> <li>Create a second non-durable subscriber with a specific filter</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer2 = session.createConsumer(topic, "someID=2", false);</code> </pre> <li>Create a third non-durable subscriber without any filters, and it should receive the complete set of messages</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer3 = session.createConsumer(topic, "someID=2", false);</code> </pre> <li>Send 20 messages, 10 with someID=1, 10 with someID=2 </li> - <pre><code> + <pre class="prettyprint"><code> for (int i = 1; i < 10; i++) { for (int someID = 1; someID <= 2; someID++) @@ -78,12 +80,12 @@ }</code></pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> <code>connection.start();</code> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>Consume the messages from MessageConsumer1, filtering out someID=2</li> - <pre><code> + <pre class="prettyprint"><code> for (;;) { TextMessage messageReceivedA = (TextMessage)messageConsumer1.receive(1000); @@ -98,7 +100,7 @@ }</code></pre> <li>Consume the messages from MessageConsumer2, filtering out someID=1</li> - <pre><code> + <pre class="prettyprint"><code> for (;;) { TextMessage messageReceivedB = (TextMessage)messageConsumer2.receive(1000); @@ -113,7 +115,7 @@ }</code></pre> <li>Consume the messages from MessageConsumer3, receiving the complete set of messages</li> - <pre><code> + <pre class="prettyprint"><code> for (;;) { TextMessage messageReceivedC = (TextMessage)messageConsumer3.receive(1000); @@ -127,16 +129,16 @@ }</code></pre> <li>Close the consumers</li> - <pre><code>subscriberA.close();</code></pre> - <pre><code>subscriberB.close();</code></pre> + <pre class="prettyprint"><code>subscriberA.close();</code></pre> + <pre class="prettyprint"><code>subscriberB.close();</code></pre> <li>Delete the subscriptions when you're done</li> - <pre><code>session.unsubscribe("sub-a1");</code></pre> - <pre><code>session.unsubscribe("sub-a2");</code></pre> + <pre class="prettyprint"><code>session.unsubscribe("sub-a1");</code></pre> + <pre class="prettyprint"><code>session.unsubscribe("sub-a2");</code></pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/topic-selector-example2/readme.html =================================================================== --- trunk/examples/jms/topic-selector-example2/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/topic-selector-example2/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Topic Selector Example 2</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Topic Selector Example 2</h1> <br> <p>This example shows you how to selectively consume messages using message selectors with topic consumers.</p> @@ -25,42 +27,42 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext();</code> </pre> <li>We look-up the JMS topic object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Topic topic = (Topic) initialContext.lookup("/topic/exampleTopic");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(topic);</code> </pre> <li>We create two selectors.</li> - <pre> + <pre class="prettyprint"> <code> String redSelector = "color='red'"; String greenSelector = "color='green'"; @@ -68,7 +70,7 @@ </pre> <li>We Create a JMS Message Consumer that receives 'red' messages.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer redConsumer = session.createConsumer(topic, redSelector); redConsumer.setMessageListener(new SimpleMessageListener("red")); @@ -76,7 +78,7 @@ </pre> <li>We Create a second JMS Message Consumer that receives 'green' messages.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer greenConsumer = session.createConsumer(topic, greenSelector); greenConsumer.setMessageListener(new SimpleMessageListener("green")); @@ -84,7 +86,7 @@ </pre> <li>We Create another JMS Message Consumer that receives all messages.</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer allConsumer = session.createConsumer(topic); allConsumer.setMessageListener(new SimpleMessageListener("all")); @@ -92,7 +94,7 @@ </pre> <li>We Create three messages, each has a different color property.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage redMessage = session.createTextMessage("Red"); redMessage.setStringProperty("color", "red"); @@ -104,7 +106,7 @@ </pre> <li>We send the messages to the topic</li> - <pre> + <pre class="prettyprint"> <code> producer.send(redMessage); System.out.println("Message sent: " + redMessage.getText()); @@ -117,7 +119,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/transactional/readme.html =================================================================== --- trunk/examples/jms/transactional/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/transactional/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS Transactional Session Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS Transactional Session Example</h1> <br> <p>This example shows you how to use a transactional Session with HornetQ. It creates a transactional session. At first it sends out two messages and tries to receive without session commit. Then it commits the sending session and receives only one messages before it rolls back the receiving session. It then receives all the messages and commits the session.</p> @@ -16,97 +18,97 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>initialContext = getContext();</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We look-up the JMS connection factory object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");</code> </pre> <li>We create a JMS connection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createConnection();</code> </pre> <li>We start the connection. In order for delivery to occur on any consumers or subscribers on a connection, the connection must be started</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS session. The session is created as transacted.</li> - <pre> + <pre class="prettyprint"> <code>Session session = connection.createSession(true, Session.SESSION_TRANSACTED);</code> </pre> <li>We create a JMS message producer on the session. This will be used to send the messages.</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer messageProducer = session.createProducer(queue);</code> </pre> <li>We create a message consumer</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code> </pre> <li>We create 2 text messages</li> - <pre> + <pre class="prettyprint"> <code>TextMessage message1 = session.createTextMessage("This is a text message1");</code> <code>TextMessage message2 = session.createTextMessage("This is a text message2");</code> </pre> <li>We send the text messages to the queue</li> - <pre> + <pre class="prettyprint"> <code>messageProducer.send(message1);</code> <code>messageProducer.send(message2);</code> </pre> <li>We receive the message, it will return null as the transaction is not committed.</li> - <pre> + <pre class="prettyprint"> <code>TextMessage receivedMessage = (TextMessage) messageConsumer.receive(5000);</code> </pre> <li>We commit the session</li> - <pre> + <pre class="prettyprint"> <code>session.commit();</code> </pre> <li>We receive the messages again</li> - <pre> + <pre class="prettyprint"> <code>receivedMessage = (TextMessage) messageConsumer.receive(5000);</code> </pre> <li>We roll back the session, this will cause the received message canceled and redelivered again</li> - <pre> + <pre class="prettyprint"> <code>session.rollback();</code> </pre> <li>We receive the message again, we will get two messages. Nothing more, nothing less</li> - <pre> + <pre class="prettyprint"> <code>receivedMessage = (TextMessage) messageConsumer.receive(5000);</code> <code>receivedMessage = (TextMessage) messageConsumer.receive(5000);</code> </pre> <li>We commit the session</li> - <pre> + <pre class="prettyprint"> <code>session.commit();</code> </pre> <li>We receive the message again. Nothing should be received</li> - <pre> + <pre class="prettyprint"> <code>receivedMessage = (TextMessage) messageConsumer.receive(5000);</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/xa-heuristic/readme.html =================================================================== --- trunk/examples/jms/xa-heuristic/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/xa-heuristic/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS XA Heuristic Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS XA Heuristic Example</h1> <br> <p>This example shows you how to make an XA heuristic decision through HornetQ Management Interface.</p> @@ -28,42 +30,42 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext(0);</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We perform a lookup on the XA Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>XAConnectionFactory cf = (XAConnectionFactory) initialContext.lookup("/XAConnectionFactory");</code> </pre> <li>We create a JMS XAConnection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createXAConnection();</code> </pre> <li>We Start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS XASession</li> - <pre> + <pre class="prettyprint"> <code>XASession xaSession = connection.createXASession();</code> </pre> <li>We create a normal session</li> - <pre> + <pre class="prettyprint"> <code>Session normalSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a normal Message Consumer</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer normalConsumer = normalSession.createConsumer(queue); normalConsumer.setMessageListener(new SimpleMessageListener()); @@ -71,17 +73,17 @@ </pre> <li>We get the JMS Session</li> - <pre> + <pre class="prettyprint"> <code>Session session = xaSession.getSession();</code> </pre> <li>We create a message producer</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(queue); </code> </pre> <li>We create two Text Messages</li> - <pre> + <pre class="prettyprint"> <code> TextMessage helloMessage = session.createTextMessage("hello"); TextMessage worldMessage = session.createTextMessage("world"); @@ -89,86 +91,86 @@ </pre> <li>We create a transaction</li> - <pre> + <pre class="prettyprint"> <code>Xid xid1 = new XidImpl("xa-example1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());</code> </pre> <li>We get the JMS XAResource</li> - <pre> + <pre class="prettyprint"> <code>XAResource xaRes = xaSession.getXAResource();</code> </pre> <li>We begin the Transaction work</li> - <pre> + <pre class="prettyprint"> <code>xaRes.start(xid1, XAResource.TMNOFLAGS);</code> </pre> <li>We do work, sending hello message.</li> - <pre> + <pre class="prettyprint"> <code> normalProducer.send(helloMessage); </code> </pre> <li>We stop the work for xid1</li> - <pre> + <pre class="prettyprint"> <code>xaRes.end(xid1, XAResource.TMSUCCESS);</code> </pre> <li>We prepare xid1</li> - <pre> + <pre class="prettyprint"> <code>xaRes.prepare(xid1);</code> </pre> <li>We check the none should be received.</li> - <pre> + <pre class="prettyprint"> <code>checkNoMessageReceived();</code> </pre> <li>We create another transaction </li> - <pre> + <pre class="prettyprint"> <code>Xid xid2 = new XidImpl("xa-example2".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());</code> </pre> <li>We begin the transaction work</li> - <pre> + <pre class="prettyprint"> <code>xaRes.start(xid2, XAResource.TMNOFLAGS);</code> </pre> <li>We send the second message</li> - <pre> + <pre class="prettyprint"> <code>producer.send(worldMessage);</code> </pre> <li>We stop the work for xid2</li> - <pre> + <pre class="prettyprint"> <code>xaRes.end(xid2, XAResource.TMSUCCESS);</code> </pre> <li>We prepare xid2</li> - <pre> + <pre class="prettyprint"> <code>xaRes.prepare(xid2);</code> </pre> <li>Again, no messages should be received!</li> - <pre> + <pre class="prettyprint"> <code>checkNoMessageReceived();</code> </pre> <li>We create JMX Connector to connect to the server's MBeanServer.</li> - <pre> + <pre class="prettyprint"> <code> JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(JMX_URL), new HashMap<String, String>()); </code> </pre> <li>We retrieve the MBeanServerConnection</li> - <pre> + <pre class="prettyprint"> <code>MBeanServerConnection mbsc = connector.getMBeanServerConnection();</code> </pre> <li>We list the prepared transactions</li> - <pre> + <pre class="prettyprint"> <code> ObjectName serverObject = ObjectNames.getMessagingServerObjectName(); String[] infos = (String[])mbsc.invoke(serverObject, "listPreparedTransactions", null, null); @@ -182,22 +184,22 @@ </pre> <li>We roll back the first transaction</li> - <pre> + <pre class="prettyprint"> <code>mbsc.invoke(serverObject, "rollbackPreparedTransaction", new String[] {XidImpl.toBase64String(xid1)}, new String[]{"java.lang.String"});</code> </pre> <li>We commit the second one</li> - <pre> + <pre class="prettyprint"> <code>mbsc.invoke(serverObject, "commitPreparedTransaction", new String[] {XidImpl.toBase64String(xid2)}, new String[]{"java.lang.String"});</code> </pre> <li>We check the result, only the 'world' message received</li> - <pre> + <pre class="prettyprint"> <code>checkMessageReceived("world");</code> </pre> <li>We check the prepared transaction again, should have none.</li> - <pre> + <pre class="prettyprint"> <code> infos = (String[])mbsc.invoke(serverObject, "listPreparedTransactions", null, null); System.out.println("No. of prepared transactions now: " + infos.length); @@ -205,13 +207,13 @@ </pre> <li>We close the JMX connector.</li> - <pre> + <pre class="prettyprint"> <code>connector.close();</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/xa-receive/readme.html =================================================================== --- trunk/examples/jms/xa-receive/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/xa-receive/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS XA Receive Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS XA Receive Example</h1> <br> <p>This example shows you how message receiving behaves in an XA transaction in HornetQ. In an XA @@ -26,59 +28,59 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext(0);</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We perform a lookup on the XA Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>XAConnectionFactory cf = (XAConnectionFactory) initialContext.lookup("/XAConnectionFactory");</code> </pre> <li>We create a JMS XAConnection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createXAConnection();</code> </pre> <li>We Start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS XASession</li> - <pre> + <pre class="prettyprint"> <code>XASession xaSession = connection.createXASession();</code> </pre> <li>We create a normal session</li> - <pre> + <pre class="prettyprint"> <code>Session normalSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a normal Message Producer</li> - <pre> + <pre class="prettyprint"> <code> MessageProducer normalProducer = normalSession.createProducer(queue); </code> </pre> <li>We get the JMS Session</li> - <pre> + <pre class="prettyprint"> <code>Session session = xaSession.getSession();</code> </pre> <li>We create a message consumer</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer xaConsumer = session.createConsumer(queue); </code> </pre> <li>We create two Text Messages</li> - <pre> + <pre class="prettyprint"> <code> TextMessage helloMessage = session.createTextMessage("hello"); TextMessage worldMessage = session.createTextMessage("world"); @@ -86,22 +88,22 @@ </pre> <li>We create a transaction</li> - <pre> + <pre class="prettyprint"> <code>Xid xid1 = new XidImpl("xa-example1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());</code> </pre> <li>We get the JMS XAResource</li> - <pre> + <pre class="prettyprint"> <code>XAResource xaRes = xaSession.getXAResource();</code> </pre> <li>We begin the Transaction work</li> - <pre> + <pre class="prettyprint"> <code>xaRes.start(xid1, XAResource.TMNOFLAGS);</code> </pre> <li>We send two messages.</li> - <pre> + <pre class="prettyprint"> <code> normalProducer.send(helloMessage); normalProducer.send(worldMessage); @@ -109,7 +111,7 @@ </pre> <li>We receive the messages</li> - <pre> + <pre class="prettyprint"> <code> TextMessage rm1 = (TextMessage)xaConsumer.receive(); System.out.println("Message received: " + rm1.getText()); @@ -119,32 +121,32 @@ </pre> <li>We stop the work</li> - <pre> + <pre class="prettyprint"> <code>xaRes.end(xid1, XAResource.TMSUCCESS);</code> </pre> <li>We prepare</li> - <pre> + <pre class="prettyprint"> <code>xaRes.prepare(xid1);</code> </pre> <li>We roll back the transaction </li> - <pre> + <pre class="prettyprint"> <code>xaRes.rollback(xid1);</code> </pre> <li>We create another transaction </li> - <pre> + <pre class="prettyprint"> <code>Xid xid2 = new XidImpl("xa-example2".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());</code> </pre> <li>We start the transaction</li> - <pre> + <pre class="prettyprint"> <code>xaRes.start(xid2, XAResource.TMNOFLAGS);</code> </pre> <li>We receive those messages again</li> - <pre> + <pre class="prettyprint"> <code> rm1 = (TextMessage)xaConsumer.receive(); System.out.println("Message received again: " + rm1.getText()); @@ -154,22 +156,22 @@ </pre> <li>We stop the work</li> - <pre> + <pre class="prettyprint"> <code>xaRes.end(xid2, XAResource.TMSUCCESS);</code> </pre> <li>We prepare</li> - <pre> + <pre class="prettyprint"> <code>xaRes.prepare(xid2);</code> </pre> <li>We commit!</li> - <pre> + <pre class="prettyprint"> <code>xaRes.commit(xid2, false);</code> </pre> <li>We check that no more messages are received.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage rm3 = (TextMessage)xaConsumer.receive(2000); if (rm3 == null) @@ -185,7 +187,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/xa-send/readme.html =================================================================== --- trunk/examples/jms/xa-send/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/xa-send/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS XA Send Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS XA Send Example</h1> <br> <p>This example shows you how message sending behaves in an XA transaction in HornetQ. In an XA @@ -24,42 +26,42 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext(0);</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We perform a lookup on the XA Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>XAConnectionFactory cf = (XAConnectionFactory) initialContext.lookup("/XAConnectionFactory");</code> </pre> <li>We create a JMS XAConnection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createXAConnection();</code> </pre> <li>We Start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS XASession</li> - <pre> + <pre class="prettyprint"> <code>XASession xaSession = connection.createXASession();</code> </pre> <li>We create a normal session</li> - <pre> + <pre class="prettyprint"> <code>Session normalSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a normal Message Consumer</li> - <pre> + <pre class="prettyprint"> <code> MessageConsumer normalConsumer = normalSession.createConsumer(queue); normalConsumer.setMessageListener(new SimpleMessageListener()); @@ -67,17 +69,17 @@ </pre> <li>We get the JMS Session</li> - <pre> + <pre class="prettyprint"> <code>Session session = xaSession.getSession();</code> </pre> <li>We create a message producer</li> - <pre> + <pre class="prettyprint"> <code>MessageProducer producer = session.createProducer(queue);</code> </pre> <li>We create two Text Messages</li> - <pre> + <pre class="prettyprint"> <code> TextMessage helloMessage = session.createTextMessage("hello"); TextMessage worldMessage = session.createTextMessage("world"); @@ -85,22 +87,22 @@ </pre> <li>We create a transaction</li> - <pre> + <pre class="prettyprint"> <code>Xid xid1 = new XidImpl("xa-example1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());</code> </pre> <li>We get the JMS XAResource</li> - <pre> + <pre class="prettyprint"> <code>XAResource xaRes = xaSession.getXAResource();</code> </pre> <li>We begin the Transaction work</li> - <pre> + <pre class="prettyprint"> <code>xaRes.start(xid1, XAResource.TMNOFLAGS);</code> </pre> <li>We do work, sending two messages.</li> - <pre> + <pre class="prettyprint"> <code> producer.send(helloMessage); producer.send(worldMessage); @@ -108,42 +110,42 @@ </pre> <li>We check the result, it should receive none!</li> - <pre> + <pre class="prettyprint"> <code>checkNoMessageReceived();</code> </pre> <li>We stop the work</li> - <pre> + <pre class="prettyprint"> <code>xaRes.end(xid1, XAResource.TMSUCCESS);</code> </pre> <li>We prepare</li> - <pre> + <pre class="prettyprint"> <code>xaRes.prepare(xid1);</code> </pre> <li>We roll back the transaction </li> - <pre> + <pre class="prettyprint"> <code>xaRes.rollback(xid1);</code> </pre> <li>We check no messages should be received! </li> - <pre> + <pre class="prettyprint"> <code>checkNoMessageReceived();</code> </pre> <li>We create another transaction</li> - <pre> + <pre class="prettyprint"> <code>Xid xid2 = new XidImpl("xa-example2".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());</code> </pre> <li>We start the transaction</li> - <pre> + <pre class="prettyprint"> <code>xaRes.start(xid2, XAResource.TMNOFLAGS);</code> </pre> <li>We re-send those messages</li> - <pre> + <pre class="prettyprint"> <code> producer.send(helloMessage); producer.send(worldMessage); @@ -151,33 +153,33 @@ </pre> <li>We stop the work</li> - <pre> + <pre class="prettyprint"> <code>xaRes.end(xid2, XAResource.TMSUCCESS);</code> </pre> <li>We prepare</li> - <pre> + <pre class="prettyprint"> <code>xaRes.prepare(xid2);</code> </pre> <li>We check that no messages should be received at this moment</li> - <pre> + <pre class="prettyprint"> <code>checkNoMessageReceived();</code> </pre> <li>We commit!</li> - <pre> + <pre class="prettyprint"> <code>xaRes.commit(xid2, false);</code> </pre> <li>We check that all messages are received.</li> - <pre> + <pre class="prettyprint"> <code>checkAllMessageReceived();</code> </pre> <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null) Modified: trunk/examples/jms/xa-with-jta/readme.html =================================================================== --- trunk/examples/jms/xa-with-jta/readme.html 2009-10-02 12:43:21 UTC (rev 8034) +++ trunk/examples/jms/xa-with-jta/readme.html 2009-10-02 13:56:28 UTC (rev 8035) @@ -1,9 +1,11 @@ <html> <head> <title>HornetQ JMS XA with JTA Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> + <link rel="stylesheet" type="text/css" href="../../common/common.css" /> + <link rel="stylesheet" type="text/css" href="../../common/prettify.css" /> + <script type="text/javascript" src="../../common/prettify.js"></script> </head> - <body> + <body onload="prettyPrint()"> <h1>JMS XA with JTA Example</h1> <br> <p>This example shows you how to use JTA interfaces to control transactions with HornetQ. JTA provides @@ -27,59 +29,59 @@ <br> <ol> <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>client-jndi.properties</code> file in the directory <code>../common/config</code></li> - <pre> + <pre class="prettyprint"> <code>InitialContext initialContext = getContext(0);</code> </pre> <li>We look-up the JMS queue object from JNDI</li> - <pre> + <pre class="prettyprint"> <code>Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");</code> </pre> <li>We perform a lookup on the XA Connection Factory</li> - <pre> + <pre class="prettyprint"> <code>XAConnectionFactory cf = (XAConnectionFactory) initialContext.lookup("/XAConnectionFactory");</code> </pre> <li>We create a JMS XAConnection</li> - <pre> + <pre class="prettyprint"> <code>connection = cf.createXAConnection();</code> </pre> <li>We Start the connection</li> - <pre> + <pre class="prettyprint"> <code>connection.start();</code> </pre> <li>We create a JMS XASession</li> - <pre> + <pre class="prettyprint"> <code>XASession xaSession = connection.createXASession();</code> </pre> <li>We create a normal session</li> - <pre> + <pre class="prettyprint"> <code>Session normalSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code> </pre> <li>We create a normal Message Producer</li> - <pre> + <pre class="prettyprint"> <code> MessageProducer normalProducer = normalSession.createProducer(queue); </code> </pre> <li>We get the JMS Session</li> - <pre> + <pre class="prettyprint"> <code>Session session = xaSession.getSession();</code> </pre> <li>We create a message consumer</li> - <pre> + <pre class="prettyprint"> <code>MessageConsumer xaConsumer = session.createConsumer(queue); </code> </pre> <li>We create two Text Messages</li> - <pre> + <pre class="prettyprint"> <code> TextMessage helloMessage = session.createTextMessage("hello"); TextMessage worldMessage = session.createTextMessage("world"); @@ -87,22 +89,22 @@ </pre> <li>We get the Transaction Manager</li> - <pre> + <pre class="prettyprint"> <code>javax.transaction.TransactionManager txMgr = TransactionManager.transactionManager();</code> </pre> <li>We start a transaction</li> - <pre> + <pre class="prettyprint"> <code>txMgr.begin();</code> </pre> <li>We get the JMS XAResource</li> - <pre> + <pre class="prettyprint"> <code>XAResource xaRes = xaSession.getXAResource();</code> </pre> <li>We enlist the resources in the Transaction work</li> - <pre> + <pre class="prettyprint"> <code> Transaction transaction = txMgr.getTransaction(); transaction.enlistResource(new DummyXAResource()); @@ -111,7 +113,7 @@ </pre> <li>We send two messages.</li> - <pre> + <pre class="prettyprint"> <code> normalProducer.send(helloMessage); normalProducer.send(worldMessage); @@ -119,7 +121,7 @@ </pre> <li>We receive the messages</li> - <pre> + <pre class="prettyprint"> <code> TextMessage rm1 = (TextMessage)xaConsumer.receive(); System.out.println("Message received: " + rm1.getText()); @@ -129,12 +131,12 @@ </pre> <li>We roll back the transaction</li> - <pre> + <pre class="prettyprint"> <code>txMgr.rollback();</code> </pre> <li>We create another transaction </li> - <pre> + <pre class="prettyprint"> <code> txMgr.begin(); transaction = txMgr.getTransaction(); @@ -142,7 +144,7 @@ </pre> <li>We enlist the resources to start the transaction work</li> - <pre> + <pre class="prettyprint"> <code> transaction.enlistResource(new DummyXAResource()); transaction.enlistResource(xaRes); @@ -150,7 +152,7 @@ </pre> <li>We receive those messages again</li> - <pre> + <pre class="prettyprint"> <code> rm1 = (TextMessage)xaConsumer.receive(); System.out.println("Message received again: " + rm1.getText()); @@ -160,12 +162,12 @@ </pre> <li>We commit</li> - <pre> + <pre class="prettyprint"> <code>txMgr.commit();</code> </pre> <li>We check that no more messages are received.</li> - <pre> + <pre class="prettyprint"> <code> TextMessage rm3 = (TextMessage)xaConsumer.receive(2000); if (rm3 == null) @@ -181,7 +183,7 @@ <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li> - <pre> + <pre class="prettyprint"> <code>finally { if (initialContext != null)

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8034 - in trunk/examples/jms/embedded: src/org/hornetq/jms/example and 1 other directory.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-02 08:43:21 -0400 (Fri, 02 Oct 2009) New Revision: 8034 Modified: trunk/examples/jms/embedded/build.xml trunk/examples/jms/embedded/readme.html trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java Log: HORNETQ-149: Update JMS embedded example to actually start a JMSServerManager * rewrote the emebedded example to use a JMSServerManager * used JMSConfiguration API to configure the JMS server (see HORNETQ-161) Modified: trunk/examples/jms/embedded/build.xml =================================================================== --- trunk/examples/jms/embedded/build.xml 2009-10-02 12:41:40 UTC (rev 8033) +++ trunk/examples/jms/embedded/build.xml 2009-10-02 12:43:21 UTC (rev 8034) @@ -20,10 +20,20 @@ <import file="../../common/build.xml"/>  + <path id="extra.classpath"> + <fileset dir="${jars.dir}"> + <include name="**/jnpserver.jar"/> + <include name="**/jboss-logging-spi.jar"/> + <include name="**/jboss-common-core.jar"/> + <include name="**/netty.jar"/> + </fileset> + </path> + <path id="local.classpath"> <fileset dir="${hornetq.jars.dir}"> <include name="hornetq-core.jar"/> <include name="hornetq-jms.jar"/> + <include name="hornetq-transports.jar"/> </fileset> <fileset dir="${jars.dir}"> @@ -31,10 +41,10 @@ </fileset> <pathelement location="${classes.dir}"/> + <path refid="extra.classpath"/> </path> <target name="run" depends="compile"> - <java classname="org.hornetq.jms.example.EmbeddedExample" fork="true" resultproperty="example-result"> <jvmarg value="-Xms50M"/> <jvmarg value="-Xmx50M"/> @@ -42,7 +52,7 @@ </java>  - <fail message="Example ${example.classname} failed"> + <fail message="Example EmbeddedExample failed"> <condition> <not> <equals arg1="${example-result}" arg2="0"/> Modified: trunk/examples/jms/embedded/readme.html =================================================================== --- trunk/examples/jms/embedded/readme.html 2009-10-02 12:41:40 UTC (rev 8033) +++ trunk/examples/jms/embedded/readme.html 2009-10-02 12:43:21 UTC (rev 8034) @@ -1,92 +1,106 @@ <html> - <head> - <title>HornetQ Embedded Example</title> - <link rel="stylesheet" type="text/css" href="../../common/common.css"> - </head> - <body> - <h1>Embedded Example</h1> - <br> - <p>This examples shows how to setup and run HornetQ embedded.</p> - <p>HornetQ was designed to use POJOs (Plain Old Java Objects), what makes embedding HornetQ as simple as instantiating a few objects.</p> - <p>On this example, we only one jars (hornetq-core.jar, hornetq-jms.jar and jboss-javaee.jar).</p> + <head> + <title>HornetQ Embedded JMS Server Example</title> + <link rel="stylesheet" type="text/css" href="../../common/common.css"> + </head> + <body> + <h1>Embedded JMS Server Example</h1> + + <p>This examples shows how to setup and run an embedded JMS server with HornetQ.</p> + <p>HornetQ was designed to use POJOs (Plain Old Java Objects) so that embedding HornetQ is as simple as instantiating a few objects.</p> + <p>This example does not use any configuration files. The server is configured using POJOs and can be easily ported to any dependency injection framework.<br /> + We will setup and run a full-fledged JMS server which binds its JMS resources to JNDI and can be accessed by remote clients.</p> - <p>HornetQ Embedded could be used from very simple use cases with only InVM support to very complex cases with clustering, persistence and fail over.</p> - <br> - <h2>Example step-by-step</h2> - <p><i>To run the example, simply type <code>ant</code> from this directory</i></p> - <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, HornetQServer, start it and operate on JMS regularly</p> - <br> - <ol> - <li>Create the Configuration, and set the properties accordingly</li> - <pre> - <code>Configuration configuration = new ConfigurationImpl();</code> - <code>configuration.setEnablePersistence(false);</code> - <code>configuration.setSecurityEnabled(false);</code> - <code>configuration.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));</code></pre> - - <li>Create and start the server</li> - <pre> - <code>HornetQServer server = HornetQ.newHornetQServer(configuration);</code> - <code>server.start();</code></pre> + <h2>Example step-by-step</h2> + <p><i>To run the example, simply type <code>ant</code> from this directory</i></p> - <li>As we are not using a JNDI environment we instantiate the objects directly</li> - <pre> - <code>Queue queue = new HornetQQueue("exampleQueue");</code> - <code>HornetQConnectionFactory cf = new HornetQConnectionFactory (new TransportConfiguration(InVMConnectorFactory.class.getName()));</code> - </pre> + <ol> + <li>Create HornetQ core configuration, and set the properties accordingly</li> + <pre> + <code>Configuration configuration = new ConfigurationImpl(); + configuration.setPersistenceEnabled(false); + configuration.setSecurityEnabled(false); + configuration.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));</code> + Configuration configuration = new ConfigurationImpl();</pre> - <li>Create a JMS Destination by using the Core API</li> - <pre> - <code> - ClientSession coreSession = cf.getCoreFactory().createSession(false, false, false); - coreSession.createQueue("jms.queue.exampleQueue", "jms.queue.exampleQueue", true); - coreSession.close();</code> - </pre> + <li>Create the HornetQ core server</li> + <pre> + <code>HornetQServer hornetqServer = HornetQ.newHornetQServer(configuration);</code> + </pre> + + <li>Create and start the JNDI server (using JBoss JNDI implementation)</li> + <pre class="prettyprint"> + <code>System.setProperty("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); + NamingBeanImpl naming = new NamingBeanImpl(); + naming.start(); + Main jndiServer = new Main(); + jndiServer.setNamingInfo(naming); + jndiServer.setPort(1099); + jndiServer.setBindAddress("localhost"); + jndiServer.setRmiPort(1098); + jndiServer.setRmiBindAddress("localhost"); + jndiServer.start();</code> + </pre> - <li>Create the JMS objects</li> - <pre> - <code> - connection = cf.createConnection(); - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer producer = session.createProducer(queue);</code> - </pre> + <li>Create the JMS configuration</li> + <pre> + <code>JMSConfiguration jmsConfig = new JMSConfigurationImpl();</code> + </pre> - <li>Create and send a TextMessage</li> - <pre><code> - TextMessage message = session.createTextMessage("Hello sent at " + new Date()); - System.out.println("Sending the message."); - producer.send(message);</code></pre> + <li>Configure context used to bind the JMS resources to JNDI</li> + <pre> + <code>Hashtable<String, String> env = new Hashtable<String, String>(); + env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); + env.put("java.naming.provider.url", "jnp://localhost:1099"); + env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); + Context context = new InitialContext(env); + jmsConfig.setContext(context);</code> + </pre> - <li>Create the message consumer and start the connection</li> - <pre><code> - MessageConsumer messageConsumer = session.createConsumer(queue); - connection.start();</code></pre> + <li>Configure the JMS ConnectionFactory</li> + <pre> + <code>TransportConfiguration connectorConfig = new TransportConfiguration(NettyConnectorFactory.class.getName()); + ConnectionFactoryConfiguration cfConfig = new ConnectionFactoryConfigurationImpl("cf", connectorConfig, "/cf"); + jmsConfig.getConnectionFactoryConfigurations().add(cfConfig);</code> + </pre> + + <li>Configure the JMS Queue</li> + <pre> + <code>QueueConfiguration queueConfig = new QueueConfigurationImpl("queue1", null, false, "/queue/queue1"); + jmsConfig.getQueueConfigurations().add(queueConfig);</code> + </pre> + + <li>Start the JMS Server using the HornetQ core server and the JMS configuration</li> + <pre> + <code>JMSServerManager jmsServer = new JMSServerManagerImpl(hornetqServer, jmsConfig); + jmsServer.start();</code> + </pre> - <li>Receive the message</li> - <pre><code> - TextMessage messageReceived = (TextMessage)messageConsumer.receive(1000); - System.out.println("Received TextMessage:" + messageReceived.getText());</code></pre> - - <li>Be sure to close our resources!</li> - - <pre> - <code> - finally - { - if (connection != null) - { - connection.close(); - } - }</code> - </pre> - - <li>Stop the server</li> - - <pre> - <code> - server.stop(); - </code> - </pre> - </ol> - </body> + <p>At this point the JMS server is started and any JMS clients can look up JMS resources from JNDI to send/receive + messages from the server. To keep the example simple, we will send and receive a JMS message from the same JVM + used to run the JMS server.</p> + + <li>Lookup JMS resources defined in the configuration </li> + <pre> + <code>ConnectionFactory cf = (ConnectionFactory)context.lookup("/cf"); + Queue queue = (Queue)context.lookup("/queue/queue1");</code> + </pre> + + <li>Send and receive a message using JMS API</li> + <p>See the <a href="../queue/readme.html">Queue Example</a> for detailed steps to send and receive a JMS message</p> + + <p>Finally, we stop the JMS server and its associated resources.</p> + + <li>Stop the JMS server</li> + <pre> + <code>jmsServer.stop();</code> + </pre> + + <li>Stop the JNDI server</li> + <pre> + <code>naming.stop(); + jndiServer.stop();</code> + </pre> + </ol> + </body> </html> \ No newline at end of file Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java =================================================================== --- trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2009-10-02 12:41:40 UTC (rev 8033) +++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2009-10-02 12:43:21 UTC (rev 8034) @@ -13,29 +13,41 @@ package org.hornetq.jms.example; import java.util.Date; +import java.util.Hashtable; import javax.jms.Connection; +import javax.jms.ConnectionFactory; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; +import javax.naming.Context; +import javax.naming.InitialContext; -import org.hornetq.core.client.ClientSession; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQ; import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.HornetQQueue; -import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.integration.transports.netty.NettyAcceptorFactory; +import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.QueueConfiguration; +import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; +import org.hornetq.jms.server.config.impl.QueueConfigurationImpl; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; +import org.jnp.server.Main; +import org.jnp.server.NamingBeanImpl; /** * This example demonstrates how to run a HornetQ embedded with JMS * * @author <a href="clebert.suconic(a)jboss.com">Clebert Suconic</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> */ public class EmbeddedExample { @@ -45,60 +57,86 @@ try { - // Step 1. Create the Configuration, and set the properties accordingly + // Step 1. Create HornetQ core configuration, and set the properties accordingly Configuration configuration = new ConfigurationImpl(); configuration.setPersistenceEnabled(false); configuration.setSecurityEnabled(false); - configuration.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); + configuration.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName())); - // Step 2. Create and start the server - HornetQServer server = HornetQ.newHornetQServer(configuration); - server.start(); + // Step 2. Create HornetQ core server + HornetQServer hornetqServer = HornetQ.newHornetQServer(configuration); + // Step 3. Create and start the JNDI server + System.setProperty("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); + NamingBeanImpl naming = new NamingBeanImpl(); + naming.start(); + Main jndiServer = new Main(); + jndiServer.setNamingInfo(naming); + jndiServer.setPort(1099); + jndiServer.setBindAddress("localhost"); + jndiServer.setRmiPort(1098); + jndiServer.setRmiBindAddress("localhost"); + jndiServer.start(); - // Step 3. As we are not using a JNDI environment we instantiate the objects directly - Queue queue = new HornetQQueue("exampleQueue"); - HornetQConnectionFactory cf = new HornetQConnectionFactory (new TransportConfiguration(InVMConnectorFactory.class.getName())); + // Step 4. Create the JMS configuration + JMSConfiguration jmsConfig = new JMSConfigurationImpl(); - // Step 4. Create a JMS Destination by using the Core API - ClientSession coreSession = cf.getCoreFactory().createSession(false, false, false); - coreSession.createQueue("jms.queue.exampleQueue", "jms.queue.exampleQueue", true); - coreSession.close(); + // Step 5. Configure context used to bind the JMS resources to JNDI + Hashtable<String, String> env = new Hashtable<String, String>(); + env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); + env.put("java.naming.provider.url", "jnp://localhost:1099"); + env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); + Context context = new InitialContext(env); + jmsConfig.setContext(context); + // Step 6. Configure the JMS ConnectionFactory + TransportConfiguration connectorConfig = new TransportConfiguration(NettyConnectorFactory.class.getName()); + ConnectionFactoryConfiguration cfConfig = new ConnectionFactoryConfigurationImpl("cf", connectorConfig, "/cf"); + jmsConfig.getConnectionFactoryConfigurations().add(cfConfig); - Connection connection = null; - + // Step 7. Configure the JMS Queue + QueueConfiguration queueConfig = new QueueConfigurationImpl("queue1", null, false, "/queue/queue1"); + jmsConfig.getQueueConfigurations().add(queueConfig); + + // Step 8. Start the JMS Server using the HornetQ core server and the JMS configuration + JMSServerManager jmsServer = new JMSServerManagerImpl(hornetqServer, jmsConfig); + jmsServer.start(); + System.out.println("Started Embedded JMS Server"); + + // Step 9. Lookup JMS resources defined in the configuration + ConnectionFactory cf = (ConnectionFactory)context.lookup("/cf"); + Queue queue = (Queue)context.lookup("/queue/queue1"); + + // Step 10. Send and receive a message using JMS API + Connection connection = null; try { - - // Step 5. Create the JMS objects connection = cf.createConnection(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = session.createProducer(queue); - - // Step 6. Create and send a TextMessage TextMessage message = session.createTextMessage("Hello sent at " + new Date()); - System.out.println("Sending the message."); + System.out.println("Sending message: " + message.getText()); producer.send(message); - - // Step 7. Create the message consumer and start the connection MessageConsumer messageConsumer = session.createConsumer(queue); connection.start(); - - // Step 8. Receive the message. TextMessage messageReceived = (TextMessage)messageConsumer.receive(1000); - System.out.println("Received TextMessage:" + messageReceived.getText()); + System.out.println("Received message:" + messageReceived.getText()); } finally { - // Step 9. Be sure to close our resources! if (connection != null) { connection.close(); } - // Step 10. Stop the server - server.stop(); + // Step 11. Stop the JMS server + jmsServer.stop(); + System.out.println("Stopped the JMS Server"); + + // Step 12. Stop the JNDI server + naming.stop(); + jndiServer.stop(); + System.exit(0); } } catch (Exception e)

14 years, 7 months

1
0
0 / 0

JBoss hornetq SVN: r8033 - in trunk: src/main/org/hornetq/jms/server/config and 4 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-10-02 08:41:40 -0400 (Fri, 02 Oct 2009) New Revision: 8033 Added: trunk/src/main/org/hornetq/jms/server/config/ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java trunk/src/main/org/hornetq/jms/server/config/TopicConfiguration.java trunk/src/main/org/hornetq/jms/server/config/impl/ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java trunk/tests/src/org/hornetq/tests/integration/jms/server/config/ trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java Log: HORNETQ-161: Allow creation of JMS destinations via IoC * added org.hornetq.server.jms.config package to configure a JMSServerManager using POJOs (similar to Configuration API for core HornetQServer) Added: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,162 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config; + +import java.util.List; + +import org.hornetq.core.config.TransportConfiguration; +import org.hornetq.utils.Pair; + +/** + * A ConnectionFactoryConfiguration + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public interface ConnectionFactoryConfiguration +{ + String getName(); + + String[] getBindings(); + + String getDiscoveryAddress(); + + void setDiscoveryAddress(String discoveryAddress); + + int getDiscoveryPort(); + + void setDiscoveryPort(int discoveryPort); + + List<Pair<TransportConfiguration, TransportConfiguration>> getConnectorConfigs(); + + void setConnectorConfigs(List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs); + + String getClientID(); + + void setClientID(String clientID); + + long getDiscoveryRefreshTimeout(); + + void setDiscoveryRefreshTimeout(long discoveryRefreshTimeout); + + long getClientFailureCheckPeriod(); + + void setClientFailureCheckPeriod(long clientFailureCheckPeriod); + + long getConnectionTTL(); + + void setConnectionTTL(long connectionTTL); + + long getCallTimeout(); + + void setCallTimeout(long callTimeout); + + int getMaxConnections(); + + void setMaxConnections(int maxConnections); + + boolean isCacheLargeMessagesClient(); + + void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient); + + int getMinLargeMessageSize(); + + void setMinLargeMessageSize(int minLargeMessageSize); + + int getConsumerWindowSize(); + + void setConsumerWindowSize(int consumerWindowSize); + + int getConsumerMaxRate(); + + void setConsumerMaxRate(int consumerMaxRate); + + int getProducerWindowSize(); + + void setProducerWindowSize(int producerWindowSize); + + int getProducerMaxRate(); + + void setProducerMaxRate(int producerMaxRate); + + boolean isBlockOnAcknowledge(); + + void setBlockOnAcknowledge(boolean blockOnAcknowledge); + + boolean isBlockOnPersistentSend(); + + void setBlockOnPersistentSend(boolean blockOnPersistentSend); + + boolean isBlockOnNonPersistentSend(); + + void setBlockOnNonPersistentSend(boolean blockOnNonPersistentSend); + + boolean isAutoGroup(); + + void setAutoGroup(boolean autoGroup); + + boolean isPreAcknowledge(); + + void setPreAcknowledge(boolean preAcknowledge); + + String getLoadBalancingPolicyClassName(); + + void setLoadBalancingPolicyClassName(String loadBalancingPolicyClassName); + + int getTransactionBatchSize(); + + void setTransactionBatchSize(int transactionBatchSize); + + int getDupsOKBatchSize(); + + void setDupsOKBatchSize(int dupsOKBatchSize); + + long getInitialWaitTimeout(); + + void setInitialWaitTimeout(long initialWaitTimeout); + + boolean isUseGlobalPools(); + + void setUseGlobalPools(boolean useGlobalPools); + + int getScheduledThreadPoolMaxSize(); + + void setScheduledThreadPoolMaxSize(int scheduledThreadPoolMaxSize); + + int getThreadPoolMaxSize(); + + void setThreadPoolMaxSize(int threadPoolMaxSize); + + long getRetryInterval(); + + void setRetryInterval(long retryInterval); + + double getRetryIntervalMultiplier(); + + void setRetryIntervalMultiplier(double retryIntervalMultiplier); + + long getMaxRetryInterval(); + + void setMaxRetryInterval(long maxRetryInterval); + + int getReconnectAttempts(); + + void setReconnectAttempts(int reconnectAttempts); + + boolean isFailoverOnServerShutdown(); + + void setFailoverOnServerShutdown(boolean failoverOnServerShutdown); + +} Added: trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,35 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config; + +import java.util.List; + +import javax.naming.Context; + +/** + * A JMSConfiguration + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public interface JMSConfiguration +{ + void setContext(Context context); + Context getContext(); + + List<QueueConfiguration> getQueueConfigurations(); + List<TopicConfiguration> getTopicConfigurations(); + List<ConnectionFactoryConfiguration> getConnectionFactoryConfigurations(); +} Added: trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,29 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config; + +/** + * A QeueConfiguration + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public interface QueueConfiguration +{ + String getName(); + String getSelector(); + boolean isDurable(); + String[] getBindings(); +} Added: trunk/src/main/org/hornetq/jms/server/config/TopicConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/TopicConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/TopicConfiguration.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,25 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config; + +/** + * A TopicConfiguration + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + */ +public interface TopicConfiguration +{ + String getName(); + String[] getBindings(); +} Added: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,485 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config.impl; + +import java.util.ArrayList; +import java.util.List; + +import org.hornetq.core.client.impl.ClientSessionFactoryImpl; +import org.hornetq.core.config.TransportConfiguration; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.utils.Pair; + +/** + * A ConnectionFactoryConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConfiguration +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + public final String[] bindings; + + public final String name; + + public String discoveryAddress; + + public int discoveryPort; + + public List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs; + + public String clientID = null; + + public long discoveryRefreshTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; + + public long clientFailureCheckPeriod = ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + + public long connectionTTL = ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; + + public long callTimeout = ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT; + + public int maxConnections = ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS; + + public boolean cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + + public int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + + public int consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; + + public int consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; + + public int producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; + + public int producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; + + public boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; + + public boolean blockOnPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND; + + public boolean blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND; + + public boolean autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; + + public boolean preAcknowledge = ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; + + public String loadBalancingPolicyClassName = ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; + + public int transactionBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + + public int dupsOKBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + + public long initialWaitTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; + + public boolean useGlobalPools = ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; + + public int scheduledThreadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; + + public int threadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; + + public long retryInterval = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; + + public double retryIntervalMultiplier = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + + public long maxRetryInterval = ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; + + public int reconnectAttempts = ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; + + public boolean failoverOnServerShutdown = ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ConnectionFactoryConfigurationImpl(String name, String discoveryAddress, int discoveryPort, String... bindings) + { + this(name, bindings); + this.discoveryAddress = discoveryAddress; + this.discoveryPort = discoveryPort; + } + + public ConnectionFactoryConfigurationImpl(String name, TransportConfiguration liveConfig, String... bindings) + { + this(name, liveConfig, null, bindings); + } + + public ConnectionFactoryConfigurationImpl(String name, TransportConfiguration liveConfig, TransportConfiguration backupConfig, String... bindings) + { + this(name, bindings); + connectorConfigs = new ArrayList<Pair<TransportConfiguration,TransportConfiguration>>(); + connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(liveConfig, backupConfig)); + } + + public ConnectionFactoryConfigurationImpl(String name, List<Pair<TransportConfiguration,TransportConfiguration>> transportConfigs, TransportConfiguration backupConfig, String... bindings) + { + this(name, bindings); + connectorConfigs = new ArrayList<Pair<TransportConfiguration,TransportConfiguration>>(); + connectorConfigs.addAll(transportConfigs); + } + + private ConnectionFactoryConfigurationImpl(String name, String... bindings) + { + this.name = name; + this.bindings = new String[bindings.length]; + System.arraycopy(bindings, 0, this.bindings, 0, bindings.length); + } + + // ConnectionFactoryConfiguration implementation ----------------- + + public String[] getBindings() + { + return bindings; + } + + public String getName() + { + return name; + } + + public String getDiscoveryAddress() + { + return discoveryAddress; + } + + public void setDiscoveryAddress(String discoveryAddress) + { + this.discoveryAddress = discoveryAddress; + } + + public int getDiscoveryPort() + { + return discoveryPort; + } + + public void setDiscoveryPort(int discoveryPort) + { + this.discoveryPort = discoveryPort; + } + + public List<Pair<TransportConfiguration, TransportConfiguration>> getConnectorConfigs() + { + return connectorConfigs; + } + + public void setConnectorConfigs(List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs) + { + this.connectorConfigs = connectorConfigs; + } + + public String getClientID() + { + return clientID; + } + + public void setClientID(String clientID) + { + this.clientID = clientID; + } + + public long getDiscoveryRefreshTimeout() + { + return discoveryRefreshTimeout; + } + + public void setDiscoveryRefreshTimeout(long discoveryRefreshTimeout) + { + this.discoveryRefreshTimeout = discoveryRefreshTimeout; + } + + public long getClientFailureCheckPeriod() + { + return clientFailureCheckPeriod; + } + + public void setClientFailureCheckPeriod(long clientFailureCheckPeriod) + { + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + } + + public long getConnectionTTL() + { + return connectionTTL; + } + + public void setConnectionTTL(long connectionTTL) + { + this.connectionTTL = connectionTTL; + } + + public long getCallTimeout() + { + return callTimeout; + } + + public void setCallTimeout(long callTimeout) + { + this.callTimeout = callTimeout; + } + + public int getMaxConnections() + { + return maxConnections; + } + + public void setMaxConnections(int maxConnections) + { + this.maxConnections = maxConnections; + } + + public boolean isCacheLargeMessagesClient() + { + return cacheLargeMessagesClient; + } + + public void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient) + { + this.cacheLargeMessagesClient = cacheLargeMessagesClient; + } + + public int getMinLargeMessageSize() + { + return minLargeMessageSize; + } + + public void setMinLargeMessageSize(int minLargeMessageSize) + { + this.minLargeMessageSize = minLargeMessageSize; + } + + public int getConsumerWindowSize() + { + return consumerWindowSize; + } + + public void setConsumerWindowSize(int consumerWindowSize) + { + this.consumerWindowSize = consumerWindowSize; + } + + public int getConsumerMaxRate() + { + return consumerMaxRate; + } + + public void setConsumerMaxRate(int consumerMaxRate) + { + this.consumerMaxRate = consumerMaxRate; + } + + public int getProducerWindowSize() + { + return producerWindowSize; + } + + public void setProducerWindowSize(int producerWindowSize) + { + this.producerWindowSize = producerWindowSize; + } + + public int getProducerMaxRate() + { + return producerMaxRate; + } + + public void setProducerMaxRate(int producerMaxRate) + { + this.producerMaxRate = producerMaxRate; + } + + public boolean isBlockOnAcknowledge() + { + return blockOnAcknowledge; + } + + public void setBlockOnAcknowledge(boolean blockOnAcknowledge) + { + this.blockOnAcknowledge = blockOnAcknowledge; + } + + public boolean isBlockOnPersistentSend() + { + return blockOnPersistentSend; + } + + public void setBlockOnPersistentSend(boolean blockOnPersistentSend) + { + this.blockOnPersistentSend = blockOnPersistentSend; + } + + public boolean isBlockOnNonPersistentSend() + { + return blockOnNonPersistentSend; + } + + public void setBlockOnNonPersistentSend(boolean blockOnNonPersistentSend) + { + this.blockOnNonPersistentSend = blockOnNonPersistentSend; + } + + public boolean isAutoGroup() + { + return autoGroup; + } + + public void setAutoGroup(boolean autoGroup) + { + this.autoGroup = autoGroup; + } + + public boolean isPreAcknowledge() + { + return preAcknowledge; + } + + public void setPreAcknowledge(boolean preAcknowledge) + { + this.preAcknowledge = preAcknowledge; + } + + public String getLoadBalancingPolicyClassName() + { + return loadBalancingPolicyClassName; + } + + public void setLoadBalancingPolicyClassName(String loadBalancingPolicyClassName) + { + this.loadBalancingPolicyClassName = loadBalancingPolicyClassName; + } + + public int getTransactionBatchSize() + { + return transactionBatchSize; + } + + public void setTransactionBatchSize(int transactionBatchSize) + { + this.transactionBatchSize = transactionBatchSize; + } + + public int getDupsOKBatchSize() + { + return dupsOKBatchSize; + } + + public void setDupsOKBatchSize(int dupsOKBatchSize) + { + this.dupsOKBatchSize = dupsOKBatchSize; + } + + public long getInitialWaitTimeout() + { + return initialWaitTimeout; + } + + public void setInitialWaitTimeout(long initialWaitTimeout) + { + this.initialWaitTimeout = initialWaitTimeout; + } + + public boolean isUseGlobalPools() + { + return useGlobalPools; + } + + public void setUseGlobalPools(boolean useGlobalPools) + { + this.useGlobalPools = useGlobalPools; + } + + public int getScheduledThreadPoolMaxSize() + { + return scheduledThreadPoolMaxSize; + } + + public void setScheduledThreadPoolMaxSize(int scheduledThreadPoolMaxSize) + { + this.scheduledThreadPoolMaxSize = scheduledThreadPoolMaxSize; + } + + public int getThreadPoolMaxSize() + { + return threadPoolMaxSize; + } + + public void setThreadPoolMaxSize(int threadPoolMaxSize) + { + this.threadPoolMaxSize = threadPoolMaxSize; + } + + public long getRetryInterval() + { + return retryInterval; + } + + public void setRetryInterval(long retryInterval) + { + this.retryInterval = retryInterval; + } + + public double getRetryIntervalMultiplier() + { + return retryIntervalMultiplier; + } + + public void setRetryIntervalMultiplier(double retryIntervalMultiplier) + { + this.retryIntervalMultiplier = retryIntervalMultiplier; + } + + public long getMaxRetryInterval() + { + return maxRetryInterval; + } + + public void setMaxRetryInterval(long maxRetryInterval) + { + this.maxRetryInterval = maxRetryInterval; + } + + public int getReconnectAttempts() + { + return reconnectAttempts; + } + + public void setReconnectAttempts(int reconnectAttempts) + { + this.reconnectAttempts = reconnectAttempts; + } + + public boolean isFailoverOnServerShutdown() + { + return failoverOnServerShutdown; + } + + public void setFailoverOnServerShutdown(boolean failoverOnServerShutdown) + { + this.failoverOnServerShutdown = failoverOnServerShutdown; + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Added: trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,102 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config.impl; + +import java.util.ArrayList; +import java.util.List; + +import javax.naming.Context; + +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.QueueConfiguration; +import org.hornetq.jms.server.config.TopicConfiguration; + +/** + * A JMSConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class JMSConfigurationImpl implements JMSConfiguration +{ + + private final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations = new ArrayList<ConnectionFactoryConfiguration>(); + + private final List<QueueConfiguration> queueConfigurations = new ArrayList<QueueConfiguration>(); + + private final List<TopicConfiguration> topicConfigurations = new ArrayList<TopicConfiguration>(); + + private Context context = null; + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public JMSConfigurationImpl() + { + } + + public JMSConfigurationImpl(final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations, + final List<QueueConfiguration> queueConfigurations, + final List<TopicConfiguration> topicConfigurations) + { + this.connectionFactoryConfigurations.addAll(connectionFactoryConfigurations); + this.queueConfigurations.addAll(queueConfigurations); + this.topicConfigurations.addAll(topicConfigurations); + } + + // JMSConfiguration implementation ------------------------------- + + public List<ConnectionFactoryConfiguration> getConnectionFactoryConfigurations() + { + return connectionFactoryConfigurations; + } + + public List<QueueConfiguration> getQueueConfigurations() + { + return queueConfigurations; + } + + public List<TopicConfiguration> getTopicConfigurations() + { + return topicConfigurations; + } + + public Context getContext() + { + return context; + } + + public void setContext(Context context) + { + this.context = context; + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Added: trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,82 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config.impl; + +import org.hornetq.jms.server.config.QueueConfiguration; + +/** + * A QueueConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class QueueConfigurationImpl implements QueueConfiguration +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final String name; + private final String selector; + private final boolean durable; + private final String[] bindings; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public QueueConfigurationImpl(String name, String selector, boolean durable, String... bindings) + { + this.name = name; + this.selector = selector; + this.durable = durable; + this.bindings = new String[bindings.length]; + System.arraycopy(bindings, 0, this.bindings, 0, bindings.length); + } + + // QueueConfiguration implementation ----------------------------- + + public String[] getBindings() + { + return bindings; + } + + public String getName() + { + return name; + } + + public String getSelector() + { + return selector; + } + + public boolean isDurable() + { + return durable; + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Added: trunk/src/main/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,68 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config.impl; + +import org.hornetq.jms.server.config.TopicConfiguration; + +/** + * A TopicConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class TopicConfigurationImpl implements TopicConfiguration +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final String name; + private final String[] bindings; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public TopicConfigurationImpl(String name, String... bindings) + { + this.name = name; + this.bindings = new String[bindings.length]; + System.arraycopy(bindings, 0, this.bindings, 0, bindings.length); + } + + // TopicConfiguration implementation ----------------------------- + + public String[] getBindings() + { + return bindings; + } + + public String getName() + { + return name; + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-10-02 12:36:05 UTC (rev 8032) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -14,6 +14,7 @@ package org.hornetq.jms.server.impl; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -37,6 +38,10 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.SelectorTranslator; import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.QueueConfiguration; +import org.hornetq.jms.server.config.TopicConfiguration; import org.hornetq.jms.server.management.JMSManagementService; import org.hornetq.jms.server.management.impl.JMSManagementServiceImpl; import org.hornetq.utils.Pair; @@ -79,9 +84,11 @@ private DeploymentManager deploymentManager; private final String configFileName; - + private boolean contextSet; - + + private JMSConfiguration config; + public JMSServerManagerImpl(final HornetQServer server) throws Exception { this.server = server; @@ -96,6 +103,15 @@ this.configFileName = configFileName; } + public JMSServerManagerImpl(final HornetQServer server, final JMSConfiguration configuration) throws Exception + { + this.server = server; + + this.configFileName = null; + + this.config = configuration; + } + // ActivateCallback implementation ------------------------------------- public synchronized void activated() @@ -118,6 +134,8 @@ jmsDeployer.start(); deploymentManager.start(); + + deploy(); } catch (Exception e) { @@ -709,4 +727,112 @@ } destinations.get(destination).add(jndiBinding); } + + private void deploy() throws Exception + { + if (config == null) + { + return; + } + + if (config.getContext() != null) + { + setContext(config.getContext()); + } + + List<ConnectionFactoryConfiguration> connectionFactoryConfigurations = config.getConnectionFactoryConfigurations(); + for (ConnectionFactoryConfiguration config : connectionFactoryConfigurations) + { + if (config.getDiscoveryAddress() != null) + { + createConnectionFactory(config.getName(), + config.getDiscoveryAddress(), + config.getDiscoveryPort(), + config.getClientID(), + config.getDiscoveryRefreshTimeout(), + config.getClientFailureCheckPeriod(), + config.getConnectionTTL(), + config.getCallTimeout(), + config.getMaxConnections(), + config.isCacheLargeMessagesClient(), + config.getMinLargeMessageSize(), + config.getConsumerWindowSize(), + config.getConsumerMaxRate(), + config.getProducerWindowSize(), + config.getProducerMaxRate(), + config.isBlockOnAcknowledge(), + config.isBlockOnPersistentSend(), + config.isBlockOnNonPersistentSend(), + config.isAutoGroup(), + config.isPreAcknowledge(), + config.getLoadBalancingPolicyClassName(), + config.getTransactionBatchSize(), + config.getDupsOKBatchSize(), + config.getInitialWaitTimeout(), + config.isUseGlobalPools(), + config.getScheduledThreadPoolMaxSize(), + config.getThreadPoolMaxSize(), + config.getRetryInterval(), + config.getRetryIntervalMultiplier(), + config.getMaxRetryInterval(), + config.getReconnectAttempts(), + config.isFailoverOnServerShutdown(), + Arrays.asList(config.getBindings())); + } + else + { + createConnectionFactory(config.getName(), + config.getConnectorConfigs(), + config.getClientID(), + config.getClientFailureCheckPeriod(), + config.getConnectionTTL(), + config.getCallTimeout(), + config.getMaxConnections(), + config.isCacheLargeMessagesClient(), + config.getMinLargeMessageSize(), + config.getConsumerWindowSize(), + config.getConsumerMaxRate(), + config.getProducerWindowSize(), + config.getProducerMaxRate(), + config.isBlockOnAcknowledge(), + config.isBlockOnPersistentSend(), + config.isBlockOnNonPersistentSend(), + config.isAutoGroup(), + config.isPreAcknowledge(), + config.getLoadBalancingPolicyClassName(), + config.getTransactionBatchSize(), + config.getDupsOKBatchSize(), + config.isUseGlobalPools(), + config.getScheduledThreadPoolMaxSize(), + config.getThreadPoolMaxSize(), + config.getRetryInterval(), + config.getRetryIntervalMultiplier(), + config.getMaxRetryInterval(), + config.getReconnectAttempts(), + config.isFailoverOnServerShutdown(), + Arrays.asList(config.getBindings())); + } + } + + List<QueueConfiguration> queueConfigs = config.getQueueConfigurations(); + for (QueueConfiguration config : queueConfigs) + { + String[] bindings = config.getBindings(); + for (String binding : bindings) + { + createQueue(config.getName(), binding, config.getSelector(), config.isDurable()); + } + } + + List<TopicConfiguration> topicConfigs = config.getTopicConfigurations(); + for (TopicConfiguration config : topicConfigs) + { + String[] bindings = config.getBindings(); + for (String binding : bindings) + { + createTopic(config.getName(), binding); + } + } + } + } Added: trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java 2009-10-02 12:41:40 UTC (rev 8033) @@ -0,0 +1,126 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.tests.integration.jms.server.config; + +import static org.hornetq.tests.util.RandomUtil.randomString; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Queue; +import javax.jms.Topic; +import javax.naming.Context; + +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.TransportConfiguration; +import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.impl.HornetQServerImpl; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.TopicConfiguration; +import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; +import org.hornetq.jms.server.config.impl.QueueConfigurationImpl; +import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; +import org.hornetq.tests.unit.util.InVMContext; +import org.hornetq.tests.util.ServiceTestBase; + +/** + * A JMSConfigurationTest + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class JMSConfigurationTest extends ServiceTestBase +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public void testSetupJMSConfiguration() throws Exception + { + Context context = new InVMContext(); + + Configuration coreConfiguration = createDefaultConfig(false); + HornetQServer coreServer = new HornetQServerImpl(coreConfiguration); + + JMSConfiguration jmsConfiguration = new JMSConfigurationImpl(); + jmsConfiguration.setContext(context); + TransportConfiguration connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName()); + ConnectionFactoryConfiguration cfConfig = new ConnectionFactoryConfigurationImpl(randomString(), + connectorConfig, + "/cf/binding1", + "/cf/binding2"); + jmsConfiguration.getConnectionFactoryConfigurations().add(cfConfig); + QueueConfigurationImpl queueConfig = new QueueConfigurationImpl(randomString(), + null, + false, + "/queue/binding1", + "/queue/binding2"); + jmsConfiguration.getQueueConfigurations().add(queueConfig); + TopicConfiguration topicConfig = new TopicConfigurationImpl(randomString(), "/topic/binding1", "/topic/binding2"); + jmsConfiguration.getTopicConfigurations().add(topicConfig); + + JMSServerManager server = new JMSServerManagerImpl(coreServer, jmsConfiguration); + server.start(); + + for (String binding : cfConfig.getBindings()) + { + Object o = context.lookup(binding); + assertNotNull(o); + assertTrue(o instanceof ConnectionFactory); + ConnectionFactory cf = (ConnectionFactory)o; + Connection connection = cf.createConnection(); + connection.close(); + } + + for (String binding : queueConfig.getBindings()) + { + Object o = context.lookup(binding); + assertNotNull(o); + assertTrue(o instanceof Queue); + Queue queue = (Queue)o; + assertEquals(queueConfig.getName(), queue.getQueueName()); + } + + for (String binding : topicConfig.getBindings()) + { + Object o = context.lookup(binding); + assertNotNull(o); + assertTrue(o instanceof Topic); + Topic topic = (Topic)o; + assertEquals(topicConfig.getName(), topic.getTopicName()); + } + + server.stop(); + } + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +}

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits October 2009