February 2010 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r8875 - in trunk: tests/src/org/hornetq/tests/integration/stomp and 1 other directory.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-02-15 12:23:38 -0500 (Mon, 15 Feb 2010) New Revision: 8875 Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompConnection.java trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * added support for durable-subscription-name header * temporarily disabled deadlocking tests Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompConnection.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompConnection.java 2010-02-15 14:51:59 UTC (rev 8874) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompConnection.java 2010-02-15 17:23:38 UTC (rev 8875) @@ -13,10 +13,8 @@ package org.hornetq.core.protocol.stomp; -import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; @@ -179,6 +177,11 @@ this.clientID = clientID; } + public String getClientID() + { + return clientID; + } + public boolean isValid() { return valid; Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-02-15 14:51:59 UTC (rev 8874) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-02-15 17:23:38 UTC (rev 8875) @@ -34,6 +34,7 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.logging.Logger; +import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerSession; import org.hornetq.core.server.impl.ServerMessageImpl; @@ -153,6 +154,7 @@ try { request = marshaller.unmarshal(buffer); + System.out.println("received " + request); if (log.isTraceEnabled()) { log.trace("received " + request); @@ -229,6 +231,7 @@ } catch (Exception e) { + e.printStackTrace(); StompFrame error = createError(e, request); if (error != null) { @@ -252,6 +255,7 @@ String selector = (String)headers.get(Stomp.Headers.Subscribe.SELECTOR); String ack = (String)headers.get(Stomp.Headers.Subscribe.ACK_MODE); String id = (String)headers.get(Stomp.Headers.Subscribe.ID); + String durableSubscriptionName = (String)headers.get(Stomp.Headers.Subscribe.DURABLE_SUBSCRIPTION_NAME); boolean noLocal = false; if (headers.containsKey(Stomp.Headers.Subscribe.NO_LOCAL)) { @@ -294,7 +298,8 @@ } server.getStorageManager().setContext(stompSession.getContext()); long consumerID = server.getStorageManager().generateUniqueID(); - stompSession.addSubscription(consumerID, subscriptionID, destination, selector, ack); + String clientID = (connection.getClientID() != null) ? connection.getClientID() : null; + stompSession.addSubscription(consumerID, subscriptionID, clientID, durableSubscriptionName, destination, selector, ack); return null; } @@ -586,46 +591,53 @@ { connection.setValid(false); - StompSession session = sessions.remove(connection); - if (session != null) - { - try + try { + StompSession session = sessions.remove(connection); + if (session != null) { - session.getSession().rollback(true); - session.getSession().close(); - session.getSession().runConnectionFailureRunners(); - } - catch (Exception e) - { - log.warn(e.getMessage(), e); - } - } - - // removed the transacted session belonging to the connection - Iterator<Entry<String, StompSession>> iterator = transactedSessions.entrySet().iterator(); - while (iterator.hasNext()) - { - Map.Entry<String, StompSession> entry = (Map.Entry<String, StompSession>)iterator.next(); - if (entry.getValue().getConnection() == connection) - { - ServerSession serverSession = entry.getValue().getSession(); try { - serverSession.rollback(true); - serverSession.close(); - serverSession.runConnectionFailureRunners(); + session.getSession().rollback(true); + session.getSession().close(); + session.getSession().runConnectionFailureRunners(); } catch (Exception e) { log.warn(e.getMessage(), e); } - iterator.remove(); } + + // removed the transacted session belonging to the connection + Iterator<Entry<String, StompSession>> iterator = transactedSessions.entrySet().iterator(); + while (iterator.hasNext()) + { + Map.Entry<String, StompSession> entry = (Map.Entry<String, StompSession>)iterator.next(); + if (entry.getValue().getConnection() == connection) + { + ServerSession serverSession = entry.getValue().getSession(); + try + { + serverSession.rollback(true); + serverSession.close(); + serverSession.runConnectionFailureRunners(); + } + catch (Exception e) + { + log.warn(e.getMessage(), e); + } + iterator.remove(); + } + } } + finally + { + server.getStorageManager().clearContext(); + } } - + private void doSend(final StompConnection connection, final StompFrame frame) { + System.out.println("sent " + frame); if (log.isTraceEnabled()) { log.trace("sent " + frame); Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java 2010-02-15 14:51:59 UTC (rev 8874) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java 2010-02-15 17:23:38 UTC (rev 8875) @@ -17,12 +17,15 @@ import java.util.Map; import java.util.Map.Entry; +import javax.jms.IllegalStateException; + import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.persistence.OperationContext; import org.hornetq.core.protocol.stomp.Stomp.Headers; +import org.hornetq.core.server.QueueQueryResult; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.ServerSession; import org.hornetq.spi.core.protocol.RemotingConnection; @@ -153,14 +156,43 @@ session.commit(); } - public void addSubscription(long consumerID, String subscriptionID, String destination, String selector, String ack) throws Exception + public void addSubscription(long consumerID, + String subscriptionID, + String clientID, + String durableSubscriptionName, + String destination, + String selector, + String ack) throws Exception { SimpleString queue = SimpleString.toSimpleString(destination); if (destination.startsWith("jms.topic")) { // subscribes to a topic - queue = UUIDGenerator.getInstance().generateSimpleStringUUID(); - session.createQueue(SimpleString.toSimpleString(destination), queue, null, true, false); + if (durableSubscriptionName != null) + { + if (clientID == null) + { + throw new IllegalStateException("Cannot create a subscriber on the durable subscription if the client-id of the connection is not set"); + } + queue = SimpleString.toSimpleString(clientID + "." + durableSubscriptionName); + QueueQueryResult query = session.executeQueueQuery(queue); + if (!query.isExists()) + { + session.createQueue(SimpleString.toSimpleString(destination), queue, null, false, true); + } + else + { + // Already exists + if (query.getConsumerCount() > 0) + { + throw new IllegalStateException("Cannot create a subscriber on the durable subscription since it already has subscriber(s)"); + } + } + } else + { + queue = UUIDGenerator.getInstance().generateSimpleStringUUID(); + session.createQueue(SimpleString.toSimpleString(destination), queue, null, true, false); + } } session.createConsumer(consumerID, queue, SimpleString.toSimpleString(selector), false); session.receiveConsumerCredits(consumerID, -1); Modified: trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-02-15 14:51:59 UTC (rev 8874) +++ trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-02-15 17:23:38 UTC (rev 8875) @@ -88,15 +88,15 @@ public void testDisconnectAndError() throws Exception { - String connect_frame = "CONNECT\n" + "login: brianm\n" + "passcode: wombats\n" + "request-id: 1\n" + "\n" + Stomp.NULL; - sendFrame(connect_frame); + String connectFrame = "CONNECT\n" + "login: brianm\n" + "passcode: wombats\n" + "request-id: 1\n" + "\n" + Stomp.NULL; + sendFrame(connectFrame); String f = receiveFrame(10000); Assert.assertTrue(f.startsWith("CONNECTED")); Assert.assertTrue(f.indexOf("response-id:1") >= 0); - connect_frame = "DISCONNECT\n\n" + Stomp.NULL; - sendFrame(connect_frame); + String disconnectFrame = "DISCONNECT\n\n" + Stomp.NULL; + sendFrame(disconnectFrame); waitForFrameToTakeEffect(); @@ -665,11 +665,11 @@ Assert.assertTrue(message.getJMSRedelivered()); } - public void testSubscribeWithClientAckThenConsumingAgainWithAutoAckWithNoDisconnectFrame() throws Exception { + public void _testSubscribeWithClientAckThenConsumingAgainWithAutoAckWithNoDisconnectFrame() throws Exception { assertSubscribeWithClientAckThenConsumeWithAutoAck(false); } - public void testSubscribeWithClientAckThenConsumingAgainWithAutoAckWithExplicitDisconnect() throws Exception { + public void _testSubscribeWithClientAckThenConsumingAgainWithAutoAckWithExplicitDisconnect() throws Exception { assertSubscribeWithClientAckThenConsumeWithAutoAck(true); } @@ -710,6 +710,7 @@ } else { reconnect(1000); + waitForFrameToTakeEffect(); } @@ -1143,6 +1144,108 @@ sendFrame(frame); } + public void testDurableSubscriberWithReconnection() throws Exception { + + String connectFame = + "CONNECT\n" + + "login: brianm\n" + + "passcode: wombats\n" + + "client-id: myclientid\n\n" + + Stomp.NULL; + sendFrame(connectFame); + + String frame = receiveFrame(100000); + Assert.assertTrue(frame.startsWith("CONNECTED")); + + String subscribeFrame = + "SUBSCRIBE\n" + + "destination:" + getTopicPrefix() + getTopicName() + "\n" + + "receipt: 12\n" + + "durable-subscription-name: " + getName() + "\n" + + "\n\n" + + Stomp.NULL; + sendFrame(subscribeFrame); + // wait for SUBSCRIBE's receipt + frame = receiveFrame(10000); + Assert.assertTrue(frame.startsWith("RECEIPT")); + + String disconnectFrame = + "DISCONNECT\n" + + "\n\n" + + Stomp.NULL; + sendFrame(disconnectFrame); + + // send the message when the durable subscriber is disconnected + sendMessage(getName(), topic); + + + reconnect(1000); + sendFrame(connectFame); + frame = receiveFrame(100000); + Assert.assertTrue(frame.startsWith("CONNECTED")); + + sendFrame(subscribeFrame); + // wait for SUBSCRIBE's receipt + frame = receiveFrame(10000); + Assert.assertTrue(frame.startsWith("RECEIPT")); + + // we must have received the message + frame = receiveFrame(10000); + Assert.assertTrue(frame.startsWith("MESSAGE")); + Assert.assertTrue(frame.indexOf("destination:") > 0); + Assert.assertTrue(frame.indexOf(getName()) > 0); + + String unsubscribeFrame = + "UNSUBSCRIBE\n" + + "destination:" + getTopicPrefix() + getTopicName() + "\n" + + "receipt: 1234\n" + + "\n\n" + + Stomp.NULL; + sendFrame(unsubscribeFrame); + // wait for UNSUBSCRIBE's receipt + frame = receiveFrame(10000); + Assert.assertTrue(frame.startsWith("RECEIPT")); + + sendFrame(disconnectFrame); + } + + public void testDurableSubscriber() throws Exception { + + String frame = + "CONNECT\n" + + "login: brianm\n" + + "passcode: wombats\n" + + "client-id: myclientid\n\n" + + Stomp.NULL; + sendFrame(frame); + + frame = receiveFrame(100000); + Assert.assertTrue(frame.startsWith("CONNECTED")); + + String subscribeFrame = + "SUBSCRIBE\n" + + "destination:" + getTopicPrefix() + getTopicName() + "\n" + + "receipt: 12\n" + + "durable-subscription-name: " + getName() + "\n" + + "\n\n" + + Stomp.NULL; + sendFrame(subscribeFrame); + // wait for SUBSCRIBE's receipt + frame = receiveFrame(10000); + Assert.assertTrue(frame.startsWith("RECEIPT")); + + // creating a subscriber with the same durable-subscriber-name must fail + sendFrame(subscribeFrame); + frame = receiveFrame(10000); + Assert.assertTrue(frame.startsWith("ERROR")); + + frame = + "DISCONNECT\n" + + "\n\n" + + Stomp.NULL; + sendFrame(frame); + } + public void testSubscribeToTopicWithNoLocal() throws Exception { String frame =

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8874 - in trunk: src/main/org/hornetq/core/protocol/stomp and 1 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-02-15 09:51:59 -0500 (Mon, 15 Feb 2010) New Revision: 8874 Modified: trunk/docs/user-manual/en/interoperability.xml trunk/src/main/org/hornetq/core/protocol/stomp/StompFrame.java trunk/src/main/org/hornetq/core/protocol/stomp/StompMarshaller.java trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * added missing calls to coordinate with the storageManager * added support for no-local header Modified: trunk/docs/user-manual/en/interoperability.xml =================================================================== --- trunk/docs/user-manual/en/interoperability.xml 2010-02-15 11:07:59 UTC (rev 8873) +++ trunk/docs/user-manual/en/interoperability.xml 2010-02-15 14:51:59 UTC (rev 8874) @@ -89,7 +89,7 @@ </programlisting> </listitem> <listitem> - <para>send or subscribe to a JMS <emphasis>Queue</emphasis> by prepending the topic name by <literal>jms.topic.</literal>.</para> + <para>send or subscribe to a JMS <emphasis>Topic</emphasis> by prepending the topic name by <literal>jms.topic.</literal>.</para> <para>For example to subscribe to the <literal>stocks</literal> JMS Topic, the Stomp client must send the frame:</para> <programlisting> SUBSCRIBE Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompFrame.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompFrame.java 2010-02-15 11:07:59 UTC (rev 8873) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompFrame.java 2010-02-15 14:51:59 UTC (rev 8874) @@ -35,6 +35,8 @@ private byte[] content = StompFrame.NO_DATA; + private int size = -1; + public StompFrame() { this.headers = new HashMap<String, Object>(); @@ -62,9 +64,25 @@ return headers; } + public int getEncodedSize() + { + if (size == -1) + { + throw new IllegalStateException("Frame has not been encoded yet"); + } + + return size ; + } + + public void setEncodedSize(int size) + { + this.size = size; + } + @Override public String toString() { return "StompFrame[command=" + command + ", headers=" + headers + ", content-length=" + content.length + "]"; } + } Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompMarshaller.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompMarshaller.java 2010-02-15 11:07:59 UTC (rev 8873) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompMarshaller.java 2010-02-15 14:51:59 UTC (rev 8874) @@ -62,7 +62,9 @@ DataOutputStream dos = new DataOutputStream(baos); marshal(command, dos); dos.close(); - return baos.toByteArray(); + byte[] bytes = baos.toByteArray(); + command.setEncodedSize(bytes.length); + return bytes; } public void marshal(StompFrame stomp, DataOutput os) throws IOException Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-02-15 11:07:59 UTC (rev 8873) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-02-15 14:51:59 UTC (rev 8874) @@ -27,10 +27,12 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerSession; @@ -52,18 +54,21 @@ private static final Logger log = Logger.getLogger(StompProtocolManager.class); + // TODO use same value than HornetQConnection + private static final String CONNECTION_ID_PROP = "__HQ_CID"; + // Attributes ---------------------------------------------------- private final HornetQServer server; private final StompMarshaller marshaller; + private final Executor executor; + private final Map<String, StompSession> transactedSessions = new HashMap<String, StompSession>(); private final Map<RemotingConnection, StompSession> sessions = new HashMap<RemotingConnection, StompSession>(); - private Executor executor; - // Static -------------------------------------------------------- private static StompFrame createError(Exception e, StompFrame request) @@ -129,7 +134,14 @@ { public void run() { - doHandleBuffer(connection, buffer); + try + { + doHandleBuffer(connection, buffer); + } + finally + { + server.getStorageManager().clearContext(); + } } }); } @@ -240,7 +252,22 @@ String selector = (String)headers.get(Stomp.Headers.Subscribe.SELECTOR); String ack = (String)headers.get(Stomp.Headers.Subscribe.ACK_MODE); String id = (String)headers.get(Stomp.Headers.Subscribe.ID); - + boolean noLocal = false; + if (headers.containsKey(Stomp.Headers.Subscribe.NO_LOCAL)) + { + noLocal = Boolean.parseBoolean((String)headers.get(Stomp.Headers.Subscribe.NO_LOCAL)); + } + if (noLocal) + { + String noLocalFilter = CONNECTION_ID_PROP + " <> '" + connection.getID().toString() + "'"; + if (selector == null) + { + selector = noLocalFilter; + } else + { + selector += " AND " + noLocalFilter; + } + } if (ack == null) { ack = Stomp.Headers.Subscribe.AckModeValues.AUTO; @@ -259,11 +286,13 @@ subscriptionID = "subscription/" + destination; } StompSession stompSession = getSession(connection); + stompSession.setNoLocal(noLocal); if (stompSession.containsSubscription(subscriptionID)) { throw new StompException("There already is a subscription for: " + subscriptionID + ". Either use unique subscription IDs or do not create multiple subscriptions for the same destination"); } + server.getStorageManager().setContext(stompSession.getContext()); long consumerID = server.getStorageManager().generateUniqueID(); stompSession.addSubscription(consumerID, subscriptionID, destination, selector, ack); @@ -291,6 +320,7 @@ } StompSession stompSession = getSession(connection); + server.getStorageManager().setContext(stompSession.getContext()); boolean unsubscribed = stompSession.unsubscribe(subscriptionID); if (!unsubscribed) { @@ -310,6 +340,7 @@ log.warn("Transactional acknowledgement is not supported"); } stompSession = getSession(connection); + server.getStorageManager().setContext(stompSession.getContext()); stompSession.acknowledge(messageID); return null; @@ -386,7 +417,7 @@ StompSession stompSession = sessions.get(connection); if (stompSession == null) { - stompSession = new StompSession(connection, this); + stompSession = new StompSession(connection, this, server.getStorageManager().newContext(executor)); String name = UUIDGenerator.getInstance().generateStringUUID(); ServerSession session = server.createSession(name, connection.getLogin(), @@ -409,7 +440,7 @@ StompSession stompSession = transactedSessions.get(txID); if (stompSession == null) { - stompSession = new StompSession(connection, this); + stompSession = new StompSession(connection, this, server.getStorageManager().newContext(executor)); String name = UUIDGenerator.getInstance().generateStringUUID(); ServerSession session = server.createSession(name, connection.getLogin(), @@ -490,17 +521,21 @@ message.getBodyBuffer().writeBytes(content); } - ServerSession session = null; + StompSession stompSession = null; if (txID == null) { - session = getSession(connection).getSession(); + stompSession = getSession(connection); } else { - session = transactedSessions.get(txID).getSession(); + stompSession = transactedSessions.get(txID); } - - session.send(message); + server.getStorageManager().setContext(stompSession.getContext()); + if (stompSession.isNoLocal()) + { + message.putStringProperty(CONNECTION_ID_PROP, connection.getID().toString()); + } + stompSession.getSession().send(message); return null; } @@ -528,32 +563,23 @@ return new StompFrame(Stomp.Responses.CONNECTED, h, StompMarshaller.NO_DATA); } - public int send(StompConnection connection, StompFrame frame) + public void send(final StompConnection connection, final StompFrame frame) { - if (log.isTraceEnabled()) + server.getStorageManager().afterCompleteOperations(new IOAsyncTask() { - log.trace("sent " + frame); - } - synchronized (connection) - { - if (connection.isDestroyed() || !connection.isValid()) + public void onError(final int errorCode, final String errorMessage) { - log.warn("Connection closed " + connection); - return 0; + log.warn("Error processing IOCallback code = " + errorCode + " message = " + errorMessage); + + StompFrame error = createError(new HornetQException(errorCode, errorMessage), frame); + doSend(connection, error); } - try + + public void done() { - byte[] bytes = marshaller.marshal(frame); - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); - connection.getTransportConnection().write(buffer, true); - return bytes.length; + doSend(connection, frame); } - catch (IOException e) - { - log.error("Unable to send frame " + frame, e); - return 0; - } - } + }); } public void cleanup(StompConnection connection) @@ -597,6 +623,31 @@ } } } + + private void doSend(final StompConnection connection, final StompFrame frame) + { + if (log.isTraceEnabled()) + { + log.trace("sent " + frame); + } + synchronized (connection) + { + if (connection.isDestroyed() || !connection.isValid()) + { + log.warn("Connection closed " + connection); + } + try + { + byte[] bytes = marshaller.marshal(frame); + HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); + connection.getTransportConnection().write(buffer, true); + } + catch (IOException e) + { + log.error("Unable to send frame " + frame, e); + } + } + } // Inner classes ------------------------------------------------- } Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java 2010-02-15 11:07:59 UTC (rev 8873) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java 2010-02-15 14:51:59 UTC (rev 8874) @@ -21,6 +21,7 @@ import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.core.message.impl.MessageImpl; +import org.hornetq.core.persistence.OperationContext; import org.hornetq.core.protocol.stomp.Stomp.Headers; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.ServerSession; @@ -41,15 +42,20 @@ private ServerSession session; + private final OperationContext sessionContext; + private final Map<Long, StompSubscription> subscriptions = new HashMap<Long, StompSubscription>(); // key = message ID, value = consumer ID private final Map<Long, Long> messagesToAck = new HashMap<Long, Long>(); - StompSession(final StompConnection connection, final StompProtocolManager manager) + private boolean noLocal = false; + + StompSession(final StompConnection connection, final StompProtocolManager manager, OperationContext sessionContext) { this.connection = connection; this.manager = manager; + this.sessionContext = sessionContext; } void setServerSession(ServerSession session) @@ -102,8 +108,9 @@ StompFrame frame = new StompFrame(Stomp.Responses.MESSAGE, headers, data); StompUtils.copyStandardHeadersFromMessageToFrame(serverMessage, frame, deliveryCount); - int length = manager.send(connection, frame); - + manager.send(connection, frame); + int size = frame.getEncodedSize(); + if (subscription.getAck().equals(Stomp.Headers.Subscribe.AckModeValues.AUTO)) { session.acknowledge(consumerID, serverMessage.getMessageID()); @@ -113,7 +120,7 @@ { messagesToAck.put(serverMessage.getMessageID(), consumerID); } - return length; + return size; } catch (Exception e) @@ -201,4 +208,19 @@ { return connection; } + + public OperationContext getContext() + { + return sessionContext; + } + + public boolean isNoLocal() + { + return noLocal; + } + + public void setNoLocal(boolean noLocal) + { + this.noLocal = noLocal; + } } \ No newline at end of file Modified: trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-02-15 11:07:59 UTC (rev 8873) +++ trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-02-15 14:51:59 UTC (rev 8874) @@ -1143,6 +1143,59 @@ sendFrame(frame); } + public void testSubscribeToTopicWithNoLocal() throws Exception { + + String frame = + "CONNECT\n" + + "login: brianm\n" + + "passcode: wombats\n\n" + + Stomp.NULL; + sendFrame(frame); + + frame = receiveFrame(100000); + Assert.assertTrue(frame.startsWith("CONNECTED")); + + frame = + "SUBSCRIBE\n" + + "destination:" + getTopicPrefix() + getTopicName() + "\n" + + "receipt: 12\n" + + "no-local: true\n" + + "\n\n" + + Stomp.NULL; + sendFrame(frame); + // wait for SUBSCRIBE's receipt + frame = receiveFrame(10000); + Assert.assertTrue(frame.startsWith("RECEIPT")); + + // send a message on the same connection => it should not be received + frame = "SEND\n" + + "destination:" + getTopicPrefix() + getTopicName() + "\n\n" + + "Hello World" + + Stomp.NULL; + sendFrame(frame); + + try { + frame = receiveFrame(2000); + log.info("Received frame: " + frame); + Assert.fail("No message should have been received since subscription is noLocal"); + } + catch (SocketTimeoutException e) { + } + + // send message on another JMS connection => it should be received + sendMessage(getName(), topic); + frame = receiveFrame(10000); + Assert.assertTrue(frame.startsWith("MESSAGE")); + Assert.assertTrue(frame.indexOf("destination:") > 0); + Assert.assertTrue(frame.indexOf(getName()) > 0); + + frame = + "DISCONNECT\n" + + "\n\n" + + Stomp.NULL; + sendFrame(frame); + } + public void testClientAckNotPartOfTransaction() throws Exception { String frame =

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8873 - trunk/tests/src/org/hornetq/tests/integration/journal.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-02-15 06:07:59 -0500 (Mon, 15 Feb 2010) New Revision: 8873 Added: trunk/tests/src/org/hornetq/tests/integration/journal/JournalPerfTuneTest.java Log: PerfTuneTest Added: trunk/tests/src/org/hornetq/tests/integration/journal/JournalPerfTuneTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/JournalPerfTuneTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/integration/journal/JournalPerfTuneTest.java 2010-02-15 11:07:59 UTC (rev 8873) @@ -0,0 +1,256 @@ +/* + * Copyright 2010 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.journal; + +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicLong; + +import junit.framework.TestSuite; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.journal.IOCompletion; +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.SequentialFileFactory; +import org.hornetq.core.journal.impl.AIOSequentialFileFactory; +import org.hornetq.core.journal.impl.JournalImpl; +import org.hornetq.core.logging.Logger; +import org.hornetq.tests.integration.cluster.failover.LargeMessageFailoverTest; +import org.hornetq.tests.util.UnitTestCase; +import org.hornetq.utils.DataConstants; + +/** + * A JournalPerfTuneTest + * + * @author tim + * + * + */ +public class JournalPerfTuneTest extends UnitTestCase +{ + private static final Logger log = Logger.getLogger(JournalPerfTuneTest.class); + + private Journal journal; + + public static TestSuite suite() + { + TestSuite suite = new TestSuite(); + return suite; + } + + protected void setUp() throws Exception + { + super.setUp(); + + final int fileSize = 1024 * 1024 * 10; + final int minFiles = 10; + final int compactMinFiles = 20; + final int compactPercentage = 30; + final String filePrefix = "data"; + final String extension = "hq"; + final int maxIO = 500; + + final String journalDir = "/jbm-data/journal-test"; + final int bufferSize = 490 * 1024; + final int bufferTimeout = (int)(1000000000d / 2000); + final boolean logRates = true; + + super.recreateDirectory(journalDir); + + SequentialFileFactory fileFactory = new AIOSequentialFileFactory(journalDir, bufferSize, bufferTimeout, logRates); + + journal = new JournalImpl(fileSize, + minFiles, + compactMinFiles, + compactPercentage, + fileFactory, + filePrefix, + extension, + maxIO); + + journal.start(); + + class LoaderCB implements LoaderCallback + { + + public void addPreparedTransaction(PreparedTransactionInfo preparedTransaction) + { + // TODO Auto-generated method stub + + } + + public void addRecord(RecordInfo info) + { + // TODO Auto-generated method stub + + } + + public void deleteRecord(long id) + { + // TODO Auto-generated method stub + + } + + public void updateRecord(RecordInfo info) + { + // TODO Auto-generated method stub + + } + + public void failedTransaction(long transactionID, List<RecordInfo> records, List<RecordInfo> recordsToDelete) + { + // TODO Auto-generated method stub + + } + + } + + journal.load(new LoaderCB()); + } + + class TestCallback implements IOCompletion + { + private CountDownLatch latch; + + TestCallback(final int counts) + { + this.latch = new CountDownLatch(counts); + } + + public void await() throws Exception + { + latch.await(); + } + + public void storeLineUp() + { + } + + public void done() + { + latch.countDown(); + } + + public void onError(int errorCode, String errorMessage) + { + } + + } + + protected void tearDown() throws Exception + { + journal.stop(); + + super.tearDown(); + + } + + public void test1() throws Exception + { + final int itersPerThread = 10000000; + + final int numThreads = 1; + + this.callback = new TestCallback(2 * itersPerThread * numThreads); + + Worker[] workers = new Worker[numThreads]; + + for (int i = 0; i < numThreads; i++) + { + workers[i] = new Worker(itersPerThread); + + workers[i].start(); + } + + for (int i = 0; i < numThreads; i++) + { + workers[i].join(); + } + + callback.await(); + } + + private AtomicLong idGen = new AtomicLong(0); + + private TestCallback callback; + + class Worker extends Thread + { + final int iters; + + Worker(final int iters) + { + this.iters = iters; + } + + public void run() + { + try + { + Record record = new Record(new byte[256]); + + for (int i = 0; i < iters; i++) + { + long id = idGen.getAndIncrement(); + + journal.appendAddRecord(id, (byte)0, record, true, callback); + + journal.appendDeleteRecord(id, true, callback); + + // log.info("did " + i); + } + } + catch (Exception e) + { + log.error("Failed", e); + } + } + } + + static class Record implements EncodingSupport + { + private byte[] bytes; + + Record(byte[] bytes) + { + this.bytes = bytes; + } + + public void decode(HornetQBuffer buffer) + { + int length = buffer.readInt(); + + bytes = new byte[length]; + + buffer.readBytes(bytes); + } + + public void encode(HornetQBuffer buffer) + { + buffer.writeInt(bytes.length); + + buffer.writeBytes(bytes); + } + + public int getEncodeSize() + { + return DataConstants.SIZE_INT + bytes.length; + } + + } +}

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8872 - in trunk: src/main/org/hornetq/core/protocol/stomp and 1 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-02-15 05:06:00 -0500 (Mon, 15 Feb 2010) New Revision: 8872 Modified: trunk/docs/user-manual/en/interoperability.xml trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java trunk/src/main/org/hornetq/core/protocol/stomp/StompUtils.java trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * removed conversion from Stomp destinations to HornetQ addresses and queues. Stomp clients MUST use HornetQ semantics (address & queue, jms prefix) when setting Stomp destinations * added doc about Stomp/HornetQ/JMS destination mapping Modified: trunk/docs/user-manual/en/interoperability.xml =================================================================== --- trunk/docs/user-manual/en/interoperability.xml 2010-02-11 20:16:38 UTC (rev 8871) +++ trunk/docs/user-manual/en/interoperability.xml 2010-02-15 10:06:00 UTC (rev 8872) @@ -44,14 +44,6 @@ <para>Message acknowledgements are not transactional. The ACK frame can not be part of a transaction (it will be ignored if its <literal>transaction</literal> header is set).</para> </section> - <section> - <title>Destination Mapping</title> - <para>Stomp messages are sent and received by specifying "destinations". - If the Stomp destinations starts with <literal>/queue/</literal>, <literal>/topic/</literal>, - <literal>/temp-queue/</literal> or <literal>/temp-topic/</literal>, they will be mapped to corresponding - JMS Destinations. Ohterwise, they will be treated as regular HornetQ addresses (for sent messages) and - queues (for subscription and received messages).</para> - </section> </section> <section id="stompconnect"> <title>StompConnect</title> @@ -70,6 +62,46 @@ <para>Make sure this file is in the classpath along with the StompConnect jar and the HornetQ jars and simply run <literal>java org.codehaus.stomp.jms.Main</literal>.</para> </section> + <section> + <title>Mapping Stomp destinations to HornetQ addresses and queues</title> + <para>Stomp clients deals with <emphasis>destinations</emphasis> when sending messages and subscribing. + Destination names are simply strings which are mapped to some form of destination on the + server - how the server translates these is left to the server implementation.</para> + <para>In HornetQ, these destinations are mapped to <emphasis>addresses</emphasis> and <emphasis>queues</emphasis>. + When a Stomp client sends a message (using a <literal>SEND</literal> frame), the specified destination is mapped + to an address. + When a Stomp client subscribes (or unsubscribes) for a destination (using a <literal>SUBSCRIBE</literal> + or <literal>UNSUBSCRIBE</literal> frame), the destination is mapped to a HornetQ queue.</para> + <section> + <title>Using JMS destinations</title> + <para>As explained in <xref linkend="jms-core-mapping" />, JMS destinations are also mapped to HornetQ addresses and queues. + If you want to use Stomp to send messages to JMS destinations, the Stomp destinations must follow the same convention:</para> + <itemizedlist> + <listitem> + <para>send or subscribe to a JMS <emphasis>Queue</emphasis> by prepending the queue name by <literal>jms.queue.</literal>.</para> + <para>For example, to send a message to the <literal>orders</literal> JMS Queue, the Stomp client must send the frame:</para> + <programlisting> +SEND +destination:jms.queue.orders + +hello queue orders +^@ + </programlisting> + </listitem> + <listitem> + <para>send or subscribe to a JMS <emphasis>Queue</emphasis> by prepending the topic name by <literal>jms.topic.</literal>.</para> + <para>For example to subscribe to the <literal>stocks</literal> JMS Topic, the Stomp client must send the frame:</para> + <programlisting> +SUBSCRIBE +destination:jms.topic.stocks + +^@ + </programlisting> + </listitem> + </itemizedlist> + + </section> + </section> </section> <section> <title>REST</title> Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-02-11 20:16:38 UTC (rev 8871) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-02-15 10:06:00 UTC (rev 8872) @@ -258,7 +258,6 @@ } subscriptionID = "subscription/" + destination; } - String hornetqDestination = StompUtils.toHornetQAddress(destination); StompSession stompSession = getSession(connection); if (stompSession.containsSubscription(subscriptionID)) { @@ -266,7 +265,7 @@ ". Either use unique subscription IDs or do not create multiple subscriptions for the same destination"); } long consumerID = server.getStorageManager().generateUniqueID(); - stompSession.addSubscription(consumerID, subscriptionID, hornetqDestination, selector, ack); + stompSession.addSubscription(consumerID, subscriptionID, destination, selector, ack); return null; } @@ -467,7 +466,7 @@ { checkConnected(connection); Map<String, Object> headers = frame.getHeaders(); - String queue = (String)headers.remove(Stomp.Headers.Send.DESTINATION); + String destination = (String)headers.remove(Stomp.Headers.Send.DESTINATION); String txID = (String)headers.remove(Stomp.Headers.TRANSACTION); byte type = Message.TEXT_TYPE; if (headers.containsKey(Stomp.Headers.CONTENT_LENGTH)) @@ -475,12 +474,11 @@ type = Message.BYTES_TYPE; } long timestamp = System.currentTimeMillis(); - SimpleString address = SimpleString.toSimpleString(StompUtils.toHornetQAddress(queue)); ServerMessageImpl message = new ServerMessageImpl(server.getStorageManager().generateUniqueID(), 512); message.setType(type); message.setTimestamp(timestamp); - message.setAddress(address); + message.setAddress(SimpleString.toSimpleString(destination)); StompUtils.copyStandardHeadersFromFrameToMessage(frame, message); byte[] content = frame.getContent(); if (type == Message.TEXT_TYPE) Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java 2010-02-11 20:16:38 UTC (rev 8871) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompSession.java 2010-02-15 10:06:00 UTC (rev 8872) @@ -73,8 +73,7 @@ StompSubscription subscription = subscriptions.get(consumerID); Map<String, Object> headers = new HashMap<String, Object>(); - headers.put(Stomp.Headers.Message.DESTINATION, StompUtils.toStompDestination(serverMessage.getAddress() - .toString())); + headers.put(Stomp.Headers.Message.DESTINATION, serverMessage.getAddress().toString()); if (subscription.getID() != null) { headers.put(Stomp.Headers.Message.SUBSCRIPTION, subscription.getID()); @@ -150,7 +149,7 @@ public void addSubscription(long consumerID, String subscriptionID, String destination, String selector, String ack) throws Exception { SimpleString queue = SimpleString.toSimpleString(destination); - if (destination.startsWith(StompUtils.HQ_TOPIC_PREFIX)) + if (destination.startsWith("jms.topic")) { // subscribes to a topic queue = UUIDGenerator.getInstance().generateSimpleStringUUID(); Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompUtils.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompUtils.java 2010-02-11 20:16:38 UTC (rev 8871) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompUtils.java 2010-02-15 10:06:00 UTC (rev 8872) @@ -18,7 +18,6 @@ import java.util.Map; import java.util.Set; -import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.core.client.impl.ClientMessageImpl; @@ -33,94 +32,12 @@ */ class StompUtils { - - public static String HQ_QUEUE_PREFIX = "jms.queue."; - - public static String STOMP_QUEUE_PREFIX = "/queue/"; - - public static String HQ_TEMP_QUEUE_PREFIX = "jms.tempqueue."; - - public static String STOMP_TEMP_QUEUE_PREFIX = "/temp-queue/"; - - public static String HQ_TOPIC_PREFIX = "jms.topic."; - - public static String STOMP_TOPIC_PREFIX = "/topic/"; - - public static String HQ_TEMP_TOPIC_PREFIX = "jms.temptopic."; - - public static String STOMP_TEMP_TOPIC_PREFIX = "/temp-topic/"; - // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- // Static -------------------------------------------------------- - public static String toHornetQAddress(String stompDestination) throws HornetQException - { - if (stompDestination == null) - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); - } - else if (stompDestination.startsWith(STOMP_QUEUE_PREFIX)) - { - return convert(stompDestination, STOMP_QUEUE_PREFIX, HQ_QUEUE_PREFIX); - } - else if (stompDestination.startsWith(STOMP_TOPIC_PREFIX)) - { - return convert(stompDestination, STOMP_TOPIC_PREFIX, HQ_TOPIC_PREFIX); - } - else if (stompDestination.startsWith(STOMP_TEMP_QUEUE_PREFIX)) - { - return convert(stompDestination, STOMP_TEMP_QUEUE_PREFIX, HQ_TEMP_QUEUE_PREFIX); - } - else if (stompDestination.startsWith(STOMP_TEMP_TOPIC_PREFIX)) - { - return convert(stompDestination, STOMP_TEMP_TOPIC_PREFIX, HQ_TEMP_TOPIC_PREFIX); - } - else - { - // it is also possible the STOMP client send a message directly to a HornetQ address - // in that case, we do nothing: - return stompDestination; - } - } - - public static String toStompDestination(String hornetqAddress) throws HornetQException - { - if (hornetqAddress == null) - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); - } - else if (hornetqAddress.startsWith(HQ_QUEUE_PREFIX)) - { - return convert(hornetqAddress, HQ_QUEUE_PREFIX, STOMP_QUEUE_PREFIX); - } - else if (hornetqAddress.startsWith(HQ_TOPIC_PREFIX)) - { - return convert(hornetqAddress, HQ_TOPIC_PREFIX, STOMP_TOPIC_PREFIX); - } - else if (hornetqAddress.startsWith(HQ_TEMP_QUEUE_PREFIX)) - { - return convert(hornetqAddress, HQ_TEMP_QUEUE_PREFIX, STOMP_TEMP_QUEUE_PREFIX); - } - else if (hornetqAddress.startsWith(HQ_TEMP_TOPIC_PREFIX)) - { - return convert(hornetqAddress, HQ_TEMP_TOPIC_PREFIX, STOMP_TEMP_TOPIC_PREFIX); - } - else - { - // do nothing - return hornetqAddress; - } - } - - private static String convert(String str, String oldPrefix, String newPrefix) - { - String sub = str.substring(oldPrefix.length(), str.length()); - return new String(newPrefix + sub); - } - public static void copyStandardHeadersFromFrameToMessage(StompFrame frame, ServerMessageImpl msg) throws Exception { Map<String, Object> headers = new HashMap<String, Object>(frame.getHeaders()); @@ -144,12 +61,17 @@ { msg.putStringProperty(Message.HDR_GROUP_ID, SimpleString.toSimpleString(groupID)); } - Object o = headers.remove(Stomp.Headers.Send.REPLY_TO); - if (o != null) + Object replyTo = headers.remove(Stomp.Headers.Send.REPLY_TO); + if (replyTo != null) { - msg.putStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME, SimpleString.toSimpleString((String)o)); + msg.putStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME, SimpleString.toSimpleString((String)replyTo)); } - + String expiration = (String)headers.remove(Stomp.Headers.Send.REPLY_TO); + if (expiration != null) + { + msg.setExpiration(Long.parseLong(expiration)); + } + // now the general headers for (Iterator<Map.Entry<String, Object>> iter = headers.entrySet().iterator(); iter.hasNext();) { @@ -163,7 +85,7 @@ public static void copyStandardHeadersFromMessageToFrame(Message message, StompFrame command, int deliveryCount) throws Exception { final Map<String, Object> headers = command.getHeaders(); - headers.put(Stomp.Headers.Message.DESTINATION, toStompDestination(message.getAddress().toString())); + headers.put(Stomp.Headers.Message.DESTINATION, message.getAddress().toString()); headers.put(Stomp.Headers.Message.MESSAGE_ID, message.getMessageID()); if (message.getObjectProperty("JMSCorrelationID") != null) @@ -173,11 +95,10 @@ headers.put(Stomp.Headers.Message.EXPIRATION_TIME, "" + message.getExpiration()); headers.put(Stomp.Headers.Message.REDELIVERED, deliveryCount > 1); headers.put(Stomp.Headers.Message.PRORITY, "" + message.getPriority()); - if (message.getStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME) != null) { headers.put(Stomp.Headers.Message.REPLY_TO, - toStompDestination(message.getStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME))); + message.getStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME)); } headers.put(Stomp.Headers.Message.TIMESTAMP, "" + message.getTimestamp()); Modified: trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-02-11 20:16:38 UTC (rev 8871) +++ trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-02-15 10:06:00 UTC (rev 8872) @@ -103,7 +103,7 @@ // sending a message will result in an error String frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n\n" + "Hello World" + Stomp.NULL; try { @@ -131,7 +131,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n\n" + "Hello World" + Stomp.NULL; @@ -164,7 +164,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "receipt: 1234\n\n" + "Hello World" + Stomp.NULL; @@ -204,7 +204,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "content-length:" + data.length + "\n\n" + new String(data) + Stomp.NULL; @@ -242,7 +242,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "JMSXGroupID: TEST\n\n" + "Hello World" + Stomp.NULL; @@ -273,7 +273,7 @@ "SEND\n" + "foo:abc\n" + "bar:123\n" + - "destination:/queue/" + getQueueName() + "\n\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n\n" + "Hello World" + Stomp.NULL; @@ -309,7 +309,7 @@ "JMSXGroupID:abc\n" + "foo:abc\n" + "bar:123\n" + - "destination:/queue/" + getQueueName() + "\n\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n\n" + "Hello World" + Stomp.NULL; @@ -344,7 +344,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:auto\n\n" + Stomp.NULL; sendFrame(frame); @@ -383,7 +383,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:auto\n\n" + Stomp.NULL; sendFrame(frame); @@ -423,7 +423,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:auto\n\n" + Stomp.NULL; sendFrame(frame); @@ -476,7 +476,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:auto\n" + "id: mysubid\n\n" + Stomp.NULL; @@ -513,7 +513,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:auto\n\n" + Stomp.NULL; sendFrame(frame); @@ -562,7 +562,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "selector: foo = 'zzz'\n" + "ack:auto\n\n" + Stomp.NULL; @@ -596,7 +596,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:client\n\n" + Stomp.NULL; @@ -642,7 +642,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:client\n\n" + Stomp.NULL; @@ -687,7 +687,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:client\n\n" + Stomp.NULL; @@ -726,7 +726,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n\n" + Stomp.NULL; sendFrame(frame); @@ -756,7 +756,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "receipt: 1234\n\n" + Stomp.NULL; @@ -786,7 +786,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:auto\n\n" + Stomp.NULL; sendFrame(frame); @@ -801,7 +801,7 @@ //remove suscription frame = "UNSUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "receipt:567\n" + "\n\n" + Stomp.NULL; @@ -834,7 +834,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "id: mysubid\n" + "ack:auto\n\n" + Stomp.NULL; @@ -892,7 +892,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "transaction: tx1\n" + "receipt: 123\n" + "\n\n" + @@ -940,7 +940,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "transaction: tx1\n" + "\n\n" + "Hello World" + @@ -967,7 +967,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "transaction: tx1\n" + "\n\n" + "Hello World" + @@ -1038,7 +1038,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "transaction: tx1\n" + "\n" + "first message" + @@ -1062,7 +1062,7 @@ frame = "SEND\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "transaction: tx1\n" + "\n" + "second message" + @@ -1098,7 +1098,7 @@ frame = "SUBSCRIBE\n" + - "destination:/topic/" + getTopicName() + "\n" + + "destination:" + getTopicPrefix() + getTopicName() + "\n" + "receipt: 12\n" + "\n\n" + Stomp.NULL; @@ -1116,7 +1116,7 @@ frame = "UNSUBSCRIBE\n" + - "destination:/topic/" + getTopicName() + "\n" + + "destination:" + getTopicPrefix() + getTopicName() + "\n" + "receipt: 1234\n" + "\n\n" + Stomp.NULL; @@ -1157,7 +1157,7 @@ frame = "SUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "ack:client\n" + "\n\n" + Stomp.NULL; @@ -1208,7 +1208,7 @@ frame = "UNSUBSCRIBE\n" + - "destination:/queue/" + getQueueName() + "\n" + + "destination:" + getQueuePrefix() + getQueueName() + "\n" + "\n\n" + Stomp.NULL; sendFrame(frame); @@ -1301,10 +1301,18 @@ return "test"; } + protected String getQueuePrefix() { + return "jms.queue."; + } + protected String getTopicName() { return "testtopic"; } - + + protected String getTopicPrefix() { + return "jms.topic."; + } + public void sendFrame(String data) throws Exception { byte[] bytes = data.getBytes("UTF-8"); OutputStream outputStream = stompSocket.getOutputStream();

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8871 - in trunk: src/main/org/hornetq/core/server/impl and 5 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-02-11 15:16:38 -0500 (Thu, 11 Feb 2010) New Revision: 8871 Added: trunk/src/main/org/hornetq/jms/server/config/impl/JMSQueueConfigurationImpl.java Removed: trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java Log: Configuration changes for AS integration Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java =================================================================== --- trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-02-10 23:37:24 UTC (rev 8870) +++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-02-11 20:16:38 UTC (rev 8871) @@ -38,7 +38,7 @@ import org.hornetq.jms.server.config.JMSQueueConfiguration; 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.JMSQueueConfigurationImpl; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.jnp.server.Main; import org.jnp.server.NamingBeanImpl; @@ -96,7 +96,7 @@ jmsConfig.getConnectionFactoryConfigurations().add(cfConfig); // Step 7. Configure the JMS Queue - JMSQueueConfiguration queueConfig = new QueueConfigurationImpl("queue1", null, false, "/queue/queue1"); + JMSQueueConfiguration queueConfig = new JMSQueueConfigurationImpl("queue1", null, false, "/queue/queue1"); jmsConfig.getQueueConfigurations().add(queueConfig); // Step 8. Start the JMS Server using the HornetQ core server and the JMS configuration Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-02-10 23:37:24 UTC (rev 8870) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-02-11 20:16:38 UTC (rev 8871) @@ -165,7 +165,7 @@ private volatile ExecutorFactory executorFactory; - private volatile HierarchicalRepository<Set<Role>> securityRepository; + private final HierarchicalRepository<Set<Role>> securityRepository; private volatile ResourceManager resourceManager; @@ -258,6 +258,11 @@ addressSettingsRepository = new HierarchicalObjectRepository<AddressSettings>(); addressSettingsRepository.setDefault(new AddressSettings()); + + securityRepository = new HierarchicalObjectRepository<Set<Role>>(); + + securityRepository.setDefault(new HashSet<Role>()); + } // lifecycle methods @@ -429,12 +434,15 @@ { memoryManager.stop(); } + + addressSettingsRepository.clear(); + + securityRepository.clear(); pagingManager = null; securityStore = null; resourceManager = null; postOffice = null; - securityRepository = null; securityStore = null; queueFactory = null; resourceManager = null; @@ -925,9 +933,6 @@ storageManager = createStorageManager(); - securityRepository = new HierarchicalObjectRepository<Set<Role>>(); - securityRepository.setDefault(new HashSet<Role>()); - if (ConfigurationImpl.DEFAULT_CLUSTER_USER.equals(configuration.getClusterUser()) && ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD.equals(configuration.getClusterPassword())) { log.warn("Security risk! It has been detected that the cluster admin user and password " + "have not been changed from the installation default. " Copied: trunk/src/main/org/hornetq/jms/server/config/impl/JMSQueueConfigurationImpl.java (from rev 8870, trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/JMSQueueConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/JMSQueueConfigurationImpl.java 2010-02-11 20:16:38 UTC (rev 8871) @@ -0,0 +1,89 @@ +/* + * 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.JMSQueueConfiguration; + + +/** + * A QueueConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class JMSQueueConfigurationImpl implements JMSQueueConfiguration +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final String name; + + private final String selector; + + private final boolean durable; + + private final String[] bindings; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public JMSQueueConfigurationImpl(final String name, + final String selector, + final boolean durable, + final 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 ------------------------------------------------- + +} Deleted: trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java 2010-02-10 23:37:24 UTC (rev 8870) +++ trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java 2010-02-11 20:16:38 UTC (rev 8871) @@ -1,89 +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.jms.server.config.impl; - -import org.hornetq.jms.server.config.JMSQueueConfiguration; - - -/** - * A QueueConfigurationImpl - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * - */ -public class QueueConfigurationImpl implements JMSQueueConfiguration -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private final String name; - - private final String selector; - - private final boolean durable; - - private final String[] bindings; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public QueueConfigurationImpl(final String name, - final String selector, - final boolean durable, - final 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 ------------------------------------------------- - -} Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-02-10 23:37:24 UTC (rev 8870) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-02-11 20:16:38 UTC (rev 8871) @@ -31,7 +31,7 @@ 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.JMSQueueConfigurationImpl; import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; import org.hornetq.utils.XMLConfigurationUtil; import org.hornetq.utils.XMLUtil; @@ -436,7 +436,7 @@ final boolean durable, final String[] jndiArray) { - return new QueueConfigurationImpl(queueName, selectorString, durable, jndiArray); + return new JMSQueueConfigurationImpl(queueName, selectorString, durable, jndiArray); } /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-02-10 23:37:24 UTC (rev 8870) +++ trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-02-11 20:16:38 UTC (rev 8871) @@ -45,7 +45,7 @@ import org.hornetq.jms.server.config.JMSConfiguration; 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.JMSQueueConfigurationImpl; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.UnitTestCase; @@ -164,7 +164,7 @@ JMSConfiguration configuration = new JMSConfigurationImpl(); context = new InVMContext(); configuration.setContext(context); - configuration.getQueueConfigurations().add(new QueueConfigurationImpl(queueName, null, false, queueName)); + configuration.getQueueConfigurations().add(new JMSQueueConfigurationImpl(queueName, null, false, queueName)); ConnectionFactoryConfiguration cfConfig = new ConnectionFactoryConfigurationImpl("cf", new TransportConfiguration(NettyConnectorFactory.class.getName()), Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java 2010-02-10 23:37:24 UTC (rev 8870) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java 2010-02-11 20:16:38 UTC (rev 8871) @@ -32,7 +32,7 @@ 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.JMSQueueConfigurationImpl; import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; @@ -72,7 +72,7 @@ "/cf/binding1", "/cf/binding2"); jmsConfiguration.getConnectionFactoryConfigurations().add(cfConfig); - QueueConfigurationImpl queueConfig = new QueueConfigurationImpl(RandomUtil.randomString(), + JMSQueueConfigurationImpl queueConfig = new JMSQueueConfigurationImpl(RandomUtil.randomString(), null, false, "/queue/binding1", Modified: trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-02-10 23:37:24 UTC (rev 8870) +++ trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-02-11 20:16:38 UTC (rev 8871) @@ -58,7 +58,7 @@ import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.config.JMSConfiguration; import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.QueueConfigurationImpl; +import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl; import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.spi.core.protocol.ProtocolType; @@ -1258,7 +1258,7 @@ HornetQServer hornetQServer = HornetQServers.newHornetQServer(config); JMSConfiguration jmsConfig = new JMSConfigurationImpl(); - jmsConfig.getQueueConfigurations().add(new QueueConfigurationImpl(getQueueName(), null, false, getQueueName())); + jmsConfig.getQueueConfigurations().add(new JMSQueueConfigurationImpl(getQueueName(), null, false, getQueueName())); jmsConfig.getTopicConfigurations().add(new TopicConfigurationImpl(getTopicName(), getTopicName())); server = new JMSServerManagerImpl(hornetQServer, jmsConfig); server.setContext(null);

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8870 - trunk/tests/config.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-02-10 18:37:24 -0500 (Wed, 10 Feb 2010) New Revision: 8870 Modified: trunk/tests/config/server-start-stop-config1.xml Log: quick fix for while I'm investigating a failure on JMSServerStartStop test Modified: trunk/tests/config/server-start-stop-config1.xml =================================================================== --- trunk/tests/config/server-start-stop-config1.xml 2010-02-10 20:03:59 UTC (rev 8869) +++ trunk/tests/config/server-start-stop-config1.xml 2010-02-10 23:37:24 UTC (rev 8870) @@ -23,9 +23,11 @@ <address>myAddress</address> </queue> +  </queues> </configuration>

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8869 - in trunk: examples/jms/embedded/src/org/hornetq/jms/example and 25 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-02-10 15:03:59 -0500 (Wed, 10 Feb 2010) New Revision: 8869 Added: trunk/src/main/org/hornetq/core/config/BridgeConfiguration.java trunk/src/main/org/hornetq/core/config/BroadcastGroupConfiguration.java trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java trunk/src/main/org/hornetq/core/config/CoreQueueConfiguration.java trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java trunk/src/main/org/hornetq/core/config/DivertConfiguration.java trunk/src/main/org/hornetq/jms/server/config/JMSQueueConfiguration.java Removed: trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java Modified: trunk/build-hornetq.xml trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java trunk/src/main/org/hornetq/core/config/Configuration.java trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/core/server/management/ManagementService.java trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java trunk/src/main/org/hornetq/jms/server/JMSServerConfigParser.java trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.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/impl/JMSServerConfigParserImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java Log: Moving Configuration objects Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/build-hornetq.xml 2010-02-10 20:03:59 UTC (rev 8869) @@ -1504,6 +1504,7 @@ <target name="runServer" depends="jar"> <mkdir dir="logs"/> + <property name="server.config" value="${src.config.trunk.non-clustered.dir}"/> <java classname="org.hornetq.integration.bootstrap.HornetQBootstrapServer" fork="true"> <jvmarg value="-XX:+UseParallelGC"/> <jvmarg value="-Xms512M"/> @@ -1515,7 +1516,7 @@ <jvmarg value="-Djava.library.path=${native.bin.dir}"/>  <arg line="hornetq-beans.xml"/> - <classpath path="${src.config.trunk.non-clustered.dir}" /> + <classpath path="${server.config}" /> <classpath refid="jms.standalone.server.classpath"/> </java> </target> @@ -1542,6 +1543,7 @@ </target> <target name="debugServer" depends="jar"> + <property name="server.config" value="${src.config.trunk.non-clustered.dir}"/> <mkdir dir="logs"/> <java classname="org.hornetq.integration.bootstrap.HornetQBootstrapServer" fork="true"> <jvmarg value="-XX:+UseParallelGC"/> @@ -1554,7 +1556,7 @@ <jvmarg value="-Djava.library.path=${native.bin.dir}"/> <jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/> <arg line="hornetq-beans.xml"/> - <classpath path="${src.config.trunk.non-clustered.dir}" /> + <classpath path="${server.config}" /> <classpath refid="jms.standalone.server.classpath"/> </java> </target> Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java =================================================================== --- trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -35,7 +35,7 @@ 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.JMSQueueConfiguration; import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; import org.hornetq.jms.server.config.impl.QueueConfigurationImpl; @@ -96,7 +96,7 @@ jmsConfig.getConnectionFactoryConfigurations().add(cfConfig); // Step 7. Configure the JMS Queue - QueueConfiguration queueConfig = new QueueConfigurationImpl("queue1", null, false, "/queue/queue1"); + JMSQueueConfiguration 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 Copied: trunk/src/main/org/hornetq/core/config/BridgeConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/BridgeConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/BridgeConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -0,0 +1,326 @@ +/* + * 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.config; + +import java.io.Serializable; + +import org.hornetq.api.core.Pair; + +/** + * A BridgeConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 13 Jan 2009 09:32:43 + * + * + */ +public class BridgeConfiguration implements Serializable +{ + private static final long serialVersionUID = -1057244274380572226L; + + private String name; + + private String queueName; + + private String forwardingAddress; + + private String filterString; + + private Pair<String, String> connectorPair; + + private String discoveryGroupName; + + private String transformerClassName; + + private long retryInterval; + + private double retryIntervalMultiplier; + + private int reconnectAttempts; + + private boolean failoverOnServerShutdown; + + private boolean useDuplicateDetection; + + private int confirmationWindowSize; + + private final long clientFailureCheckPeriod; + + private String user; + + private String password; + + public BridgeConfiguration(final String name, + final String queueName, + final String forwardingAddress, + final String filterString, + final String transformerClassName, + final long retryInterval, + final double retryIntervalMultiplier, + final int reconnectAttempts, + final boolean failoverOnServerShutdown, + final boolean useDuplicateDetection, + final int confirmationWindowSize, + final long clientFailureCheckPeriod, + final Pair<String, String> connectorPair, + final String user, + final String password) + { + this.name = name; + this.queueName = queueName; + this.forwardingAddress = forwardingAddress; + this.filterString = filterString; + this.transformerClassName = transformerClassName; + this.retryInterval = retryInterval; + this.retryIntervalMultiplier = retryIntervalMultiplier; + this.reconnectAttempts = reconnectAttempts; + this.failoverOnServerShutdown = failoverOnServerShutdown; + this.useDuplicateDetection = useDuplicateDetection; + this.confirmationWindowSize = confirmationWindowSize; + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + this.connectorPair = connectorPair; + this.user = user; + this.password = password; + discoveryGroupName = null; + } + + public BridgeConfiguration(final String name, + final String queueName, + final String forwardingAddress, + final String filterString, + final String transformerClassName, + final long retryInterval, + final double retryIntervalMultiplier, + final int reconnectAttempts, + final boolean failoverOnServerShutdown, + final boolean useDuplicateDetection, + final int confirmationWindowSize, + final long clientFailureCheckPeriod, + final String discoveryGroupName, + final String user, + final String password) + { + this.name = name; + this.queueName = queueName; + this.forwardingAddress = forwardingAddress; + this.filterString = filterString; + this.transformerClassName = transformerClassName; + this.retryInterval = retryInterval; + this.retryIntervalMultiplier = retryIntervalMultiplier; + this.reconnectAttempts = reconnectAttempts; + this.failoverOnServerShutdown = failoverOnServerShutdown; + this.useDuplicateDetection = useDuplicateDetection; + this.confirmationWindowSize = confirmationWindowSize; + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + connectorPair = null; + this.discoveryGroupName = discoveryGroupName; + this.user = user; + this.password = password; + } + + public String getName() + { + return name; + } + + public String getQueueName() + { + return queueName; + } + + public String getForwardingAddress() + { + return forwardingAddress; + } + + public String getFilterString() + { + return filterString; + } + + public String getTransformerClassName() + { + return transformerClassName; + } + + public Pair<String, String> getConnectorPair() + { + return connectorPair; + } + + public String getDiscoveryGroupName() + { + return discoveryGroupName; + } + + public long getRetryInterval() + { + return retryInterval; + } + + public double getRetryIntervalMultiplier() + { + return retryIntervalMultiplier; + } + + public int getReconnectAttempts() + { + return reconnectAttempts; + } + + public boolean isFailoverOnServerShutdown() + { + return failoverOnServerShutdown; + } + + public boolean isUseDuplicateDetection() + { + return useDuplicateDetection; + } + + public int getConfirmationWindowSize() + { + return confirmationWindowSize; + } + + public long getClientFailureCheckPeriod() + { + return clientFailureCheckPeriod; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param queueName the queueName to set + */ + public void setQueueName(final String queueName) + { + this.queueName = queueName; + } + + /** + * @param forwardingAddress the forwardingAddress to set + */ + public void setForwardingAddress(final String forwardingAddress) + { + this.forwardingAddress = forwardingAddress; + } + + /** + * @param filterString the filterString to set + */ + public void setFilterString(final String filterString) + { + this.filterString = filterString; + } + + /** + * @param connectorPair the connectorPair to set + */ + public void setConnectorPair(final Pair<String, String> connectorPair) + { + this.connectorPair = connectorPair; + } + + /** + * @param discoveryGroupName the discoveryGroupName to set + */ + public void setDiscoveryGroupName(final String discoveryGroupName) + { + this.discoveryGroupName = discoveryGroupName; + } + + /** + * @param transformerClassName the transformerClassName to set + */ + public void setTransformerClassName(final String transformerClassName) + { + this.transformerClassName = transformerClassName; + } + + /** + * @param retryInterval the retryInterval to set + */ + public void setRetryInterval(final long retryInterval) + { + this.retryInterval = retryInterval; + } + + /** + * @param retryIntervalMultiplier the retryIntervalMultiplier to set + */ + public void setRetryIntervalMultiplier(final double retryIntervalMultiplier) + { + this.retryIntervalMultiplier = retryIntervalMultiplier; + } + + /** + * @param reconnectAttempts the reconnectAttempts to set + */ + public void setReconnectAttempts(final int reconnectAttempts) + { + this.reconnectAttempts = reconnectAttempts; + } + + /** + * @param failoverOnServerShutdown the failoverOnServerShutdown to set + */ + public void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) + { + this.failoverOnServerShutdown = failoverOnServerShutdown; + } + + /** + * @param useDuplicateDetection the useDuplicateDetection to set + */ + public void setUseDuplicateDetection(final boolean useDuplicateDetection) + { + this.useDuplicateDetection = useDuplicateDetection; + } + + /** + * @param confirmationWindowSize the confirmationWindowSize to set + */ + public void setConfirmationWindowSize(final int confirmationWindowSize) + { + this.confirmationWindowSize = confirmationWindowSize; + } + + public String getUser() + { + return user; + } + + public String getPassword() + { + return password; + } + + public void setUser(String user) + { + this.user = user; + } + + public void setPassword(String password) + { + this.password = password; + } +} Copied: trunk/src/main/org/hornetq/core/config/BroadcastGroupConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/BroadcastGroupConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/BroadcastGroupConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -0,0 +1,159 @@ +/* + * 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.config; + +import java.io.Serializable; +import java.util.List; + +import org.hornetq.api.core.Pair; +import org.hornetq.core.logging.Logger; + +/** + * A BroadcastGroupConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 18 Nov 2008 08:44:30 + * + */ +public class BroadcastGroupConfiguration implements Serializable +{ + private static final long serialVersionUID = 1052413739064253955L; + + private static final Logger log = Logger.getLogger(BroadcastGroupConfiguration.class); + + private String name; + + private String localBindAddress; + + private int localBindPort; + + private String groupAddress; + + private int groupPort; + + private long broadcastPeriod; + + private List<Pair<String, String>> connectorInfos; + + public BroadcastGroupConfiguration(final String name, + final String localBindAddress, + final int localBindPort, + final String groupAddress, + final int groupPort, + final long broadcastPeriod, + final List<Pair<String, String>> connectorInfos) + { + super(); + this.name = name; + this.localBindAddress = localBindAddress; + this.localBindPort = localBindPort; + this.groupAddress = groupAddress; + this.groupPort = groupPort; + this.broadcastPeriod = broadcastPeriod; + this.connectorInfos = connectorInfos; + } + + public String getName() + { + return name; + } + + public String getLocalBindAddress() + { + return localBindAddress; + } + + public int getLocalBindPort() + { + return localBindPort; + } + + public String getGroupAddress() + { + return groupAddress; + } + + public int getGroupPort() + { + return groupPort; + } + + public long getBroadcastPeriod() + { + return broadcastPeriod; + } + + public List<Pair<String, String>> getConnectorInfos() + { + return connectorInfos; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param localBindAddress the localBindAddress to set + */ + public void setLocalBindAddress(final String localBindAddress) + { + this.localBindAddress = localBindAddress; + } + + /** + * @param localBindPort the localBindPort to set + */ + public void setLocalBindPort(final int localBindPort) + { + this.localBindPort = localBindPort; + } + + /** + * @param groupAddress the groupAddress to set + */ + public void setGroupAddress(final String groupAddress) + { + this.groupAddress = groupAddress; + } + + /** + * @param groupPort the groupPort to set + */ + public void setGroupPort(final int groupPort) + { + this.groupPort = groupPort; + } + + /** + * @param broadcastPeriod the broadcastPeriod to set + */ + public void setBroadcastPeriod(final long broadcastPeriod) + { + this.broadcastPeriod = broadcastPeriod; + } + + /** + * @param connectorInfos the connectorInfos to set + */ + public void setConnectorInfos(final List<Pair<String, String>> connectorInfos) + { + this.connectorInfos = connectorInfos; + } + +} Copied: trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -0,0 +1,136 @@ +/* + * 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.config; + +import java.io.Serializable; +import java.util.List; + +import org.hornetq.api.core.Pair; + +/** + * A ClusterConnectionConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 13 Jan 2009 09:42:17 + * + * + */ +public class ClusterConnectionConfiguration implements Serializable +{ + private static final long serialVersionUID = 8948303813427795935L; + + private final String name; + + private final String address; + + private final long retryInterval; + + private final boolean duplicateDetection; + + private final boolean forwardWhenNoConsumers; + + private final List<Pair<String, String>> staticConnectorNamePairs; + + private final String discoveryGroupName; + + private final int maxHops; + + private final int confirmationWindowSize; + + public ClusterConnectionConfiguration(final String name, + final String address, + final long retryInterval, + final boolean duplicateDetection, + final boolean forwardWhenNoConsumers, + final int maxHops, + final int confirmationWindowSize, + final List<Pair<String, String>> staticConnectorNamePairs) + { + this.name = name; + this.address = address; + this.retryInterval = retryInterval; + this.staticConnectorNamePairs = staticConnectorNamePairs; + this.duplicateDetection = duplicateDetection; + this.forwardWhenNoConsumers = forwardWhenNoConsumers; + discoveryGroupName = null; + this.maxHops = maxHops; + this.confirmationWindowSize = confirmationWindowSize; + } + + public ClusterConnectionConfiguration(final String name, + final String address, + final long retryInterval, + final boolean duplicateDetection, + final boolean forwardWhenNoConsumers, + final int maxHops, + final int confirmationWindowSize, + final String discoveryGroupName) + { + this.name = name; + this.address = address; + this.retryInterval = retryInterval; + this.duplicateDetection = duplicateDetection; + this.forwardWhenNoConsumers = forwardWhenNoConsumers; + this.discoveryGroupName = discoveryGroupName; + staticConnectorNamePairs = null; + this.maxHops = maxHops; + this.confirmationWindowSize = confirmationWindowSize; + } + + public String getName() + { + return name; + } + + public String getAddress() + { + return address; + } + + public boolean isDuplicateDetection() + { + return duplicateDetection; + } + + public boolean isForwardWhenNoConsumers() + { + return forwardWhenNoConsumers; + } + + public int getMaxHops() + { + return maxHops; + } + + public int getConfirmationWindowSize() + { + return confirmationWindowSize; + } + + public List<Pair<String, String>> getStaticConnectorNamePairs() + { + return staticConnectorNamePairs; + } + + public String getDiscoveryGroupName() + { + return discoveryGroupName; + } + + public long getRetryInterval() + { + return retryInterval; + } +} Modified: trunk/src/main/org/hornetq/core/config/Configuration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/Configuration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/config/Configuration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -23,12 +23,6 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.DivertConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.spi.core.logging.LogDelegateFactory; @@ -338,12 +332,12 @@ /** * Returns the queues configured for this server. */ - List<QueueConfiguration> getQueueConfigurations(); + List<CoreQueueConfiguration> getQueueConfigurations(); /** * Sets the queues configured for this server. */ - void setQueueConfigurations(final List<QueueConfiguration> configs); + void setQueueConfigurations(final List<CoreQueueConfiguration> configs); /** * Returns the management address of this server. Copied: trunk/src/main/org/hornetq/core/config/CoreQueueConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/CoreQueueConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/CoreQueueConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -0,0 +1,98 @@ +/* + * 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.config; + +import java.io.Serializable; + +/** + * A QueueConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 13 Jan 2009 09:39:21 + * + * + */ +public class CoreQueueConfiguration implements Serializable +{ + private static final long serialVersionUID = 650404974977490254L; + + private String address; + + private String name; + + private String filterString; + + private boolean durable; + + public CoreQueueConfiguration(final String address, final String name, final String filterString, final boolean durable) + { + this.address = address; + this.name = name; + this.filterString = filterString; + this.durable = durable; + } + + public String getAddress() + { + return address; + } + + public String getName() + { + return name; + } + + public String getFilterString() + { + return filterString; + } + + public boolean isDurable() + { + return durable; + } + + /** + * @param address the address to set + */ + public void setAddress(final String address) + { + this.address = address; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param filterString the filterString to set + */ + public void setFilterString(final String filterString) + { + this.filterString = filterString; + } + + /** + * @param durable the durable to set + */ + public void setDurable(final boolean durable) + { + this.durable = durable; + } +} Copied: trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -0,0 +1,101 @@ +/* + * 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.config; + +import java.io.Serializable; + +/** + * A DiscoveryGroupConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 18 Nov 2008 08:47:30 + * + * + */ +public class DiscoveryGroupConfiguration implements Serializable +{ + private static final long serialVersionUID = 8657206421727863400L; + + private String name; + + private String groupAddress; + + private int groupPort; + + private long refreshTimeout; + + public DiscoveryGroupConfiguration(final String name, + final String groupAddress, + final int groupPort, + final long refreshTimeout) + { + this.name = name; + this.groupAddress = groupAddress; + this.groupPort = groupPort; + this.refreshTimeout = refreshTimeout; + } + + public String getName() + { + return name; + } + + public String getGroupAddress() + { + return groupAddress; + } + + public int getGroupPort() + { + return groupPort; + } + + public long getRefreshTimeout() + { + return refreshTimeout; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param groupAddress the groupAddress to set + */ + public void setGroupAddress(final String groupAddress) + { + this.groupAddress = groupAddress; + } + + /** + * @param groupPort the groupPort to set + */ + public void setGroupPort(final int groupPort) + { + this.groupPort = groupPort; + } + + /** + * @param refreshTimeout the refreshTimeout to set + */ + public void setRefreshTimeout(final long refreshTimeout) + { + this.refreshTimeout = refreshTimeout; + } +} Copied: trunk/src/main/org/hornetq/core/config/DivertConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/DivertConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/DivertConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -0,0 +1,164 @@ +/* + * 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.config; + +import java.io.Serializable; + +import org.hornetq.core.logging.Logger; +import org.hornetq.utils.UUIDGenerator; + +/** + * A DivertConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 13 Jan 2009 09:36:19 + * + * + */ +public class DivertConfiguration implements Serializable +{ + private static final long serialVersionUID = 6910543740464269629L; + + private static final Logger log = Logger.getLogger(DivertConfiguration.class); + + private String name; + + private String routingName; + + private String address; + + private String forwardingAddress; + + private boolean exclusive; + + private String filterString; + + private String transformerClassName; + + public DivertConfiguration(final String name, + final String routingName, + final String address, + final String forwardingAddress, + final boolean exclusive, + final String filterString, + final String transformerClassName) + { + this.name = name; + if (routingName == null) + { + this.routingName = UUIDGenerator.getInstance().generateStringUUID(); + } + else + { + this.routingName = routingName; + } + this.address = address; + this.forwardingAddress = forwardingAddress; + this.exclusive = exclusive; + this.filterString = filterString; + this.transformerClassName = transformerClassName; + } + + public String getName() + { + return name; + } + + public String getRoutingName() + { + return routingName; + } + + public String getAddress() + { + return address; + } + + public String getForwardingAddress() + { + return forwardingAddress; + } + + public boolean isExclusive() + { + return exclusive; + } + + public String getFilterString() + { + return filterString; + } + + public String getTransformerClassName() + { + return transformerClassName; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param routingName the routingName to set + */ + public void setRoutingName(final String routingName) + { + this.routingName = routingName; + } + + /** + * @param address the address to set + */ + public void setAddress(final String address) + { + this.address = address; + } + + /** + * @param forwardingAddress the forwardingAddress to set + */ + public void setForwardingAddress(final String forwardingAddress) + { + this.forwardingAddress = forwardingAddress; + } + + /** + * @param exclusive the exclusive to set + */ + public void setExclusive(final boolean exclusive) + { + this.exclusive = exclusive; + } + + /** + * @param filterString the filterString to set + */ + public void setFilterString(final String filterString) + { + this.filterString = filterString; + } + + /** + * @param transformerClassName the transformerClassName to set + */ + public void setTransformerClassName(final String transformerClassName) + { + this.transformerClassName = transformerClassName; + } +} Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -23,16 +23,16 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; +import org.hornetq.core.config.DivertConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.logging.impl.JULLogDelegateFactory; import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.DivertConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; import org.hornetq.core.settings.impl.AddressSettings; @@ -233,7 +233,7 @@ protected List<ClusterConnectionConfiguration> clusterConfigurations = new ArrayList<ClusterConnectionConfiguration>(); - protected List<QueueConfiguration> queueConfigurations = new ArrayList<QueueConfiguration>(); + protected List<CoreQueueConfiguration> queueConfigurations = new ArrayList<CoreQueueConfiguration>(); protected List<BroadcastGroupConfiguration> broadcastGroupConfigurations = new ArrayList<BroadcastGroupConfiguration>(); @@ -537,12 +537,12 @@ divertConfigurations = configs; } - public List<QueueConfiguration> getQueueConfigurations() + public List<CoreQueueConfiguration> getQueueConfigurations() { return queueConfigurations; } - public void setQueueConfigurations(final List<QueueConfiguration> configs) + public void setQueueConfigurations(final List<CoreQueueConfiguration> configs) { queueConfigurations = configs; } Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -27,19 +27,19 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; +import org.hornetq.core.config.DivertConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.config.impl.Validators; import org.hornetq.core.logging.Logger; import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.DivertConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; import org.hornetq.core.settings.impl.AddressFullMessagePolicy; import org.hornetq.core.settings.impl.AddressSettings; @@ -561,7 +561,7 @@ NodeList list = node.getElementsByTagName("queue"); for (int i = 0 ; i < list.getLength(); i++) { - QueueConfiguration queueConfig = parseQueueConfiguration(list.item(i)); + CoreQueueConfiguration queueConfig = parseQueueConfiguration(list.item(i)); config.getQueueConfigurations().add(queueConfig); } } @@ -757,7 +757,7 @@ return setting; } - public QueueConfiguration parseQueueConfiguration(final Node node) + public CoreQueueConfiguration parseQueueConfiguration(final Node node) { String name = node.getAttributes().getNamedItem("name").getNodeValue(); String address = null; @@ -784,7 +784,7 @@ } } - return new QueueConfiguration(address, name, filterString, durable); + return new CoreQueueConfiguration(address, name, filterString, durable); } // Package protected --------------------------------------------- Modified: trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -14,8 +14,8 @@ package org.hornetq.core.deployers.impl; import org.hornetq.api.core.management.HornetQServerControl; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.deployers.DeploymentManager; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.w3c.dom.Node; /** @@ -62,7 +62,7 @@ @Override public void deploy(final Node node) throws Exception { - QueueConfiguration queueConfig = parser.parseQueueConfiguration(node); + CoreQueueConfiguration queueConfig = parser.parseQueueConfiguration(node); serverControl.deployQueue(queueConfig.getAddress(), queueConfig.getName(), Modified: trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -17,9 +17,9 @@ import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.BridgeControl; +import org.hornetq.core.config.BridgeConfiguration; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BridgeConfiguration; /** * A BridgeControl Modified: trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -18,9 +18,9 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.BroadcastGroupControl; +import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -21,9 +21,9 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ClusterConnectionControl; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -18,8 +18,8 @@ import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.DiscoveryGroupControl; import org.hornetq.core.cluster.DiscoveryGroup; +import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; /** * A AcceptorControl Modified: trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -16,9 +16,9 @@ import javax.management.MBeanOperationInfo; import org.hornetq.api.core.management.DivertControl; +import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.Divert; -import org.hornetq.core.server.cluster.DivertConfiguration; /** * A DivertControl Deleted: trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -1,326 +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.server.cluster; - -import java.io.Serializable; - -import org.hornetq.api.core.Pair; - -/** - * A BridgeConfiguration - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 13 Jan 2009 09:32:43 - * - * - */ -public class BridgeConfiguration implements Serializable -{ - private static final long serialVersionUID = -1057244274380572226L; - - private String name; - - private String queueName; - - private String forwardingAddress; - - private String filterString; - - private Pair<String, String> connectorPair; - - private String discoveryGroupName; - - private String transformerClassName; - - private long retryInterval; - - private double retryIntervalMultiplier; - - private int reconnectAttempts; - - private boolean failoverOnServerShutdown; - - private boolean useDuplicateDetection; - - private int confirmationWindowSize; - - private final long clientFailureCheckPeriod; - - private String user; - - private String password; - - public BridgeConfiguration(final String name, - final String queueName, - final String forwardingAddress, - final String filterString, - final String transformerClassName, - final long retryInterval, - final double retryIntervalMultiplier, - final int reconnectAttempts, - final boolean failoverOnServerShutdown, - final boolean useDuplicateDetection, - final int confirmationWindowSize, - final long clientFailureCheckPeriod, - final Pair<String, String> connectorPair, - final String user, - final String password) - { - this.name = name; - this.queueName = queueName; - this.forwardingAddress = forwardingAddress; - this.filterString = filterString; - this.transformerClassName = transformerClassName; - this.retryInterval = retryInterval; - this.retryIntervalMultiplier = retryIntervalMultiplier; - this.reconnectAttempts = reconnectAttempts; - this.failoverOnServerShutdown = failoverOnServerShutdown; - this.useDuplicateDetection = useDuplicateDetection; - this.confirmationWindowSize = confirmationWindowSize; - this.clientFailureCheckPeriod = clientFailureCheckPeriod; - this.connectorPair = connectorPair; - this.user = user; - this.password = password; - discoveryGroupName = null; - } - - public BridgeConfiguration(final String name, - final String queueName, - final String forwardingAddress, - final String filterString, - final String transformerClassName, - final long retryInterval, - final double retryIntervalMultiplier, - final int reconnectAttempts, - final boolean failoverOnServerShutdown, - final boolean useDuplicateDetection, - final int confirmationWindowSize, - final long clientFailureCheckPeriod, - final String discoveryGroupName, - final String user, - final String password) - { - this.name = name; - this.queueName = queueName; - this.forwardingAddress = forwardingAddress; - this.filterString = filterString; - this.transformerClassName = transformerClassName; - this.retryInterval = retryInterval; - this.retryIntervalMultiplier = retryIntervalMultiplier; - this.reconnectAttempts = reconnectAttempts; - this.failoverOnServerShutdown = failoverOnServerShutdown; - this.useDuplicateDetection = useDuplicateDetection; - this.confirmationWindowSize = confirmationWindowSize; - this.clientFailureCheckPeriod = clientFailureCheckPeriod; - connectorPair = null; - this.discoveryGroupName = discoveryGroupName; - this.user = user; - this.password = password; - } - - public String getName() - { - return name; - } - - public String getQueueName() - { - return queueName; - } - - public String getForwardingAddress() - { - return forwardingAddress; - } - - public String getFilterString() - { - return filterString; - } - - public String getTransformerClassName() - { - return transformerClassName; - } - - public Pair<String, String> getConnectorPair() - { - return connectorPair; - } - - public String getDiscoveryGroupName() - { - return discoveryGroupName; - } - - public long getRetryInterval() - { - return retryInterval; - } - - public double getRetryIntervalMultiplier() - { - return retryIntervalMultiplier; - } - - public int getReconnectAttempts() - { - return reconnectAttempts; - } - - public boolean isFailoverOnServerShutdown() - { - return failoverOnServerShutdown; - } - - public boolean isUseDuplicateDetection() - { - return useDuplicateDetection; - } - - public int getConfirmationWindowSize() - { - return confirmationWindowSize; - } - - public long getClientFailureCheckPeriod() - { - return clientFailureCheckPeriod; - } - - /** - * @param name the name to set - */ - public void setName(final String name) - { - this.name = name; - } - - /** - * @param queueName the queueName to set - */ - public void setQueueName(final String queueName) - { - this.queueName = queueName; - } - - /** - * @param forwardingAddress the forwardingAddress to set - */ - public void setForwardingAddress(final String forwardingAddress) - { - this.forwardingAddress = forwardingAddress; - } - - /** - * @param filterString the filterString to set - */ - public void setFilterString(final String filterString) - { - this.filterString = filterString; - } - - /** - * @param connectorPair the connectorPair to set - */ - public void setConnectorPair(final Pair<String, String> connectorPair) - { - this.connectorPair = connectorPair; - } - - /** - * @param discoveryGroupName the discoveryGroupName to set - */ - public void setDiscoveryGroupName(final String discoveryGroupName) - { - this.discoveryGroupName = discoveryGroupName; - } - - /** - * @param transformerClassName the transformerClassName to set - */ - public void setTransformerClassName(final String transformerClassName) - { - this.transformerClassName = transformerClassName; - } - - /** - * @param retryInterval the retryInterval to set - */ - public void setRetryInterval(final long retryInterval) - { - this.retryInterval = retryInterval; - } - - /** - * @param retryIntervalMultiplier the retryIntervalMultiplier to set - */ - public void setRetryIntervalMultiplier(final double retryIntervalMultiplier) - { - this.retryIntervalMultiplier = retryIntervalMultiplier; - } - - /** - * @param reconnectAttempts the reconnectAttempts to set - */ - public void setReconnectAttempts(final int reconnectAttempts) - { - this.reconnectAttempts = reconnectAttempts; - } - - /** - * @param failoverOnServerShutdown the failoverOnServerShutdown to set - */ - public void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) - { - this.failoverOnServerShutdown = failoverOnServerShutdown; - } - - /** - * @param useDuplicateDetection the useDuplicateDetection to set - */ - public void setUseDuplicateDetection(final boolean useDuplicateDetection) - { - this.useDuplicateDetection = useDuplicateDetection; - } - - /** - * @param confirmationWindowSize the confirmationWindowSize to set - */ - public void setConfirmationWindowSize(final int confirmationWindowSize) - { - this.confirmationWindowSize = confirmationWindowSize; - } - - public String getUser() - { - return user; - } - - public String getPassword() - { - return password; - } - - public void setUser(String user) - { - this.user = user; - } - - public void setPassword(String password) - { - this.password = password; - } -} Deleted: trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -1,159 +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.server.cluster; - -import java.io.Serializable; -import java.util.List; - -import org.hornetq.api.core.Pair; -import org.hornetq.core.logging.Logger; - -/** - * A BroadcastGroupConfiguration - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 18 Nov 2008 08:44:30 - * - */ -public class BroadcastGroupConfiguration implements Serializable -{ - private static final long serialVersionUID = 1052413739064253955L; - - private static final Logger log = Logger.getLogger(BroadcastGroupConfiguration.class); - - private String name; - - private String localBindAddress; - - private int localBindPort; - - private String groupAddress; - - private int groupPort; - - private long broadcastPeriod; - - private List<Pair<String, String>> connectorInfos; - - public BroadcastGroupConfiguration(final String name, - final String localBindAddress, - final int localBindPort, - final String groupAddress, - final int groupPort, - final long broadcastPeriod, - final List<Pair<String, String>> connectorInfos) - { - super(); - this.name = name; - this.localBindAddress = localBindAddress; - this.localBindPort = localBindPort; - this.groupAddress = groupAddress; - this.groupPort = groupPort; - this.broadcastPeriod = broadcastPeriod; - this.connectorInfos = connectorInfos; - } - - public String getName() - { - return name; - } - - public String getLocalBindAddress() - { - return localBindAddress; - } - - public int getLocalBindPort() - { - return localBindPort; - } - - public String getGroupAddress() - { - return groupAddress; - } - - public int getGroupPort() - { - return groupPort; - } - - public long getBroadcastPeriod() - { - return broadcastPeriod; - } - - public List<Pair<String, String>> getConnectorInfos() - { - return connectorInfos; - } - - /** - * @param name the name to set - */ - public void setName(final String name) - { - this.name = name; - } - - /** - * @param localBindAddress the localBindAddress to set - */ - public void setLocalBindAddress(final String localBindAddress) - { - this.localBindAddress = localBindAddress; - } - - /** - * @param localBindPort the localBindPort to set - */ - public void setLocalBindPort(final int localBindPort) - { - this.localBindPort = localBindPort; - } - - /** - * @param groupAddress the groupAddress to set - */ - public void setGroupAddress(final String groupAddress) - { - this.groupAddress = groupAddress; - } - - /** - * @param groupPort the groupPort to set - */ - public void setGroupPort(final int groupPort) - { - this.groupPort = groupPort; - } - - /** - * @param broadcastPeriod the broadcastPeriod to set - */ - public void setBroadcastPeriod(final long broadcastPeriod) - { - this.broadcastPeriod = broadcastPeriod; - } - - /** - * @param connectorInfos the connectorInfos to set - */ - public void setConnectorInfos(final List<Pair<String, String>> connectorInfos) - { - this.connectorInfos = connectorInfos; - } - -} Deleted: trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -1,136 +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.server.cluster; - -import java.io.Serializable; -import java.util.List; - -import org.hornetq.api.core.Pair; - -/** - * A ClusterConnectionConfiguration - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 13 Jan 2009 09:42:17 - * - * - */ -public class ClusterConnectionConfiguration implements Serializable -{ - private static final long serialVersionUID = 8948303813427795935L; - - private final String name; - - private final String address; - - private final long retryInterval; - - private final boolean duplicateDetection; - - private final boolean forwardWhenNoConsumers; - - private final List<Pair<String, String>> staticConnectorNamePairs; - - private final String discoveryGroupName; - - private final int maxHops; - - private final int confirmationWindowSize; - - public ClusterConnectionConfiguration(final String name, - final String address, - final long retryInterval, - final boolean duplicateDetection, - final boolean forwardWhenNoConsumers, - final int maxHops, - final int confirmationWindowSize, - final List<Pair<String, String>> staticConnectorNamePairs) - { - this.name = name; - this.address = address; - this.retryInterval = retryInterval; - this.staticConnectorNamePairs = staticConnectorNamePairs; - this.duplicateDetection = duplicateDetection; - this.forwardWhenNoConsumers = forwardWhenNoConsumers; - discoveryGroupName = null; - this.maxHops = maxHops; - this.confirmationWindowSize = confirmationWindowSize; - } - - public ClusterConnectionConfiguration(final String name, - final String address, - final long retryInterval, - final boolean duplicateDetection, - final boolean forwardWhenNoConsumers, - final int maxHops, - final int confirmationWindowSize, - final String discoveryGroupName) - { - this.name = name; - this.address = address; - this.retryInterval = retryInterval; - this.duplicateDetection = duplicateDetection; - this.forwardWhenNoConsumers = forwardWhenNoConsumers; - this.discoveryGroupName = discoveryGroupName; - staticConnectorNamePairs = null; - this.maxHops = maxHops; - this.confirmationWindowSize = confirmationWindowSize; - } - - public String getName() - { - return name; - } - - public String getAddress() - { - return address; - } - - public boolean isDuplicateDetection() - { - return duplicateDetection; - } - - public boolean isForwardWhenNoConsumers() - { - return forwardWhenNoConsumers; - } - - public int getMaxHops() - { - return maxHops; - } - - public int getConfirmationWindowSize() - { - return confirmationWindowSize; - } - - public List<Pair<String, String>> getStaticConnectorNamePairs() - { - return staticConnectorNamePairs; - } - - public String getDiscoveryGroupName() - { - return discoveryGroupName; - } - - public long getRetryInterval() - { - return retryInterval; - } -} Deleted: trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -1,101 +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.server.cluster; - -import java.io.Serializable; - -/** - * A DiscoveryGroupConfiguration - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 18 Nov 2008 08:47:30 - * - * - */ -public class DiscoveryGroupConfiguration implements Serializable -{ - private static final long serialVersionUID = 8657206421727863400L; - - private String name; - - private String groupAddress; - - private int groupPort; - - private long refreshTimeout; - - public DiscoveryGroupConfiguration(final String name, - final String groupAddress, - final int groupPort, - final long refreshTimeout) - { - this.name = name; - this.groupAddress = groupAddress; - this.groupPort = groupPort; - this.refreshTimeout = refreshTimeout; - } - - public String getName() - { - return name; - } - - public String getGroupAddress() - { - return groupAddress; - } - - public int getGroupPort() - { - return groupPort; - } - - public long getRefreshTimeout() - { - return refreshTimeout; - } - - /** - * @param name the name to set - */ - public void setName(final String name) - { - this.name = name; - } - - /** - * @param groupAddress the groupAddress to set - */ - public void setGroupAddress(final String groupAddress) - { - this.groupAddress = groupAddress; - } - - /** - * @param groupPort the groupPort to set - */ - public void setGroupPort(final int groupPort) - { - this.groupPort = groupPort; - } - - /** - * @param refreshTimeout the refreshTimeout to set - */ - public void setRefreshTimeout(final long refreshTimeout) - { - this.refreshTimeout = refreshTimeout; - } -} Deleted: trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -1,164 +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.server.cluster; - -import java.io.Serializable; - -import org.hornetq.core.logging.Logger; -import org.hornetq.utils.UUIDGenerator; - -/** - * A DivertConfiguration - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 13 Jan 2009 09:36:19 - * - * - */ -public class DivertConfiguration implements Serializable -{ - private static final long serialVersionUID = 6910543740464269629L; - - private static final Logger log = Logger.getLogger(DivertConfiguration.class); - - private String name; - - private String routingName; - - private String address; - - private String forwardingAddress; - - private boolean exclusive; - - private String filterString; - - private String transformerClassName; - - public DivertConfiguration(final String name, - final String routingName, - final String address, - final String forwardingAddress, - final boolean exclusive, - final String filterString, - final String transformerClassName) - { - this.name = name; - if (routingName == null) - { - this.routingName = UUIDGenerator.getInstance().generateStringUUID(); - } - else - { - this.routingName = routingName; - } - this.address = address; - this.forwardingAddress = forwardingAddress; - this.exclusive = exclusive; - this.filterString = filterString; - this.transformerClassName = transformerClassName; - } - - public String getName() - { - return name; - } - - public String getRoutingName() - { - return routingName; - } - - public String getAddress() - { - return address; - } - - public String getForwardingAddress() - { - return forwardingAddress; - } - - public boolean isExclusive() - { - return exclusive; - } - - public String getFilterString() - { - return filterString; - } - - public String getTransformerClassName() - { - return transformerClassName; - } - - /** - * @param name the name to set - */ - public void setName(final String name) - { - this.name = name; - } - - /** - * @param routingName the routingName to set - */ - public void setRoutingName(final String routingName) - { - this.routingName = routingName; - } - - /** - * @param address the address to set - */ - public void setAddress(final String address) - { - this.address = address; - } - - /** - * @param forwardingAddress the forwardingAddress to set - */ - public void setForwardingAddress(final String forwardingAddress) - { - this.forwardingAddress = forwardingAddress; - } - - /** - * @param exclusive the exclusive to set - */ - public void setExclusive(final boolean exclusive) - { - this.exclusive = exclusive; - } - - /** - * @param filterString the filterString to set - */ - public void setFilterString(final String filterString) - { - this.filterString = filterString; - } - - /** - * @param transformerClassName the transformerClassName to set - */ - public void setTransformerClassName(final String transformerClassName) - { - this.transformerClassName = transformerClassName; - } -} Deleted: trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -1,98 +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.server.cluster; - -import java.io.Serializable; - -/** - * A QueueConfiguration - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 13 Jan 2009 09:39:21 - * - * - */ -public class QueueConfiguration implements Serializable -{ - private static final long serialVersionUID = 650404974977490254L; - - private String address; - - private String name; - - private String filterString; - - private boolean durable; - - public QueueConfiguration(final String address, final String name, final String filterString, final boolean durable) - { - this.address = address; - this.name = name; - this.filterString = filterString; - this.durable = durable; - } - - public String getAddress() - { - return address; - } - - public String getName() - { - return name; - } - - public String getFilterString() - { - return filterString; - } - - public boolean isDurable() - { - return durable; - } - - /** - * @param address the address to set - */ - public void setAddress(final String address) - { - this.address = address; - } - - /** - * @param name the name to set - */ - public void setName(final String name) - { - this.name = name; - } - - /** - * @param filterString the filterString to set - */ - public void setFilterString(final String filterString) - { - this.filterString = filterString; - } - - /** - * @param durable the durable to set - */ - public void setDurable(final boolean durable) - { - this.durable = durable; - } -} Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -30,20 +30,20 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.cluster.impl.DiscoveryGroupImpl; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; import org.hornetq.core.server.cluster.Transformer; import org.hornetq.core.server.management.ManagementService; import org.hornetq.utils.UUID; Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -40,6 +40,8 @@ import org.hornetq.core.client.impl.FailoverManager; import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DivertConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.deployers.Deployer; import org.hornetq.core.deployers.DeploymentManager; @@ -87,8 +89,6 @@ import org.hornetq.core.server.QueueFactory; import org.hornetq.core.server.ServerSession; import org.hornetq.core.server.cluster.ClusterManager; -import org.hornetq.core.server.cluster.DivertConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.cluster.Transformer; import org.hornetq.core.server.cluster.impl.ClusterManagerImpl; import org.hornetq.core.server.group.GroupingHandler; @@ -1102,7 +1102,7 @@ private void deployQueuesFromConfiguration() throws Exception { - for (QueueConfiguration config : configuration.getQueueConfigurations()) + for (CoreQueueConfiguration config : configuration.getQueueConfigurations()) { messagingServerControl.deployQueue(config.getAddress(), config.getName(), Modified: trunk/src/main/org/hornetq/core/server/management/ManagementService.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -22,7 +22,12 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.core.cluster.DiscoveryGroup; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; +import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.management.impl.HornetQServerControlImpl; import org.hornetq.core.messagecounter.MessageCounterManager; import org.hornetq.core.paging.PagingManager; @@ -37,13 +42,8 @@ import org.hornetq.core.server.QueueFactory; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.core.transaction.ResourceManager; Modified: trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -40,7 +40,12 @@ import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.cluster.DiscoveryGroup; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; +import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.impl.AcceptorControlImpl; import org.hornetq.core.management.impl.AddressControlImpl; @@ -65,13 +70,8 @@ import org.hornetq.core.server.QueueFactory; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroup; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.core.server.impl.ServerMessageImpl; import org.hornetq.core.server.management.ManagementService; import org.hornetq.core.server.management.Notification; Modified: trunk/src/main/org/hornetq/jms/server/JMSServerConfigParser.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerConfigParser.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/jms/server/JMSServerConfigParser.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -17,7 +17,7 @@ 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.JMSQueueConfiguration; import org.hornetq.jms.server.config.TopicConfiguration; import org.w3c.dom.Node; @@ -54,7 +54,7 @@ * @return * @throws Exception */ - QueueConfiguration parseQueueConfiguration(final Node node) throws Exception; + JMSQueueConfiguration parseQueueConfiguration(final Node node) throws Exception; /** * Parse the Connection Configuration node as a ConnectionFactoryConfiguration object Modified: trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -30,7 +30,7 @@ Context getContext(); - List<QueueConfiguration> getQueueConfigurations(); + List<JMSQueueConfiguration> getQueueConfigurations(); List<TopicConfiguration> getTopicConfigurations(); Copied: trunk/src/main/org/hornetq/jms/server/config/JMSQueueConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/JMSQueueConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/JMSQueueConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -0,0 +1,32 @@ +/* + * 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 JMSQueueConfiguration +{ + String getName(); + + String getSelector(); + + boolean isDurable(); + + String[] getBindings(); +} Deleted: trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -1,32 +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.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(); -} Modified: trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -20,7 +20,7 @@ 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.JMSQueueConfiguration; import org.hornetq.jms.server.config.TopicConfiguration; @@ -36,7 +36,7 @@ private final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations = new ArrayList<ConnectionFactoryConfiguration>(); - private final List<QueueConfiguration> queueConfigurations = new ArrayList<QueueConfiguration>(); + private final List<JMSQueueConfiguration> queueConfigurations = new ArrayList<JMSQueueConfiguration>(); private final List<TopicConfiguration> topicConfigurations = new ArrayList<TopicConfiguration>(); @@ -55,7 +55,7 @@ } public JMSConfigurationImpl(final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations, - final List<QueueConfiguration> queueConfigurations, + final List<JMSQueueConfiguration> queueConfigurations, final List<TopicConfiguration> topicConfigurations) { this.connectionFactoryConfigurations.addAll(connectionFactoryConfigurations); @@ -70,7 +70,7 @@ return connectionFactoryConfigurations; } - public List<QueueConfiguration> getQueueConfigurations() + public List<JMSQueueConfiguration> getQueueConfigurations() { return queueConfigurations; } Modified: trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -13,7 +13,7 @@ package org.hornetq.jms.server.config.impl; -import org.hornetq.jms.server.config.QueueConfiguration; +import org.hornetq.jms.server.config.JMSQueueConfiguration; /** @@ -23,7 +23,7 @@ * * */ -public class QueueConfigurationImpl implements QueueConfiguration +public class QueueConfigurationImpl implements JMSQueueConfiguration { // Constants ----------------------------------------------------- Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -27,7 +27,7 @@ import org.hornetq.jms.server.JMSServerConfigParser; 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.JMSQueueConfiguration; import org.hornetq.jms.server.config.TopicConfiguration; import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; @@ -80,7 +80,7 @@ public JMSConfiguration parseConfiguration(final Node rootnode) throws Exception { - ArrayList<QueueConfiguration> queues = new ArrayList<QueueConfiguration>(); + ArrayList<JMSQueueConfiguration> queues = new ArrayList<JMSQueueConfiguration>(); ArrayList<TopicConfiguration> topics = new ArrayList<TopicConfiguration>(); ArrayList<ConnectionFactoryConfiguration> cfs = new ArrayList<ConnectionFactoryConfiguration>(); @@ -158,7 +158,7 @@ * @return * @throws Exception */ - public QueueConfiguration parseQueueConfiguration(final Node node) throws Exception + public JMSQueueConfiguration parseQueueConfiguration(final Node node) throws Exception { Element e = (Element)node; NamedNodeMap atts = node.getAttributes(); @@ -431,7 +431,7 @@ * @param jndiArray * @return */ - protected QueueConfiguration newQueue(final String queueName, + protected JMSQueueConfiguration newQueue(final String queueName, final String selectorString, final boolean durable, final String[] jndiArray) @@ -446,7 +446,7 @@ * @param cfs * @return */ - protected JMSConfiguration newConfig(final ArrayList<QueueConfiguration> queues, + protected JMSConfiguration newConfig(final ArrayList<JMSQueueConfiguration> queues, final ArrayList<TopicConfiguration> topics, final ArrayList<ConnectionFactoryConfiguration> cfs) { Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -22,7 +22,7 @@ import org.hornetq.jms.server.JMSServerConfigParser; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.config.QueueConfiguration; +import org.hornetq.jms.server.config.JMSQueueConfiguration; import org.hornetq.jms.server.config.TopicConfiguration; import org.w3c.dom.Node; @@ -181,7 +181,7 @@ */ private void deployQueue(final Node node) throws Exception { - QueueConfiguration queueconfig = parser.parseQueueConfiguration(node); + JMSQueueConfiguration queueconfig = parser.parseQueueConfiguration(node); for (String jndiName : queueconfig.getBindings()) { jmsServerControl.createQueue(queueconfig.getName(), jndiName, queueconfig.getSelector(), queueconfig.isDurable()); Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -30,20 +30,20 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.FileDeploymentManager; import org.hornetq.core.deployers.impl.XmlDeployer; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.ActivateCallback; import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; 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.JMSQueueConfiguration; import org.hornetq.jms.server.config.TopicConfiguration; import org.hornetq.jms.server.management.JMSManagementService; import org.hornetq.jms.server.management.impl.JMSManagementServiceImpl; @@ -887,8 +887,8 @@ createConnectionFactory(config); } - List<QueueConfiguration> queueConfigs = config.getQueueConfigurations(); - for (QueueConfiguration config : queueConfigs) + List<JMSQueueConfiguration> queueConfigs = config.getQueueConfigurations(); + for (JMSQueueConfiguration config : queueConfigs) { String[] bindings = config.getBindings(); for (String binding : bindings) @@ -919,7 +919,7 @@ { return cfConfig.getConnectorConfigs(); } - else + else if (cfConfig.getConnectorNames() != null) { Configuration configuration = server.getConfiguration(); List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); @@ -959,6 +959,10 @@ return connectorConfigs; } + else + { + return null; + } } } Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -30,13 +30,13 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; +import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -25,14 +25,14 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.cluster.impl.BridgeImpl; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.spi.core.protocol.RemotingConnection; @@ -131,13 +131,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); service2.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -256,13 +256,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); service2.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -376,13 +376,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -504,13 +504,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -625,13 +625,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -24,13 +24,13 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.ServiceTestBase; @@ -116,13 +116,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -268,13 +268,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -467,13 +467,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -604,13 +604,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -24,12 +24,12 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; @@ -139,13 +139,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -333,13 +333,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -502,13 +502,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -631,13 +631,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -24,14 +24,14 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.tests.util.ServiceTestBase; @@ -122,13 +122,13 @@ bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true); - List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true); - List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>(); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -34,7 +34,10 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Binding; @@ -45,10 +48,7 @@ import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.core.server.cluster.ClusterConnection; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; import org.hornetq.core.server.cluster.RemoteQueueBinding; import org.hornetq.core.server.group.GroupingHandler; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -22,10 +22,10 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.tests.util.ServiceTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -22,10 +22,10 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -29,13 +29,13 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -29,7 +29,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.cluster.DivertConfiguration; +import org.hornetq.core.config.DivertConfiguration; import org.hornetq.tests.util.JMSTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -21,7 +21,7 @@ import org.hornetq.jms.server.JMSServerConfigParser; 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.JMSQueueConfiguration; import org.hornetq.jms.server.config.TopicConfiguration; import org.hornetq.jms.server.impl.JMSServerConfigParserImpl; import org.hornetq.tests.util.ServiceTestBase; @@ -95,7 +95,7 @@ assertEquals(1, jmsconfig.getQueueConfigurations().size()); - QueueConfiguration queueConfig = jmsconfig.getQueueConfigurations().get(0); + JMSQueueConfiguration queueConfig = jmsconfig.getQueueConfigurations().get(0); assertEquals("fullConfigurationQueue", queueConfig.getName()); assertEquals(2, queueConfig.getBindings().length); assertEquals("/fullConfigurationQueue", queueConfig.getBindings()[0]); 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 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -27,6 +27,7 @@ import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; @@ -34,7 +35,6 @@ import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -28,15 +28,15 @@ import org.hornetq.api.core.management.BridgeControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ObjectNameBuilder; +import org.hornetq.core.config.BridgeConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.CoreQueueConfiguration; 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.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.management.Notification; import org.hornetq.tests.integration.SimpleNotificationService; import org.hornetq.tests.util.RandomUtil; @@ -151,11 +151,11 @@ acceptorParams, RandomUtil.randomString()); - QueueConfiguration sourceQueueConfig = new QueueConfiguration(RandomUtil.randomString(), + CoreQueueConfiguration sourceQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(), RandomUtil.randomString(), null, false); - QueueConfiguration targetQueueConfig = new QueueConfiguration(RandomUtil.randomString(), + CoreQueueConfiguration targetQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(), RandomUtil.randomString(), null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -27,15 +27,15 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; +import org.hornetq.core.config.BridgeConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.CoreQueueConfiguration; 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.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.tests.util.RandomUtil; /** @@ -129,11 +129,11 @@ acceptorParams, RandomUtil.randomString()); - QueueConfiguration sourceQueueConfig = new QueueConfiguration(RandomUtil.randomString(), + CoreQueueConfiguration sourceQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(), RandomUtil.randomString(), null, false); - QueueConfiguration targetQueueConfig = new QueueConfiguration(RandomUtil.randomString(), + CoreQueueConfiguration targetQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(), RandomUtil.randomString(), null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -21,12 +21,12 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.BroadcastGroupControl; +import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.RandomUtil; import org.hornetq.utils.json.JSONArray; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -27,15 +27,15 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.ClusterConnectionControl; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; @@ -125,7 +125,7 @@ TransportConfiguration connectorConfig_0 = new TransportConfiguration(NettyConnectorFactory.class.getName()); - QueueConfiguration queueConfig = new QueueConfiguration(RandomUtil.randomString(), + CoreQueueConfiguration queueConfig = new CoreQueueConfiguration(RandomUtil.randomString(), RandomUtil.randomString(), null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -29,15 +29,15 @@ import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ObjectNameBuilder; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.CoreQueueConfiguration; 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.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.management.Notification; import org.hornetq.tests.integration.SimpleNotificationService; import org.hornetq.tests.util.RandomUtil; @@ -199,7 +199,7 @@ acceptorParams, RandomUtil.randomString()); - QueueConfiguration queueConfig = new QueueConfiguration(RandomUtil.randomString(), + CoreQueueConfiguration queueConfig = new CoreQueueConfiguration(RandomUtil.randomString(), RandomUtil.randomString(), null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -18,11 +18,11 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.DiscoveryGroupControl; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; import org.hornetq.tests.util.RandomUtil; /** Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -20,13 +20,13 @@ import org.hornetq.api.core.management.DivertControl; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DivertConfiguration; +import org.hornetq.core.config.CoreQueueConfiguration; 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.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.DivertConfiguration; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.tests.util.RandomUtil; /** @@ -84,11 +84,11 @@ TransportConfiguration connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName()); - QueueConfiguration queueConfig = new QueueConfiguration(RandomUtil.randomString(), + CoreQueueConfiguration queueConfig = new CoreQueueConfiguration(RandomUtil.randomString(), RandomUtil.randomString(), null, false); - QueueConfiguration fowardQueueConfig = new QueueConfiguration(RandomUtil.randomString(), + CoreQueueConfiguration fowardQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(), RandomUtil.randomString(), null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -23,11 +23,11 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Bindings; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.tests.util.ServiceTestBase; /** @@ -56,13 +56,13 @@ final String queueName3 = "queue3"; - QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, null, true); + CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, null, true); - QueueConfiguration queue2 = new QueueConfiguration(testAddress, queueName2, null, true); + CoreQueueConfiguration queue2 = new CoreQueueConfiguration(testAddress, queueName2, null, true); - QueueConfiguration queue3 = new QueueConfiguration(testAddress, queueName3, null, true); + CoreQueueConfiguration queue3 = new CoreQueueConfiguration(testAddress, queueName3, null, true); - List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>(); + List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>(); queueConfs.add(queue1); queueConfs.add(queue2); @@ -126,13 +126,13 @@ final String queueName2 = "queue2"; - QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, null, true); + CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, null, true); - QueueConfiguration queue2 = new QueueConfiguration(testAddress, queueName1, null, true); + CoreQueueConfiguration queue2 = new CoreQueueConfiguration(testAddress, queueName1, null, true); - QueueConfiguration queue3 = new QueueConfiguration(testAddress, queueName2, null, true); + CoreQueueConfiguration queue3 = new CoreQueueConfiguration(testAddress, queueName2, null, true); - List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>(); + List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>(); queueConfs.add(queue1); queueConfs.add(queue2); @@ -228,13 +228,13 @@ server.stop(); - QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, null, true); + CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, null, true); - QueueConfiguration queue2 = new QueueConfiguration(testAddress, queueName2, null, true); + CoreQueueConfiguration queue2 = new CoreQueueConfiguration(testAddress, queueName2, null, true); - QueueConfiguration queue3 = new QueueConfiguration(testAddress, queueName3, null, true); + CoreQueueConfiguration queue3 = new CoreQueueConfiguration(testAddress, queueName3, null, true); - List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>(); + List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>(); queueConfs.add(queue1); queueConfs.add(queue2); @@ -310,11 +310,11 @@ final String queueName2 = "queue2"; - QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, null, false); + CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, null, false); - QueueConfiguration queue2 = new QueueConfiguration(testAddress, queueName2, null, true); + CoreQueueConfiguration queue2 = new CoreQueueConfiguration(testAddress, queueName2, null, true); - List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>(); + List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>(); queueConfs.add(queue1); queueConfs.add(queue2); @@ -398,9 +398,9 @@ final String filter = "cheese='camembert'"; - QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, filter, false); + CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, filter, false); - List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>(); + List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>(); queueConfs.add(queue1); Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -17,15 +17,15 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; +import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.DivertConfiguration; /** * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2010-02-10 14:15:24 UTC (rev 8868) +++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2010-02-10 20:03:59 UTC (rev 8869) @@ -20,9 +20,9 @@ import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.QueueDeployer; -import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.tests.util.UnitTestCase; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -69,7 +69,7 @@ Assert.assertEquals(1, serverControl.configs.size()); - QueueConfiguration queueConfiguration = serverControl.configs.get(0); + CoreQueueConfiguration queueConfiguration = serverControl.configs.get(0); Assert.assertEquals("foo", queueConfiguration.getName()); Assert.assertEquals("bar", queueConfiguration.getAddress()); Assert.assertEquals("speed > 88", queueConfiguration.getFilterString()); @@ -179,11 +179,11 @@ return null; } - List<QueueConfiguration> configs = new ArrayList<QueueConfiguration>(); + List<CoreQueueConfiguration> configs = new ArrayList<CoreQueueConfiguration>(); public void deployQueue(final String address, final String name, final String filter, final boolean durable) throws Exception { - QueueConfiguration config = new QueueConfiguration(address, name, filter, durable); + CoreQueueConfiguration config = new CoreQueueConfiguration(address, name, filter, durable); configs.add(config); }

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8868 - in trunk: src/main/org/hornetq/core/config/impl and 5 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-02-10 09:15:24 -0500 (Wed, 10 Feb 2010) New Revision: 8868 Added: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java Modified: trunk/src/main/org/hornetq/core/config/Configuration.java trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java trunk/src/main/org/hornetq/core/deployers/impl/SecurityDeployer.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java trunk/tests/config/ConfigurationTest-full-config.xml trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java Log: Improvements on configuration and parsing for better integration with AS Modified: trunk/src/main/org/hornetq/core/config/Configuration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/Configuration.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/src/main/org/hornetq/core/config/Configuration.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -21,7 +21,7 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; @@ -30,6 +30,7 @@ import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; +import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.spi.core.logging.LogDelegateFactory; /** @@ -804,4 +805,27 @@ */ void setMessageExpiryThreadPriority(int messageExpiryThreadPriority); + /** + * + * @return A list of AddressSettings per matching to be deployed to the address settings repository + */ + Map<String, AddressSettings> getAddressesSettings(); + + /** + * @param A list of AddressSettings per matching to be deployed to the address settings repository + */ + void setAddressesSettings(Map<String, AddressSettings> addressesSettings); + + /** + * + * @param roles a list of roles per matching + */ + void setSecurityRoles(Map<String, Set<Role>> roles); + + /** + * + * @return a list of roles per matching + */ + Map<String, Set<Role>> getSecurityRoles(); + } Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -25,6 +25,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.impl.JULLogDelegateFactory; +import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; @@ -33,6 +34,7 @@ import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; +import org.hornetq.core.settings.impl.AddressSettings; /** * @author <a href="mailto:ataylor@redhat.com>Andy Taylor</a> @@ -316,6 +318,10 @@ protected GroupingHandlerConfiguration groupingHandlerConfiguration; + private Map<String, AddressSettings> addressesSettings = new HashMap<String, AddressSettings>(); + + private Map<String, Set<Role>> securitySettings = new HashMap<String, Set<Role>>(); + // Public ------------------------------------------------------------------------- public boolean isClustered() @@ -805,10 +811,10 @@ { return messageCounterSamplePeriod; } - - public void setMessageCounterSamplePeriod(long period) + + public void setMessageCounterSamplePeriod(final long period) { - this.messageCounterSamplePeriod = period; + messageCounterSamplePeriod = period; } public int getMessageCounterMaxDayHistory() @@ -1277,4 +1283,36 @@ return true; } + /* (non-Javadoc) + * @see org.hornetq.core.config.Configuration#getAddressesSettings() + */ + public Map<String, AddressSettings> getAddressesSettings() + { + return addressesSettings; + } + + /* (non-Javadoc) + * @see org.hornetq.core.config.Configuration#setAddressesSettings(java.util.Map) + */ + public void setAddressesSettings(final Map<String, AddressSettings> addressesSettings) + { + this.addressesSettings = addressesSettings; + } + + /* (non-Javadoc) + * @see org.hornetq.core.config.Configuration#getSecurityRoles() + */ + public Map<String, Set<Role>> getSecurityRoles() + { + return securitySettings; + } + + /* (non-Javadoc) + * @see org.hornetq.core.config.Configuration#setSecuritySettings(java.util.Map) + */ + public void setSecurityRoles(final Map<String, Set<Role>> securitySettings) + { + this.securitySettings = securitySettings; + } + } Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -16,29 +16,11 @@ import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.deployers.impl.FileConfigurationParser; import org.hornetq.core.logging.Logger; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.cluster.BridgeConfiguration; -import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; -import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; -import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; -import org.hornetq.core.server.cluster.DivertConfiguration; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.utils.XMLConfigurationUtil; import org.hornetq.utils.XMLUtil; import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * ConfigurationImpl @@ -57,8 +39,6 @@ private static final String DEFAULT_CONFIGURATION_URL = "hornetq-configuration.xml"; - private static final String CONFIGURATION_SCHEMA_URL = "schema/hornetq-configuration.xsd"; - // For a bridge confirmations must be activated or send acknowledgements won't return public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = 1024 * 1024; @@ -87,359 +67,13 @@ String xml = org.hornetq.utils.XMLUtil.readerToString(reader); xml = XMLUtil.replaceSystemProps(xml); Element e = org.hornetq.utils.XMLUtil.stringToElement(xml); - org.hornetq.utils.XMLUtil.validate(e, FileConfiguration.CONFIGURATION_SCHEMA_URL); + + FileConfigurationParser parser = new FileConfigurationParser(); - clustered = XMLConfigurationUtil.getBoolean(e, "clustered", clustered); + parser.parseMainConfig(e, this); - backup = XMLConfigurationUtil.getBoolean(e, "backup", backup); - - sharedStore = XMLConfigurationUtil.getBoolean(e, "shared-store", sharedStore); - - // Defaults to true when using FileConfiguration - fileDeploymentEnabled = XMLConfigurationUtil.getBoolean(e, "file-deployment-enabled", true); - - persistenceEnabled = XMLConfigurationUtil.getBoolean(e, "persistence-enabled", persistenceEnabled); - - persistDeliveryCountBeforeDelivery = XMLConfigurationUtil.getBoolean(e, - "persist-delivery-count-before-delivery", - persistDeliveryCountBeforeDelivery); - - // NOTE! All the defaults come from the super class - - scheduledThreadPoolMaxSize = XMLConfigurationUtil.getInteger(e, - "scheduled-thread-pool-max-size", - scheduledThreadPoolMaxSize, - Validators.GT_ZERO); - - threadPoolMaxSize = XMLConfigurationUtil.getInteger(e, - "thread-pool-max-size", - threadPoolMaxSize, - Validators.MINUS_ONE_OR_GT_ZERO); - - securityEnabled = XMLConfigurationUtil.getBoolean(e, "security-enabled", securityEnabled); - - jmxManagementEnabled = XMLConfigurationUtil.getBoolean(e, "jmx-management-enabled", jmxManagementEnabled); - - jmxDomain = XMLConfigurationUtil.getString(e, "jmx-domain", jmxDomain, Validators.NOT_NULL_OR_EMPTY); - - securityInvalidationInterval = XMLConfigurationUtil.getLong(e, - "security-invalidation-interval", - securityInvalidationInterval, - Validators.GT_ZERO); - - connectionTTLOverride = XMLConfigurationUtil.getLong(e, - "connection-ttl-override", - connectionTTLOverride, - Validators.MINUS_ONE_OR_GT_ZERO); - - asyncConnectionExecutionEnabled = XMLConfigurationUtil.getBoolean(e, - "async-connection-execution-enabled", - asyncConnectionExecutionEnabled); - - transactionTimeout = XMLConfigurationUtil.getLong(e, - "transaction-timeout", - transactionTimeout, - Validators.GT_ZERO); - - transactionTimeoutScanPeriod = XMLConfigurationUtil.getLong(e, - "transaction-timeout-scan-period", - transactionTimeoutScanPeriod, - Validators.GT_ZERO); - - messageExpiryScanPeriod = XMLConfigurationUtil.getLong(e, - "message-expiry-scan-period", - messageExpiryScanPeriod, - Validators.GT_ZERO); - - messageExpiryThreadPriority = XMLConfigurationUtil.getInteger(e, - "message-expiry-thread-priority", - messageExpiryThreadPriority, - Validators.THREAD_PRIORITY_RANGE); - - idCacheSize = XMLConfigurationUtil.getInteger(e, "id-cache-size", idCacheSize, Validators.GT_ZERO); - - persistIDCache = XMLConfigurationUtil.getBoolean(e, "persist-id-cache", persistIDCache); - - managementAddress = new SimpleString(XMLConfigurationUtil.getString(e, - "management-address", - managementAddress.toString(), - Validators.NOT_NULL_OR_EMPTY)); - - managementNotificationAddress = new SimpleString(XMLConfigurationUtil.getString(e, - "management-notification-address", - managementNotificationAddress.toString(), - Validators.NOT_NULL_OR_EMPTY)); - - clusterPassword = XMLConfigurationUtil.getString(e, - "cluster-password", - clusterPassword, - Validators.NO_CHECK); - - clusterUser = XMLConfigurationUtil.getString(e, - "cluster-user", - clusterUser, - Validators.NO_CHECK); - - logDelegateFactoryClassName = XMLConfigurationUtil.getString(e, - "log-delegate-factory-class-name", - logDelegateFactoryClassName, - Validators.NOT_NULL_OR_EMPTY); - - NodeList interceptorNodes = e.getElementsByTagName("remoting-interceptors"); - - ArrayList<String> interceptorList = new ArrayList<String>(); - - if (interceptorNodes.getLength() > 0) - { - NodeList interceptors = interceptorNodes.item(0).getChildNodes(); - - for (int i = 0; i < interceptors.getLength(); i++) - { - if ("class-name".equalsIgnoreCase(interceptors.item(i).getNodeName())) - { - String clazz = interceptors.item(i).getTextContent(); - - interceptorList.add(clazz); - } - } - } - - interceptorClassNames = interceptorList; - - NodeList backups = e.getElementsByTagName("backup-connector-ref"); - - // There should be only one - this will be enforced by the DTD - - if (backups.getLength() > 0) - { - Node backupNode = backups.item(0); - - backupConnectorName = backupNode.getAttributes().getNamedItem("connector-name").getNodeValue(); - } - - NodeList connectorNodes = e.getElementsByTagName("connector"); - - for (int i = 0; i < connectorNodes.getLength(); i++) - { - Element connectorNode = (Element)connectorNodes.item(i); - - TransportConfiguration connectorConfig = parseTransportConfiguration(connectorNode); - - if (connectorConfig.getName() == null) - { - FileConfiguration.log.warn("Cannot deploy a connector with no name specified."); - - continue; - } - - if (connectorConfigs.containsKey(connectorConfig.getName())) - { - FileConfiguration.log.warn("There is already a connector with name " + connectorConfig.getName() + - " deployed. This one will not be deployed."); - - continue; - } - - connectorConfigs.put(connectorConfig.getName(), connectorConfig); - } - - NodeList acceptorNodes = e.getElementsByTagName("acceptor"); - - for (int i = 0; i < acceptorNodes.getLength(); i++) - { - Element acceptorNode = (Element)acceptorNodes.item(i); - - TransportConfiguration acceptorConfig = parseTransportConfiguration(acceptorNode); - - acceptorConfigs.add(acceptorConfig); - } - - NodeList bgNodes = e.getElementsByTagName("broadcast-group"); - - for (int i = 0; i < bgNodes.getLength(); i++) - { - Element bgNode = (Element)bgNodes.item(i); - - parseBroadcastGroupConfiguration(bgNode); - } - - NodeList dgNodes = e.getElementsByTagName("discovery-group"); - - for (int i = 0; i < dgNodes.getLength(); i++) - { - Element dgNode = (Element)dgNodes.item(i); - - parseDiscoveryGroupConfiguration(dgNode); - } - - NodeList brNodes = e.getElementsByTagName("bridge"); - - for (int i = 0; i < brNodes.getLength(); i++) - { - Element mfNode = (Element)brNodes.item(i); - - parseBridgeConfiguration(mfNode); - } - - NodeList gaNodes = e.getElementsByTagName("grouping-handler"); - - for (int i = 0; i < gaNodes.getLength(); i++) - { - Element gaNode = (Element)gaNodes.item(i); - - parseGroupingHandlerConfiguration(gaNode); - } - - NodeList ccNodes = e.getElementsByTagName("cluster-connection"); - - for (int i = 0; i < ccNodes.getLength(); i++) - { - Element ccNode = (Element)ccNodes.item(i); - - parseClusterConnectionConfiguration(ccNode); - } - - NodeList dvNodes = e.getElementsByTagName("divert"); - - for (int i = 0; i < dvNodes.getLength(); i++) - { - Element dvNode = (Element)dvNodes.item(i); - - parseDivertConfiguration(dvNode); - } - - // Persistence config - - largeMessagesDirectory = XMLConfigurationUtil.getString(e, - "large-messages-directory", - largeMessagesDirectory, - Validators.NOT_NULL_OR_EMPTY); - - bindingsDirectory = XMLConfigurationUtil.getString(e, - "bindings-directory", - bindingsDirectory, - Validators.NOT_NULL_OR_EMPTY); - - createBindingsDir = XMLConfigurationUtil.getBoolean(e, "create-bindings-dir", createBindingsDir); - - journalDirectory = XMLConfigurationUtil.getString(e, - "journal-directory", - journalDirectory, - Validators.NOT_NULL_OR_EMPTY); - - pagingDirectory = XMLConfigurationUtil.getString(e, - "paging-directory", - pagingDirectory, - Validators.NOT_NULL_OR_EMPTY); - - createJournalDir = XMLConfigurationUtil.getBoolean(e, "create-journal-dir", createJournalDir); - - String s = XMLConfigurationUtil.getString(e, "journal-type", journalType.toString(), Validators.JOURNAL_TYPE); - - if (s.equals(JournalType.NIO.toString())) - { - journalType = JournalType.NIO; - } - else if (s.equals(JournalType.ASYNCIO.toString())) - { - journalType = JournalType.ASYNCIO; - } - - journalSyncTransactional = XMLConfigurationUtil.getBoolean(e, - "journal-sync-transactional", - journalSyncTransactional); - - journalSyncNonTransactional = XMLConfigurationUtil.getBoolean(e, - "journal-sync-non-transactional", - journalSyncNonTransactional); - - journalFileSize = XMLConfigurationUtil.getInteger(e, "journal-file-size", journalFileSize, Validators.GT_ZERO); - - int journalBufferTimeout = XMLConfigurationUtil.getInteger(e, - "journal-buffer-timeout", - journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO - : ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, - Validators.GT_ZERO); - - int journalBufferSize = XMLConfigurationUtil.getInteger(e, - "journal-buffer-size", - journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_AIO - : ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, - Validators.GT_ZERO); - - int journalMaxIO = XMLConfigurationUtil.getInteger(e, - "journal-max-io", - journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_AIO - : ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_NIO, - Validators.GT_ZERO); - - if (journalType == JournalType.ASYNCIO) - { - journalBufferTimeout_AIO = journalBufferTimeout; - journalBufferSize_AIO = journalBufferSize; - journalMaxIO_AIO = journalMaxIO; - } - else - { - journalBufferTimeout_NIO = journalBufferTimeout; - journalBufferSize_NIO = journalBufferSize; - journalMaxIO_NIO = journalMaxIO; - } - - journalMinFiles = XMLConfigurationUtil.getInteger(e, "journal-min-files", journalMinFiles, Validators.GT_ZERO); - - journalCompactMinFiles = XMLConfigurationUtil.getInteger(e, - "journal-compact-min-files", - journalCompactMinFiles, - Validators.GE_ZERO); - - journalCompactPercentage = XMLConfigurationUtil.getInteger(e, - "journal-compact-percentage", - journalCompactPercentage, - Validators.PERCENTAGE); - - logJournalWriteRate = XMLConfigurationUtil.getBoolean(e, - "log-journal-write-rate", - ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE); - - journalPerfBlastPages = XMLConfigurationUtil.getInteger(e, - "perf-blast-pages", - ConfigurationImpl.DEFAULT_JOURNAL_PERF_BLAST_PAGES, - Validators.MINUS_ONE_OR_GT_ZERO); - - runSyncSpeedTest = XMLConfigurationUtil.getBoolean(e, "run-sync-speed-test", runSyncSpeedTest); - - wildcardRoutingEnabled = XMLConfigurationUtil.getBoolean(e, "wild-card-routing-enabled", wildcardRoutingEnabled); - - messageCounterEnabled = XMLConfigurationUtil.getBoolean(e, "message-counter-enabled", messageCounterEnabled); - - messageCounterSamplePeriod = XMLConfigurationUtil.getLong(e, - "message-counter-sample-period", - messageCounterSamplePeriod, - Validators.GT_ZERO); - - messageCounterMaxDayHistory = XMLConfigurationUtil.getInteger(e, - "message-counter-max-day-history", - messageCounterMaxDayHistory, - Validators.GT_ZERO); - - serverDumpInterval = XMLConfigurationUtil.getLong(e, - "server-dump-interval", - serverDumpInterval, - Validators.MINUS_ONE_OR_GT_ZERO); // in - // milliseconds - - memoryWarningThreshold = XMLConfigurationUtil.getInteger(e, - "memory-warning-threshold", - memoryWarningThreshold, - Validators.PERCENTAGE); - - memoryMeasureInterval = XMLConfigurationUtil.getLong(e, - "memory-measure-interval", - memoryMeasureInterval, - Validators.MINUS_ONE_OR_GT_ZERO); // in - started = true; + } public synchronized void stop() throws Exception @@ -458,398 +92,4 @@ } // Private ------------------------------------------------------------------------- - - private TransportConfiguration parseTransportConfiguration(final Element e) - { - Node nameNode = e.getAttributes().getNamedItem("name"); - - String name = nameNode != null ? nameNode.getNodeValue() : null; - - String clazz = XMLConfigurationUtil.getString(e, "factory-class", null, Validators.NOT_NULL_OR_EMPTY); - - Map<String, Object> params = new HashMap<String, Object>(); - - NodeList paramsNodes = e.getElementsByTagName("param"); - - for (int i = 0; i < paramsNodes.getLength(); i++) - { - Node paramNode = paramsNodes.item(i); - NamedNodeMap attributes = paramNode.getAttributes(); - - Node nkey = attributes.getNamedItem("key"); - - String key = nkey.getTextContent(); - - Node nValue = attributes.getNamedItem("value"); - - params.put(key, nValue.getTextContent()); - } - - return new TransportConfiguration(clazz, params, name); - } - - private void parseBroadcastGroupConfiguration(final Element e) - { - String name = e.getAttribute("name"); - - String localAddress = XMLConfigurationUtil.getString(e, "local-bind-address", null, Validators.NO_CHECK); - - int localBindPort = XMLConfigurationUtil.getInteger(e, "local-bind-port", -1, Validators.MINUS_ONE_OR_GT_ZERO); - - String groupAddress = XMLConfigurationUtil.getString(e, "group-address", null, Validators.NOT_NULL_OR_EMPTY); - - int groupPort = XMLConfigurationUtil.getInteger(e, "group-port", -1, Validators.GT_ZERO); - - long broadcastPeriod = XMLConfigurationUtil.getLong(e, - "broadcast-period", - ConfigurationImpl.DEFAULT_BROADCAST_PERIOD, - Validators.GT_ZERO); - - NodeList children = e.getChildNodes(); - - List<Pair<String, String>> connectorNames = new ArrayList<Pair<String, String>>(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("connector-ref")) - { - String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); - - Node backupConnectorNode = child.getAttributes().getNamedItem("backup-connector-name"); - - String backupConnectorName = null; - - if (backupConnectorNode != null) - { - backupConnectorName = backupConnectorNode.getNodeValue(); - } - - Pair<String, String> connectorInfo = new Pair<String, String>(connectorName, backupConnectorName); - - connectorNames.add(connectorInfo); - } - } - - BroadcastGroupConfiguration config = new BroadcastGroupConfiguration(name, - localAddress, - localBindPort, - groupAddress, - groupPort, - broadcastPeriod, - connectorNames); - - broadcastGroupConfigurations.add(config); - } - - private void parseDiscoveryGroupConfiguration(final Element e) - { - String name = e.getAttribute("name"); - - String groupAddress = XMLConfigurationUtil.getString(e, "group-address", null, Validators.NOT_NULL_OR_EMPTY); - - int groupPort = XMLConfigurationUtil.getInteger(e, "group-port", -1, Validators.MINUS_ONE_OR_GT_ZERO); - - long refreshTimeout = XMLConfigurationUtil.getLong(e, - "refresh-timeout", - ConfigurationImpl.DEFAULT_BROADCAST_REFRESH_TIMEOUT, - Validators.GT_ZERO); - - DiscoveryGroupConfiguration config = new DiscoveryGroupConfiguration(name, - groupAddress, - groupPort, - refreshTimeout); - - if (discoveryGroupConfigurations.containsKey(name)) - { - FileConfiguration.log.warn("There is already a discovery group with name " + name + - " deployed. This one will not be deployed."); - - return; - } - else - { - discoveryGroupConfigurations.put(name, config); - } - } - - private void parseClusterConnectionConfiguration(final Element e) - { - String name = e.getAttribute("name"); - - String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY); - - boolean duplicateDetection = XMLConfigurationUtil.getBoolean(e, - "use-duplicate-detection", - ConfigurationImpl.DEFAULT_CLUSTER_DUPLICATE_DETECTION); - - boolean forwardWhenNoConsumers = XMLConfigurationUtil.getBoolean(e, - "forward-when-no-consumers", - ConfigurationImpl.DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS); - - int maxHops = XMLConfigurationUtil.getInteger(e, - "max-hops", - ConfigurationImpl.DEFAULT_CLUSTER_MAX_HOPS, - Validators.GE_ZERO); - - long retryInterval = XMLConfigurationUtil.getLong(e, - "retry-interval", - ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL, - Validators.GT_ZERO); - - int confirmationWindowSize = XMLConfigurationUtil.getInteger(e, - "confirmation-window-size", - FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, - Validators.GT_ZERO); - - String discoveryGroupName = null; - - List<Pair<String, String>> connectorPairs = new ArrayList<Pair<String, String>>(); - - NodeList children = e.getChildNodes(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("discovery-group-ref")) - { - discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue(); - } - else if (child.getNodeName().equals("connector-ref")) - { - String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); - - Node backupNode = child.getAttributes().getNamedItem("backup-connector-name"); - - String backupConnectorName = null; - - if (backupNode != null) - { - backupConnectorName = backupNode.getNodeValue(); - } - - Pair<String, String> connectorPair = new Pair<String, String>(connectorName, backupConnectorName); - - connectorPairs.add(connectorPair); - } - } - - ClusterConnectionConfiguration config; - - if (discoveryGroupName == null) - { - config = new ClusterConnectionConfiguration(name, - address, - retryInterval, - duplicateDetection, - forwardWhenNoConsumers, - maxHops, - confirmationWindowSize, - connectorPairs); - } - else - { - config = new ClusterConnectionConfiguration(name, - address, - retryInterval, - duplicateDetection, - forwardWhenNoConsumers, - maxHops, - confirmationWindowSize, - discoveryGroupName); - } - - clusterConfigurations.add(config); - } - - private void parseGroupingHandlerConfiguration(final Element node) - { - String name = node.getAttribute("name"); - String type = XMLConfigurationUtil.getString(node, "type", null, Validators.NOT_NULL_OR_EMPTY); - String address = XMLConfigurationUtil.getString(node, "address", null, Validators.NOT_NULL_OR_EMPTY); - Integer timeout = XMLConfigurationUtil.getInteger(node, - "timeout", - GroupingHandlerConfiguration.DEFAULT_TIMEOUT, - Validators.GT_ZERO); - groupingHandlerConfiguration = new GroupingHandlerConfiguration(new SimpleString(name), - type.equals(GroupingHandlerConfiguration.TYPE.LOCAL.getType()) ? GroupingHandlerConfiguration.TYPE.LOCAL - : GroupingHandlerConfiguration.TYPE.REMOTE, - new SimpleString(address), - timeout); - } - - private void parseBridgeConfiguration(final Element brNode) - { - String name = brNode.getAttribute("name"); - - String queueName = XMLConfigurationUtil.getString(brNode, "queue-name", null, Validators.NOT_NULL_OR_EMPTY); - - String forwardingAddress = XMLConfigurationUtil.getString(brNode, - "forwarding-address", - null, - Validators.NOT_NULL_OR_EMPTY); - - String transformerClassName = XMLConfigurationUtil.getString(brNode, - "transformer-class-name", - null, - Validators.NO_CHECK); - - long retryInterval = XMLConfigurationUtil.getLong(brNode, - "retry-interval", - HornetQClient.DEFAULT_RETRY_INTERVAL, - Validators.GT_ZERO); - - // Default bridge conf - int confirmationWindowSize = XMLConfigurationUtil.getInteger(brNode, - "confirmation-window-size", - FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, - Validators.GT_ZERO); - - double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(brNode, - "retry-interval-multiplier", - HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - Validators.GT_ZERO); - - int reconnectAttempts = XMLConfigurationUtil.getInteger(brNode, - "reconnect-attempts", - ConfigurationImpl.DEFAULT_BRIDGE_RECONNECT_ATTEMPTS, - Validators.MINUS_ONE_OR_GE_ZERO); - - boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(brNode, - "failover-on-server-shutdown", - HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - - boolean useDuplicateDetection = XMLConfigurationUtil.getBoolean(brNode, - "use-duplicate-detection", - ConfigurationImpl.DEFAULT_BRIDGE_DUPLICATE_DETECTION); - - String user = XMLConfigurationUtil.getString(brNode, "user", ConfigurationImpl.DEFAULT_CLUSTER_USER, Validators.NO_CHECK); - - String password = XMLConfigurationUtil.getString(brNode, "password", ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD, Validators.NO_CHECK); - - String filterString = null; - - Pair<String, String> connectorPair = null; - - String discoveryGroupName = null; - - NodeList children = brNode.getChildNodes(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("filter")) - { - filterString = child.getAttributes().getNamedItem("string").getNodeValue(); - } - else if (child.getNodeName().equals("discovery-group-ref")) - { - discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue(); - } - else if (child.getNodeName().equals("connector-ref")) - { - String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); - - Node backupNode = child.getAttributes().getNamedItem("backup-connector-name"); - - String backupConnectorName = null; - - if (backupNode != null) - { - backupConnectorName = backupNode.getNodeValue(); - } - - connectorPair = new Pair<String, String>(connectorName, backupConnectorName); - } - } - - BridgeConfiguration config; - - if (connectorPair != null) - { - config = new BridgeConfiguration(name, - queueName, - forwardingAddress, - filterString, - transformerClassName, - retryInterval, - retryIntervalMultiplier, - reconnectAttempts, - failoverOnServerShutdown, - useDuplicateDetection, - confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - connectorPair, - user, - password); - } - else - { - config = new BridgeConfiguration(name, - queueName, - forwardingAddress, - filterString, - transformerClassName, - retryInterval, - retryIntervalMultiplier, - reconnectAttempts, - failoverOnServerShutdown, - useDuplicateDetection, - confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - discoveryGroupName, - user, - password); - } - - bridgeConfigurations.add(config); - } - - private void parseDivertConfiguration(final Element e) - { - String name = e.getAttribute("name"); - - String routingName = XMLConfigurationUtil.getString(e, "routing-name", null, Validators.NO_CHECK); - - String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY); - - String forwardingAddress = XMLConfigurationUtil.getString(e, - "forwarding-address", - null, - Validators.NOT_NULL_OR_EMPTY); - - boolean exclusive = XMLConfigurationUtil.getBoolean(e, "exclusive", ConfigurationImpl.DEFAULT_DIVERT_EXCLUSIVE); - - String transformerClassName = XMLConfigurationUtil.getString(e, - "transformer-class-name", - null, - Validators.NO_CHECK); - - String filterString = null; - - NodeList children = e.getChildNodes(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("filter")) - { - filterString = child.getAttributes().getNamedItem("string").getNodeValue(); - } - } - - DivertConfiguration config = new DivertConfiguration(name, - routingName, - address, - forwardingAddress, - exclusive, - filterString, - transformerClassName); - - divertConfigurations.add(config); - } } Modified: trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -13,15 +13,12 @@ package org.hornetq.core.deployers.impl; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.config.impl.Validators; +import org.hornetq.api.core.Pair; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.logging.Logger; import org.hornetq.core.settings.HierarchicalRepository; -import org.hornetq.core.settings.impl.AddressFullMessagePolicy; import org.hornetq.core.settings.impl.AddressSettings; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * A deployer for creating a set of queue settings and adding them to a repository @@ -31,29 +28,9 @@ { private static final Logger log = Logger.getLogger(AddressSettingsDeployer.class); - private static final String DEAD_LETTER_ADDRESS_NODE_NAME = "dead-letter-address"; - - private static final String EXPIRY_ADDRESS_NODE_NAME = "expiry-address"; - - private static final String REDELIVERY_DELAY_NODE_NAME = "redelivery-delay"; - - private static final String MAX_DELIVERY_ATTEMPTS = "max-delivery-attempts"; - - private static final String MAX_SIZE_BYTES_NODE_NAME = "max-size-bytes"; - - private static final String ADDRESS_FULL_MESSAGE_POLICY_NODE_NAME = "address-full-policy"; - - private static final String PAGE_SIZE_BYTES_NODE_NAME = "page-size-bytes"; - - private static final String MESSAGE_COUNTER_HISTORY_DAY_LIMIT_NODE_NAME = "message-counter-history-day-limit"; - - private static final String LVQ_NODE_NAME = "last-value-queue"; - - private static final String REDISTRIBUTION_DELAY_NODE_NAME = "redistribution-delay"; - - private static final String SEND_TO_DLA_ON_NO_ROUTE = "send-to-dla-on-no-route"; - private final HierarchicalRepository<AddressSettings> addressSettingsRepository; + + private final FileConfigurationParser parser = new FileConfigurationParser(); public AddressSettingsDeployer(final DeploymentManager deploymentManager, final HierarchicalRepository<AddressSettings> addressSettingsRepository) @@ -86,81 +63,10 @@ @Override public void deploy(final Node node) throws Exception { - String match = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue(); + + Pair<String, AddressSettings> setting = parser.parseAddressSettings(node); - NodeList children = node.getChildNodes(); - - AddressSettings addressSettings = new AddressSettings(); - - for (int i = 0; i < children.getLength(); i++) - { - Node child = children.item(i); - - if (AddressSettingsDeployer.DEAD_LETTER_ADDRESS_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - SimpleString queueName = new SimpleString(child.getTextContent()); - addressSettings.setDeadLetterAddress(queueName); - } - else if (AddressSettingsDeployer.EXPIRY_ADDRESS_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - SimpleString queueName = new SimpleString(child.getTextContent()); - addressSettings.setExpiryAddress(queueName); - } - else if (AddressSettingsDeployer.REDELIVERY_DELAY_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - addressSettings.setRedeliveryDelay(Long.valueOf(child.getTextContent())); - } - else if (AddressSettingsDeployer.MAX_SIZE_BYTES_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - addressSettings.setMaxSizeBytes(Integer.valueOf(child.getTextContent())); - } - else if (AddressSettingsDeployer.PAGE_SIZE_BYTES_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - addressSettings.setPageSizeBytes(Integer.valueOf(child.getTextContent())); - } - else if (AddressSettingsDeployer.MESSAGE_COUNTER_HISTORY_DAY_LIMIT_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - addressSettings.setMessageCounterHistoryDayLimit(Integer.valueOf(child.getTextContent())); - } - else if (AddressSettingsDeployer.ADDRESS_FULL_MESSAGE_POLICY_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - String value = child.getTextContent().trim(); - Validators.ADDRESS_FULL_MESSAGE_POLICY_TYPE.validate(AddressSettingsDeployer.ADDRESS_FULL_MESSAGE_POLICY_NODE_NAME, - value); - AddressFullMessagePolicy policy = null; - if (value.equals(AddressFullMessagePolicy.BLOCK.toString())) - { - policy = AddressFullMessagePolicy.BLOCK; - } - else if (value.equals(AddressFullMessagePolicy.DROP.toString())) - { - policy = AddressFullMessagePolicy.DROP; - } - else if (value.equals(AddressFullMessagePolicy.PAGE.toString())) - { - policy = AddressFullMessagePolicy.PAGE; - } - addressSettings.setAddressFullMessagePolicy(policy); - } - else if (AddressSettingsDeployer.LVQ_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - addressSettings.setLastValueQueue(Boolean.valueOf(child.getTextContent().trim())); - } - else if (AddressSettingsDeployer.MAX_DELIVERY_ATTEMPTS.equalsIgnoreCase(child.getNodeName())) - { - addressSettings.setMaxDeliveryAttempts(Integer.valueOf(child.getTextContent().trim())); - } - else if (AddressSettingsDeployer.REDISTRIBUTION_DELAY_NODE_NAME.equalsIgnoreCase(child.getNodeName())) - { - addressSettings.setRedistributionDelay(Long.valueOf(child.getTextContent().trim())); - } - else if (AddressSettingsDeployer.SEND_TO_DLA_ON_NO_ROUTE.equalsIgnoreCase(child.getNodeName())) - { - addressSettings.setSendToDLAOnNoRoute(Boolean.valueOf(child.getTextContent().trim())); - } - } - - addressSettingsRepository.addMatch(match, addressSettings); + addressSettingsRepository.addMatch(setting.a, setting.b); } @Override Added: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java (rev 0) +++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -0,0 +1,1198 @@ +/* + * Copyright 2010 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.deployers.impl; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; +import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.config.impl.FileConfiguration; +import org.hornetq.core.config.impl.Validators; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.security.Role; +import org.hornetq.core.server.JournalType; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.DivertConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; +import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; +import org.hornetq.core.settings.impl.AddressFullMessagePolicy; +import org.hornetq.core.settings.impl.AddressSettings; +import org.hornetq.utils.XMLConfigurationUtil; +import org.hornetq.utils.XMLUtil; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * This class will parse the XML associated with the File Configuration XSD + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class FileConfigurationParser +{ + + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(FileConfigurationParser.class); + + private static final String CONFIGURATION_SCHEMA_URL = "schema/hornetq-configuration.xsd"; + + // Security Parsing + public static final String SECURITY_ELEMENT_NAME = "security-setting"; + + private static final String PERMISSION_ELEMENT_NAME = "permission"; + + private static final String TYPE_ATTR_NAME = "type"; + + private static final String ROLES_ATTR_NAME = "roles"; + + private static final String CREATEDURABLEQUEUE_NAME = "createDurableQueue"; + + private static final String DELETEDURABLEQUEUE_NAME = "deleteDurableQueue"; + + private static final String CREATETEMPQUEUE_NAME = "createTempQueue"; + + private static final String DELETETEMPQUEUE_NAME = "deleteTempQueue"; + + private static final String SEND_NAME = "send"; + + private static final String CONSUME_NAME = "consume"; + + private static final String MANAGE_NAME = "manage"; + + // Address parsing + + private static final String DEAD_LETTER_ADDRESS_NODE_NAME = "dead-letter-address"; + + private static final String EXPIRY_ADDRESS_NODE_NAME = "expiry-address"; + + private static final String REDELIVERY_DELAY_NODE_NAME = "redelivery-delay"; + + private static final String MAX_DELIVERY_ATTEMPTS = "max-delivery-attempts"; + + private static final String MAX_SIZE_BYTES_NODE_NAME = "max-size-bytes"; + + private static final String ADDRESS_FULL_MESSAGE_POLICY_NODE_NAME = "address-full-policy"; + + private static final String PAGE_SIZE_BYTES_NODE_NAME = "page-size-bytes"; + + private static final String MESSAGE_COUNTER_HISTORY_DAY_LIMIT_NODE_NAME = "message-counter-history-day-limit"; + + private static final String LVQ_NODE_NAME = "last-value-queue"; + + private static final String REDISTRIBUTION_DELAY_NODE_NAME = "redistribution-delay"; + + private static final String SEND_TO_DLA_ON_NO_ROUTE = "send-to-dla-on-no-route"; + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + public Configuration parseMainConfig(final InputStream input) throws Exception + { + + Reader reader = new InputStreamReader(input); + String xml = org.hornetq.utils.XMLUtil.readerToString(reader); + xml = XMLUtil.replaceSystemProps(xml); + Element e = org.hornetq.utils.XMLUtil.stringToElement(xml); + + Configuration config = new ConfigurationImpl(); + + parseMainConfig(e, config); + + return config; + } + + public void parseMainConfig(final Element e, final Configuration config) throws Exception + { + XMLUtil.validate(e, FileConfigurationParser.CONFIGURATION_SCHEMA_URL); + + config.setClustered(XMLConfigurationUtil.getBoolean(e, "clustered", config.isClustered())); + + config.setBackup(XMLConfigurationUtil.getBoolean(e, "backup", config.isBackup())); + + config.setSharedStore(XMLConfigurationUtil.getBoolean(e, "shared-store", config.isSharedStore())); + + // Defaults to true when using FileConfiguration + config.setFileDeploymentEnabled(XMLConfigurationUtil.getBoolean(e, + "file-deployment-enabled", + config instanceof FileConfiguration)); + + config.setPersistenceEnabled(XMLConfigurationUtil.getBoolean(e, + "persistence-enabled", + config.isPersistenceEnabled())); + + config.setPersistDeliveryCountBeforeDelivery(XMLConfigurationUtil.getBoolean(e, + "persist-delivery-count-before-delivery", + config.isPersistDeliveryCountBeforeDelivery())); + + config.setScheduledThreadPoolMaxSize(XMLConfigurationUtil.getInteger(e, + "scheduled-thread-pool-max-size", + config.getScheduledThreadPoolMaxSize(), + Validators.GT_ZERO)); + + config.setThreadPoolMaxSize(XMLConfigurationUtil.getInteger(e, + "thread-pool-max-size", + config.getThreadPoolMaxSize(), + Validators.MINUS_ONE_OR_GT_ZERO)); + + config.setSecurityEnabled(XMLConfigurationUtil.getBoolean(e, "security-enabled", config.isSecurityEnabled())); + + config.setJMXManagementEnabled(XMLConfigurationUtil.getBoolean(e, + "jmx-management-enabled", + config.isJMXManagementEnabled())); + + config.setJMXDomain(XMLConfigurationUtil.getString(e, + "jmx-domain", + config.getJMXDomain(), + Validators.NOT_NULL_OR_EMPTY)); + + config.setSecurityInvalidationInterval(XMLConfigurationUtil.getLong(e, + "security-invalidation-interval", + config.getSecurityInvalidationInterval(), + Validators.GT_ZERO)); + + config.setConnectionTTLOverride(XMLConfigurationUtil.getLong(e, + "connection-ttl-override", + config.getConnectionTTLOverride(), + Validators.MINUS_ONE_OR_GT_ZERO)); + + config.setEnabledAsyncConnectionExecution(XMLConfigurationUtil.getBoolean(e, + "async-connection-execution-enabled", + config.isAsyncConnectionExecutionEnabled())); + + config.setTransactionTimeout(XMLConfigurationUtil.getLong(e, + "transaction-timeout", + config.getTransactionTimeout(), + Validators.GT_ZERO)); + + config.setTransactionTimeoutScanPeriod(XMLConfigurationUtil.getLong(e, + "transaction-timeout-scan-period", + config.getTransactionTimeoutScanPeriod(), + Validators.GT_ZERO)); + + config.setMessageExpiryScanPeriod(XMLConfigurationUtil.getLong(e, + "message-expiry-scan-period", + config.getMessageExpiryScanPeriod(), + Validators.GT_ZERO)); + + config.setMessageExpiryThreadPriority(XMLConfigurationUtil.getInteger(e, + "message-expiry-thread-priority", + config.getMessageExpiryThreadPriority(), + Validators.THREAD_PRIORITY_RANGE)); + + config.setIDCacheSize(XMLConfigurationUtil.getInteger(e, + "id-cache-size", + config.getIDCacheSize(), + Validators.GT_ZERO)); + + config.setPersistIDCache(XMLConfigurationUtil.getBoolean(e, "persist-id-cache", config.isPersistIDCache())); + + config.setManagementAddress(new SimpleString(XMLConfigurationUtil.getString(e, + "management-address", + config.getManagementAddress() + .toString(), + Validators.NOT_NULL_OR_EMPTY))); + + config.setManagementNotificationAddress(new SimpleString(XMLConfigurationUtil.getString(e, + "management-notification-address", + config.getManagementNotificationAddress() + .toString(), + Validators.NOT_NULL_OR_EMPTY))); + + config.setClusterPassword(XMLConfigurationUtil.getString(e, + "cluster-password", + config.getClusterPassword(), + Validators.NO_CHECK)); + + config.setClusterUser(XMLConfigurationUtil.getString(e, + "cluster-user", + config.getClusterUser(), + Validators.NO_CHECK)); + + config.setLogDelegateFactoryClassName(XMLConfigurationUtil.getString(e, + "log-delegate-factory-class-name", + config.getLogDelegateFactoryClassName(), + Validators.NOT_NULL_OR_EMPTY)); + + NodeList interceptorNodes = e.getElementsByTagName("remoting-interceptors"); + + ArrayList<String> interceptorList = new ArrayList<String>(); + + if (interceptorNodes.getLength() > 0) + { + NodeList interceptors = interceptorNodes.item(0).getChildNodes(); + + for (int i = 0; i < interceptors.getLength(); i++) + { + if ("class-name".equalsIgnoreCase(interceptors.item(i).getNodeName())) + { + String clazz = interceptors.item(i).getTextContent(); + + interceptorList.add(clazz); + } + } + } + + config.setInterceptorClassNames(interceptorList); + + NodeList backups = e.getElementsByTagName("backup-connector-ref"); + + // There should be only one - this will be enforced by the DTD + + if (backups.getLength() > 0) + { + Node backupNode = backups.item(0); + + config.setBackupConnectorName(backupNode.getAttributes().getNamedItem("connector-name").getNodeValue()); + } + + NodeList connectorNodes = e.getElementsByTagName("connector"); + + for (int i = 0; i < connectorNodes.getLength(); i++) + { + Element connectorNode = (Element)connectorNodes.item(i); + + TransportConfiguration connectorConfig = parseTransportConfiguration(connectorNode); + + if (connectorConfig.getName() == null) + { + FileConfigurationParser.log.warn("Cannot deploy a connector with no name specified."); + + continue; + } + + if (config.getConnectorConfigurations().containsKey(connectorConfig.getName())) + { + FileConfigurationParser.log.warn("There is already a connector with name " + connectorConfig.getName() + + " deployed. This one will not be deployed."); + + continue; + } + + config.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig); + } + + NodeList acceptorNodes = e.getElementsByTagName("acceptor"); + + for (int i = 0; i < acceptorNodes.getLength(); i++) + { + Element acceptorNode = (Element)acceptorNodes.item(i); + + TransportConfiguration acceptorConfig = parseTransportConfiguration(acceptorNode); + + config.getAcceptorConfigurations().add(acceptorConfig); + } + + NodeList bgNodes = e.getElementsByTagName("broadcast-group"); + + for (int i = 0; i < bgNodes.getLength(); i++) + { + Element bgNode = (Element)bgNodes.item(i); + + parseBroadcastGroupConfiguration(bgNode, config); + } + + NodeList dgNodes = e.getElementsByTagName("discovery-group"); + + for (int i = 0; i < dgNodes.getLength(); i++) + { + Element dgNode = (Element)dgNodes.item(i); + + parseDiscoveryGroupConfiguration(dgNode, config); + } + + NodeList brNodes = e.getElementsByTagName("bridge"); + + for (int i = 0; i < brNodes.getLength(); i++) + { + Element mfNode = (Element)brNodes.item(i); + + parseBridgeConfiguration(mfNode, config); + } + + NodeList gaNodes = e.getElementsByTagName("grouping-handler"); + + for (int i = 0; i < gaNodes.getLength(); i++) + { + Element gaNode = (Element)gaNodes.item(i); + + parseGroupingHandlerConfiguration(gaNode, config); + } + + NodeList ccNodes = e.getElementsByTagName("cluster-connection"); + + for (int i = 0; i < ccNodes.getLength(); i++) + { + Element ccNode = (Element)ccNodes.item(i); + + parseClusterConnectionConfiguration(ccNode, config); + } + + NodeList dvNodes = e.getElementsByTagName("divert"); + + for (int i = 0; i < dvNodes.getLength(); i++) + { + Element dvNode = (Element)dvNodes.item(i); + + parseDivertConfiguration(dvNode, config); + } + + // Persistence config + + config.setLargeMessagesDirectory(XMLConfigurationUtil.getString(e, + "large-messages-directory", + config.getLargeMessagesDirectory(), + Validators.NOT_NULL_OR_EMPTY)); + + config.setBindingsDirectory(XMLConfigurationUtil.getString(e, + "bindings-directory", + config.getBindingsDirectory(), + Validators.NOT_NULL_OR_EMPTY)); + + config.setCreateBindingsDir(XMLConfigurationUtil.getBoolean(e, + "create-bindings-dir", + config.isCreateBindingsDir())); + + config.setJournalDirectory(XMLConfigurationUtil.getString(e, + "journal-directory", + config.getJournalDirectory(), + Validators.NOT_NULL_OR_EMPTY)); + + config.setPagingDirectory(XMLConfigurationUtil.getString(e, + "paging-directory", + config.getPagingDirectory(), + Validators.NOT_NULL_OR_EMPTY)); + + config.setCreateJournalDir(XMLConfigurationUtil.getBoolean(e, "create-journal-dir", config.isCreateJournalDir())); + + String s = XMLConfigurationUtil.getString(e, + "journal-type", + config.getJournalType().toString(), + Validators.JOURNAL_TYPE); + + if (s.equals(JournalType.NIO.toString())) + { + config.setJournalType(JournalType.NIO); + } + else if (s.equals(JournalType.ASYNCIO.toString())) + { + config.setJournalType(JournalType.ASYNCIO); + } + + config.setJournalSyncTransactional(XMLConfigurationUtil.getBoolean(e, + "journal-sync-transactional", + config.isJournalSyncTransactional())); + + config.setJournalSyncNonTransactional(XMLConfigurationUtil.getBoolean(e, + "journal-sync-non-transactional", + config.isJournalSyncNonTransactional())); + + config.setJournalFileSize(XMLConfigurationUtil.getInteger(e, + "journal-file-size", + config.getJournalFileSize(), + Validators.GT_ZERO)); + + int journalBufferTimeout = XMLConfigurationUtil.getInteger(e, + "journal-buffer-timeout", + config.getJournalType() == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO + : ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, + Validators.GT_ZERO); + + int journalBufferSize = XMLConfigurationUtil.getInteger(e, + "journal-buffer-size", + config.getJournalType() == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_AIO + : ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, + Validators.GT_ZERO); + + int journalMaxIO = XMLConfigurationUtil.getInteger(e, + "journal-max-io", + config.getJournalType() == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_AIO + : ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_NIO, + Validators.GT_ZERO); + + if (config.getJournalType() == JournalType.ASYNCIO) + { + config.setJournalBufferTimeout_AIO(journalBufferTimeout); + config.setJournalBufferSize_AIO(journalBufferSize); + config.setJournalMaxIO_AIO(journalMaxIO); + } + else + { + config.setJournalBufferTimeout_NIO(journalBufferTimeout); + config.setJournalBufferSize_NIO(journalBufferSize); + config.setJournalMaxIO_NIO(journalMaxIO); + } + + config.setJournalMinFiles(XMLConfigurationUtil.getInteger(e, + "journal-min-files", + config.getJournalMinFiles(), + Validators.GT_ZERO)); + + config.setJournalCompactMinFiles(XMLConfigurationUtil.getInteger(e, + "journal-compact-min-files", + config.getJournalCompactMinFiles(), + Validators.GE_ZERO)); + + config.setJournalCompactPercentage(XMLConfigurationUtil.getInteger(e, + "journal-compact-percentage", + config.getJournalCompactPercentage(), + Validators.PERCENTAGE)); + + config.setLogJournalWriteRate(XMLConfigurationUtil.getBoolean(e, + "log-journal-write-rate", + ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE)); + + config.setJournalPerfBlastPages(XMLConfigurationUtil.getInteger(e, + "perf-blast-pages", + ConfigurationImpl.DEFAULT_JOURNAL_PERF_BLAST_PAGES, + Validators.MINUS_ONE_OR_GT_ZERO)); + + config.setRunSyncSpeedTest(XMLConfigurationUtil.getBoolean(e, "run-sync-speed-test", config.isRunSyncSpeedTest())); + + config.setWildcardRoutingEnabled(XMLConfigurationUtil.getBoolean(e, + "wild-card-routing-enabled", + config.isWildcardRoutingEnabled())); + + config.setMessageCounterEnabled(XMLConfigurationUtil.getBoolean(e, + "message-counter-enabled", + config.isMessageCounterEnabled())); + + config.setMessageCounterSamplePeriod(XMLConfigurationUtil.getLong(e, + "message-counter-sample-period", + config.getMessageCounterSamplePeriod(), + Validators.GT_ZERO)); + + config.setMessageCounterMaxDayHistory(XMLConfigurationUtil.getInteger(e, + "message-counter-max-day-history", + config.getMessageCounterMaxDayHistory(), + Validators.GT_ZERO)); + + config.setServerDumpInterval(XMLConfigurationUtil.getLong(e, + "server-dump-interval", + config.getServerDumpInterval(), + Validators.MINUS_ONE_OR_GT_ZERO)); // in + // milliseconds + + config.setMemoryWarningThreshold(XMLConfigurationUtil.getInteger(e, + "memory-warning-threshold", + config.getMemoryWarningThreshold(), + Validators.PERCENTAGE)); + + config.setMemoryMeasureInterval(XMLConfigurationUtil.getLong(e, + "memory-measure-interval", + config.getMemoryMeasureInterval(), + Validators.MINUS_ONE_OR_GT_ZERO)); // in + + parseAddressSettings(e, config); + + parseQueues(e, config); + + parseSecurity(e, config); + + + + } + + /** + * @param e + * @param config + */ + private void parseSecurity(final Element e, final Configuration config) + { + NodeList elements = e.getElementsByTagName("security-settings"); + + if (elements.getLength() != 0) + { + Element node = (Element)elements.item(0); + NodeList list = node.getElementsByTagName("security-setting"); + for (int i = 0 ; i < list.getLength(); i++) + { + Pair<String, Set<Role>> securityItem = parseSecurityRoles(list.item(i)); + config.getSecurityRoles().put(securityItem.a, securityItem.b); + } + } + } + + /** + * @param e + * @param config + */ + private void parseQueues(final Element e, final Configuration config) + { + NodeList elements = e.getElementsByTagName("queues"); + + if (elements.getLength() != 0) + { + Element node = (Element)elements.item(0); + NodeList list = node.getElementsByTagName("queue"); + for (int i = 0 ; i < list.getLength(); i++) + { + QueueConfiguration queueConfig = parseQueueConfiguration(list.item(i)); + config.getQueueConfigurations().add(queueConfig); + } + } + } + + /** + * @param e + * @param config + */ + private void parseAddressSettings(final Element e, final Configuration config) + { + NodeList elements = e.getElementsByTagName("address-settings"); + + if (elements.getLength() != 0) + { + Element node = (Element)elements.item(0); + NodeList list = node.getElementsByTagName("address-setting"); + for (int i = 0 ; i < list.getLength(); i++) + { + Pair<String, AddressSettings> addressSettings = parseAddressSettings(list.item(i)); + config.getAddressesSettings().put(addressSettings.a, addressSettings.b); + } + } + } + + /** + * @param node + * @return + */ + public Pair<String, Set<Role>> parseSecurityRoles(final Node node) + { + String match = node.getAttributes().getNamedItem("match").getNodeValue(); + + HashSet<Role> securityRoles = new HashSet<Role>(); + + Pair<String, Set<Role>> securityMatch = new Pair<String, Set<Role>>(match, securityRoles); + + ArrayList<String> send = new ArrayList<String>(); + ArrayList<String> consume = new ArrayList<String>(); + ArrayList<String> createDurableQueue = new ArrayList<String>(); + ArrayList<String> deleteDurableQueue = new ArrayList<String>(); + ArrayList<String> createTempQueue = new ArrayList<String>(); + ArrayList<String> deleteTempQueue = new ArrayList<String>(); + ArrayList<String> manageRoles = new ArrayList<String>(); + ArrayList<String> allRoles = new ArrayList<String>(); + NodeList children = node.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) + { + Node child = children.item(i); + + if (FileConfigurationParser.PERMISSION_ELEMENT_NAME.equalsIgnoreCase(child.getNodeName())) + { + String type = child.getAttributes().getNamedItem(FileConfigurationParser.TYPE_ATTR_NAME).getNodeValue(); + String roleString = child.getAttributes() + .getNamedItem(FileConfigurationParser.ROLES_ATTR_NAME) + .getNodeValue(); + String[] roles = roleString.split(","); + for (String role : roles) + { + if (FileConfigurationParser.SEND_NAME.equals(type)) + { + send.add(role.trim()); + } + else if (FileConfigurationParser.CONSUME_NAME.equals(type)) + { + consume.add(role.trim()); + } + else if (FileConfigurationParser.CREATEDURABLEQUEUE_NAME.equals(type)) + { + createDurableQueue.add(role); + } + else if (FileConfigurationParser.DELETEDURABLEQUEUE_NAME.equals(type)) + { + deleteDurableQueue.add(role); + } + else if (FileConfigurationParser.CREATETEMPQUEUE_NAME.equals(type)) + { + createTempQueue.add(role); + } + else if (FileConfigurationParser.DELETETEMPQUEUE_NAME.equals(type)) + { + deleteTempQueue.add(role); + } + else if (FileConfigurationParser.MANAGE_NAME.equals(type)) + { + manageRoles.add(role); + } + if (!allRoles.contains(role.trim())) + { + allRoles.add(role.trim()); + } + } + } + + } + + for (String role : allRoles) + { + securityRoles.add(new Role(role, + send.contains(role), + consume.contains(role), + createDurableQueue.contains(role), + deleteDurableQueue.contains(role), + createTempQueue.contains(role), + deleteTempQueue.contains(role), + manageRoles.contains(role))); + } + + return securityMatch; + } + + /** + * @param node + * @return + */ + public Pair<String, AddressSettings> parseAddressSettings(final Node node) + { + String match = node.getAttributes().getNamedItem("match").getNodeValue(); + + NodeList children = node.getChildNodes(); + + AddressSettings addressSettings = new AddressSettings(); + + Pair<String, AddressSettings> setting = new Pair<String, AddressSettings>(match, addressSettings); + + for (int i = 0; i < children.getLength(); i++) + { + Node child = children.item(i); + + if (FileConfigurationParser.DEAD_LETTER_ADDRESS_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + SimpleString queueName = new SimpleString(child.getTextContent()); + addressSettings.setDeadLetterAddress(queueName); + } + else if (FileConfigurationParser.EXPIRY_ADDRESS_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + SimpleString queueName = new SimpleString(child.getTextContent()); + addressSettings.setExpiryAddress(queueName); + } + else if (FileConfigurationParser.REDELIVERY_DELAY_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + addressSettings.setRedeliveryDelay(Long.valueOf(child.getTextContent())); + } + else if (FileConfigurationParser.MAX_SIZE_BYTES_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + addressSettings.setMaxSizeBytes(Integer.valueOf(child.getTextContent())); + } + else if (FileConfigurationParser.PAGE_SIZE_BYTES_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + addressSettings.setPageSizeBytes(Integer.valueOf(child.getTextContent())); + } + else if (FileConfigurationParser.MESSAGE_COUNTER_HISTORY_DAY_LIMIT_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + addressSettings.setMessageCounterHistoryDayLimit(Integer.valueOf(child.getTextContent())); + } + else if (FileConfigurationParser.ADDRESS_FULL_MESSAGE_POLICY_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + String value = child.getTextContent().trim(); + Validators.ADDRESS_FULL_MESSAGE_POLICY_TYPE.validate(FileConfigurationParser.ADDRESS_FULL_MESSAGE_POLICY_NODE_NAME, + value); + AddressFullMessagePolicy policy = null; + if (value.equals(AddressFullMessagePolicy.BLOCK.toString())) + { + policy = AddressFullMessagePolicy.BLOCK; + } + else if (value.equals(AddressFullMessagePolicy.DROP.toString())) + { + policy = AddressFullMessagePolicy.DROP; + } + else if (value.equals(AddressFullMessagePolicy.PAGE.toString())) + { + policy = AddressFullMessagePolicy.PAGE; + } + addressSettings.setAddressFullMessagePolicy(policy); + } + else if (FileConfigurationParser.LVQ_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + addressSettings.setLastValueQueue(Boolean.valueOf(child.getTextContent().trim())); + } + else if (FileConfigurationParser.MAX_DELIVERY_ATTEMPTS.equalsIgnoreCase(child.getNodeName())) + { + addressSettings.setMaxDeliveryAttempts(Integer.valueOf(child.getTextContent().trim())); + } + else if (FileConfigurationParser.REDISTRIBUTION_DELAY_NODE_NAME.equalsIgnoreCase(child.getNodeName())) + { + addressSettings.setRedistributionDelay(Long.valueOf(child.getTextContent().trim())); + } + else if (FileConfigurationParser.SEND_TO_DLA_ON_NO_ROUTE.equalsIgnoreCase(child.getNodeName())) + { + addressSettings.setSendToDLAOnNoRoute(Boolean.valueOf(child.getTextContent().trim())); + } + } + return setting; + } + + public QueueConfiguration parseQueueConfiguration(final Node node) + { + String name = node.getAttributes().getNamedItem("name").getNodeValue(); + String address = null; + String filterString = null; + boolean durable = true; + + NodeList children = node.getChildNodes(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("address")) + { + address = child.getTextContent().trim(); + } + else if (child.getNodeName().equals("filter")) + { + filterString = child.getAttributes().getNamedItem("string").getNodeValue(); + } + else if (child.getNodeName().equals("durable")) + { + durable = Boolean.parseBoolean(child.getTextContent().trim()); + } + } + + return new QueueConfiguration(address, name, filterString, durable); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + private TransportConfiguration parseTransportConfiguration(final Element e) + { + Node nameNode = e.getAttributes().getNamedItem("name"); + + String name = nameNode != null ? nameNode.getNodeValue() : null; + + String clazz = XMLConfigurationUtil.getString(e, "factory-class", null, Validators.NOT_NULL_OR_EMPTY); + + Map<String, Object> params = new HashMap<String, Object>(); + + NodeList paramsNodes = e.getElementsByTagName("param"); + + for (int i = 0; i < paramsNodes.getLength(); i++) + { + Node paramNode = paramsNodes.item(i); + NamedNodeMap attributes = paramNode.getAttributes(); + + Node nkey = attributes.getNamedItem("key"); + + String key = nkey.getTextContent(); + + Node nValue = attributes.getNamedItem("value"); + + params.put(key, nValue.getTextContent()); + } + + return new TransportConfiguration(clazz, params, name); + } + + private void parseBroadcastGroupConfiguration(final Element e, final Configuration mainConfig) + { + String name = e.getAttribute("name"); + + String localAddress = XMLConfigurationUtil.getString(e, "local-bind-address", null, Validators.NO_CHECK); + + int localBindPort = XMLConfigurationUtil.getInteger(e, "local-bind-port", -1, Validators.MINUS_ONE_OR_GT_ZERO); + + String groupAddress = XMLConfigurationUtil.getString(e, "group-address", null, Validators.NOT_NULL_OR_EMPTY); + + int groupPort = XMLConfigurationUtil.getInteger(e, "group-port", -1, Validators.GT_ZERO); + + long broadcastPeriod = XMLConfigurationUtil.getLong(e, + "broadcast-period", + ConfigurationImpl.DEFAULT_BROADCAST_PERIOD, + Validators.GT_ZERO); + + NodeList children = e.getChildNodes(); + + List<Pair<String, String>> connectorNames = new ArrayList<Pair<String, String>>(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("connector-ref")) + { + String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); + + Node backupConnectorNode = child.getAttributes().getNamedItem("backup-connector-name"); + + String backupConnectorName = null; + + if (backupConnectorNode != null) + { + backupConnectorName = backupConnectorNode.getNodeValue(); + } + + Pair<String, String> connectorInfo = new Pair<String, String>(connectorName, backupConnectorName); + + connectorNames.add(connectorInfo); + } + } + + BroadcastGroupConfiguration config = new BroadcastGroupConfiguration(name, + localAddress, + localBindPort, + groupAddress, + groupPort, + broadcastPeriod, + connectorNames); + + mainConfig.getBroadcastGroupConfigurations().add(config); + } + + private void parseDiscoveryGroupConfiguration(final Element e, final Configuration mainConfig) + { + String name = e.getAttribute("name"); + + String groupAddress = XMLConfigurationUtil.getString(e, "group-address", null, Validators.NOT_NULL_OR_EMPTY); + + int groupPort = XMLConfigurationUtil.getInteger(e, "group-port", -1, Validators.MINUS_ONE_OR_GT_ZERO); + + long refreshTimeout = XMLConfigurationUtil.getLong(e, + "refresh-timeout", + ConfigurationImpl.DEFAULT_BROADCAST_REFRESH_TIMEOUT, + Validators.GT_ZERO); + + DiscoveryGroupConfiguration config = new DiscoveryGroupConfiguration(name, + groupAddress, + groupPort, + refreshTimeout); + + if (mainConfig.getDiscoveryGroupConfigurations().containsKey(name)) + { + FileConfigurationParser.log.warn("There is already a discovery group with name " + name + + " deployed. This one will not be deployed."); + + return; + } + else + { + mainConfig.getDiscoveryGroupConfigurations().put(name, config); + } + } + + private void parseClusterConnectionConfiguration(final Element e, final Configuration mainConfig) + { + String name = e.getAttribute("name"); + + String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY); + + boolean duplicateDetection = XMLConfigurationUtil.getBoolean(e, + "use-duplicate-detection", + ConfigurationImpl.DEFAULT_CLUSTER_DUPLICATE_DETECTION); + + boolean forwardWhenNoConsumers = XMLConfigurationUtil.getBoolean(e, + "forward-when-no-consumers", + ConfigurationImpl.DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS); + + int maxHops = XMLConfigurationUtil.getInteger(e, + "max-hops", + ConfigurationImpl.DEFAULT_CLUSTER_MAX_HOPS, + Validators.GE_ZERO); + + long retryInterval = XMLConfigurationUtil.getLong(e, + "retry-interval", + ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL, + Validators.GT_ZERO); + + int confirmationWindowSize = XMLConfigurationUtil.getInteger(e, + "confirmation-window-size", + FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, + Validators.GT_ZERO); + + String discoveryGroupName = null; + + List<Pair<String, String>> connectorPairs = new ArrayList<Pair<String, String>>(); + + NodeList children = e.getChildNodes(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("discovery-group-ref")) + { + discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue(); + } + else if (child.getNodeName().equals("connector-ref")) + { + String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); + + Node backupNode = child.getAttributes().getNamedItem("backup-connector-name"); + + String backupConnectorName = null; + + if (backupNode != null) + { + backupConnectorName = backupNode.getNodeValue(); + } + + Pair<String, String> connectorPair = new Pair<String, String>(connectorName, backupConnectorName); + + connectorPairs.add(connectorPair); + } + } + + ClusterConnectionConfiguration config; + + if (discoveryGroupName == null) + { + config = new ClusterConnectionConfiguration(name, + address, + retryInterval, + duplicateDetection, + forwardWhenNoConsumers, + maxHops, + confirmationWindowSize, + connectorPairs); + } + else + { + config = new ClusterConnectionConfiguration(name, + address, + retryInterval, + duplicateDetection, + forwardWhenNoConsumers, + maxHops, + confirmationWindowSize, + discoveryGroupName); + } + + mainConfig.getClusterConfigurations().add(config); + } + + private void parseGroupingHandlerConfiguration(final Element node, final Configuration mainConfiguration) + { + String name = node.getAttribute("name"); + String type = XMLConfigurationUtil.getString(node, "type", null, Validators.NOT_NULL_OR_EMPTY); + String address = XMLConfigurationUtil.getString(node, "address", null, Validators.NOT_NULL_OR_EMPTY); + Integer timeout = XMLConfigurationUtil.getInteger(node, + "timeout", + GroupingHandlerConfiguration.DEFAULT_TIMEOUT, + Validators.GT_ZERO); + mainConfiguration.setGroupingHandlerConfiguration(new GroupingHandlerConfiguration(new SimpleString(name), + type.equals(GroupingHandlerConfiguration.TYPE.LOCAL.getType()) ? GroupingHandlerConfiguration.TYPE.LOCAL + : GroupingHandlerConfiguration.TYPE.REMOTE, + new SimpleString(address), + timeout)); + } + + private void parseBridgeConfiguration(final Element brNode, final Configuration mainConfig) + { + String name = brNode.getAttribute("name"); + + String queueName = XMLConfigurationUtil.getString(brNode, "queue-name", null, Validators.NOT_NULL_OR_EMPTY); + + String forwardingAddress = XMLConfigurationUtil.getString(brNode, + "forwarding-address", + null, + Validators.NOT_NULL_OR_EMPTY); + + String transformerClassName = XMLConfigurationUtil.getString(brNode, + "transformer-class-name", + null, + Validators.NO_CHECK); + + long retryInterval = XMLConfigurationUtil.getLong(brNode, + "retry-interval", + HornetQClient.DEFAULT_RETRY_INTERVAL, + Validators.GT_ZERO); + + // Default bridge conf + int confirmationWindowSize = XMLConfigurationUtil.getInteger(brNode, + "confirmation-window-size", + FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, + Validators.GT_ZERO); + + double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(brNode, + "retry-interval-multiplier", + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + Validators.GT_ZERO); + + int reconnectAttempts = XMLConfigurationUtil.getInteger(brNode, + "reconnect-attempts", + ConfigurationImpl.DEFAULT_BRIDGE_RECONNECT_ATTEMPTS, + Validators.MINUS_ONE_OR_GE_ZERO); + + boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(brNode, + "failover-on-server-shutdown", + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + + boolean useDuplicateDetection = XMLConfigurationUtil.getBoolean(brNode, + "use-duplicate-detection", + ConfigurationImpl.DEFAULT_BRIDGE_DUPLICATE_DETECTION); + + String user = XMLConfigurationUtil.getString(brNode, + "user", + ConfigurationImpl.DEFAULT_CLUSTER_USER, + Validators.NO_CHECK); + + String password = XMLConfigurationUtil.getString(brNode, + "password", + ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD, + Validators.NO_CHECK); + + String filterString = null; + + Pair<String, String> connectorPair = null; + + String discoveryGroupName = null; + + NodeList children = brNode.getChildNodes(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("filter")) + { + filterString = child.getAttributes().getNamedItem("string").getNodeValue(); + } + else if (child.getNodeName().equals("discovery-group-ref")) + { + discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue(); + } + else if (child.getNodeName().equals("connector-ref")) + { + String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); + + Node backupNode = child.getAttributes().getNamedItem("backup-connector-name"); + + String backupConnectorName = null; + + if (backupNode != null) + { + backupConnectorName = backupNode.getNodeValue(); + } + + connectorPair = new Pair<String, String>(connectorName, backupConnectorName); + } + } + + BridgeConfiguration config; + + if (connectorPair != null) + { + config = new BridgeConfiguration(name, + queueName, + forwardingAddress, + filterString, + transformerClassName, + retryInterval, + retryIntervalMultiplier, + reconnectAttempts, + failoverOnServerShutdown, + useDuplicateDetection, + confirmationWindowSize, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + connectorPair, + user, + password); + } + else + { + config = new BridgeConfiguration(name, + queueName, + forwardingAddress, + filterString, + transformerClassName, + retryInterval, + retryIntervalMultiplier, + reconnectAttempts, + failoverOnServerShutdown, + useDuplicateDetection, + confirmationWindowSize, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + discoveryGroupName, + user, + password); + } + + mainConfig.getBridgeConfigurations().add(config); + } + + private void parseDivertConfiguration(final Element e, final Configuration mainConfig) + { + String name = e.getAttribute("name"); + + String routingName = XMLConfigurationUtil.getString(e, "routing-name", null, Validators.NO_CHECK); + + String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY); + + String forwardingAddress = XMLConfigurationUtil.getString(e, + "forwarding-address", + null, + Validators.NOT_NULL_OR_EMPTY); + + boolean exclusive = XMLConfigurationUtil.getBoolean(e, "exclusive", ConfigurationImpl.DEFAULT_DIVERT_EXCLUSIVE); + + String transformerClassName = XMLConfigurationUtil.getString(e, + "transformer-class-name", + null, + Validators.NO_CHECK); + + String filterString = null; + + NodeList children = e.getChildNodes(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("filter")) + { + filterString = child.getAttributes().getNamedItem("string").getNodeValue(); + } + } + + DivertConfiguration config = new DivertConfiguration(name, + routingName, + address, + forwardingAddress, + exclusive, + filterString, + transformerClassName); + + mainConfig.getDivertConfigurations().add(config); + } + + // Inner classes ------------------------------------------------- + +} Modified: trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -17,7 +17,6 @@ import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.server.cluster.QueueConfiguration; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * A QueueDeployer @@ -30,6 +29,8 @@ { private final HornetQServerControl serverControl; + private final FileConfigurationParser parser = new FileConfigurationParser(); + public QueueDeployer(final DeploymentManager deploymentManager, final HornetQServerControl serverControl) { super(deploymentManager); @@ -61,7 +62,7 @@ @Override public void deploy(final Node node) throws Exception { - QueueConfiguration queueConfig = parseQueueConfiguration(node); + QueueConfiguration queueConfig = parser.parseQueueConfiguration(node); serverControl.deployQueue(queueConfig.getAddress(), queueConfig.getName(), @@ -86,34 +87,4 @@ return new String[] { "hornetq-configuration.xml", "hornetq-queues.xml" }; } - private QueueConfiguration parseQueueConfiguration(final Node node) - { - String name = node.getAttributes().getNamedItem("name").getNodeValue(); - String address = null; - String filterString = null; - boolean durable = true; - - NodeList children = node.getChildNodes(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("address")) - { - address = child.getTextContent().trim(); - } - else if (child.getNodeName().equals("filter")) - { - filterString = child.getAttributes().getNamedItem("string").getNodeValue(); - } - else if (child.getNodeName().equals("durable")) - { - durable = Boolean.parseBoolean(child.getTextContent().trim()); - } - } - - return new QueueConfiguration(address, name, filterString, durable); - } - } Modified: trunk/src/main/org/hornetq/core/deployers/impl/SecurityDeployer.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/SecurityDeployer.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/src/main/org/hornetq/core/deployers/impl/SecurityDeployer.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -13,16 +13,14 @@ package org.hornetq.core.deployers.impl; -import java.util.ArrayList; -import java.util.HashSet; import java.util.Set; +import org.hornetq.api.core.Pair; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.logging.Logger; import org.hornetq.core.security.Role; import org.hornetq.core.settings.HierarchicalRepository; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * Deploys the security settings into a security repository and adds them to the security store. @@ -33,32 +31,12 @@ { private static final Logger log = Logger.getLogger(SecurityDeployer.class); - private static final String PERMISSION_ELEMENT_NAME = "permission"; - - private static final String TYPE_ATTR_NAME = "type"; - - private static final String ROLES_ATTR_NAME = "roles"; - private static final String QUEUES_XML = "hornetq-queues.xml"; private static final String MATCH = "match"; - private static final String SECURITY_ELEMENT_NAME = "security-setting"; + private final FileConfigurationParser parser = new FileConfigurationParser(); - public static final String SEND_NAME = "send"; - - public static final String CONSUME_NAME = "consume"; - - public static final String CREATEDURABLEQUEUE_NAME = "createDurableQueue"; - - public static final String DELETEDURABLEQUEUE_NAME = "deleteDurableQueue"; - - public static final String CREATETEMPQUEUE_NAME = "createTempQueue"; - - public static final String DELETETEMPQUEUE_NAME = "deleteTempQueue"; - - public static final String MANAGE_NAME = "manage"; - /** * The repository to add to */ @@ -80,7 +58,7 @@ @Override public String[] getElementTagName() { - return new String[] { SecurityDeployer.SECURITY_ELEMENT_NAME }; + return new String[] { FileConfigurationParser.SECURITY_ELEMENT_NAME }; } @Override @@ -109,76 +87,8 @@ @Override public void deploy(final Node node) throws Exception { - HashSet<Role> securityRoles = new HashSet<Role>(); - ArrayList<String> send = new ArrayList<String>(); - ArrayList<String> consume = new ArrayList<String>(); - ArrayList<String> createDurableQueue = new ArrayList<String>(); - ArrayList<String> deleteDurableQueue = new ArrayList<String>(); - ArrayList<String> createTempQueue = new ArrayList<String>(); - ArrayList<String> deleteTempQueue = new ArrayList<String>(); - ArrayList<String> manageRoles = new ArrayList<String>(); - ArrayList<String> allRoles = new ArrayList<String>(); - String match = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue(); - NodeList children = node.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) - { - Node child = children.item(i); - - if (SecurityDeployer.PERMISSION_ELEMENT_NAME.equalsIgnoreCase(child.getNodeName())) - { - String type = child.getAttributes().getNamedItem(SecurityDeployer.TYPE_ATTR_NAME).getNodeValue(); - String roleString = child.getAttributes().getNamedItem(SecurityDeployer.ROLES_ATTR_NAME).getNodeValue(); - String[] roles = roleString.split(","); - for (String role : roles) - { - if (SecurityDeployer.SEND_NAME.equals(type)) - { - send.add(role.trim()); - } - else if (SecurityDeployer.CONSUME_NAME.equals(type)) - { - consume.add(role.trim()); - } - else if (SecurityDeployer.CREATEDURABLEQUEUE_NAME.equals(type)) - { - createDurableQueue.add(role); - } - else if (SecurityDeployer.DELETEDURABLEQUEUE_NAME.equals(type)) - { - deleteDurableQueue.add(role); - } - else if (SecurityDeployer.CREATETEMPQUEUE_NAME.equals(type)) - { - createTempQueue.add(role); - } - else if (SecurityDeployer.DELETETEMPQUEUE_NAME.equals(type)) - { - deleteTempQueue.add(role); - } - else if (SecurityDeployer.MANAGE_NAME.equals(type)) - { - manageRoles.add(role); - } - if (!allRoles.contains(role.trim())) - { - allRoles.add(role.trim()); - } - } - } - - } - for (String role : allRoles) - { - securityRoles.add(new Role(role, - send.contains(role), - consume.contains(role), - createDurableQueue.contains(role), - deleteDurableQueue.contains(role), - createTempQueue.contains(role), - deleteTempQueue.contains(role), - manageRoles.contains(role))); - } - securityRepository.addMatch(match, securityRoles); + Pair<String, Set<Role>> securityMatch = parser.parseSecurityRoles(node); + securityRepository.addMatch(securityMatch.a, securityMatch.b); } /** Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -975,6 +975,8 @@ configuration.isBackup()); // Address settings need to deployed initially, since they're require on paging manager.start() + + deployAddressSettingsFromConfiguration(); if (configuration.isFileDeploymentEnabled()) { @@ -998,6 +1000,8 @@ resourceManager.start(); + deploySecurityFromConfiguration(); + // Deploy all security related config if (configuration.isFileDeploymentEnabled()) { @@ -1088,6 +1092,14 @@ } } + private void deploySecurityFromConfiguration() + { + for (Map.Entry<String, Set<Role>> entry : configuration.getSecurityRoles().entrySet()) + { + securityRepository.addMatch(entry.getKey(), entry.getValue()); + } + } + private void deployQueuesFromConfiguration() throws Exception { for (QueueConfiguration config : configuration.getQueueConfigurations()) @@ -1099,6 +1111,15 @@ } } + private void deployAddressSettingsFromConfiguration() + { + for (Map.Entry<String, AddressSettings> entry : configuration.getAddressesSettings().entrySet()) + { + addressSettingsRepository.addMatch(entry.getKey(), entry.getValue()); + } + } + + private JournalLoadInformation[] loadJournals() throws Exception { JournalLoadInformation[] journalInfo = new JournalLoadInformation[2]; Modified: trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java =================================================================== --- trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -13,6 +13,8 @@ package org.hornetq.core.settings.impl; +import java.io.Serializable; + import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.settings.Mergeable; @@ -23,8 +25,10 @@ * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> */ -public class AddressSettings implements Mergeable<AddressSettings> +public class AddressSettings implements Mergeable<AddressSettings>, Serializable { + private static final long serialVersionUID = 1607502280582336366L; + private static Logger log = Logger.getLogger(AddressSettings.class); /** Modified: trunk/tests/config/ConfigurationTest-full-config.xml =================================================================== --- trunk/tests/config/ConfigurationTest-full-config.xml 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/tests/config/ConfigurationTest-full-config.xml 2010-02-10 14:15:24 UTC (rev 8868) @@ -182,4 +182,33 @@ <discovery-group-ref discovery-group-name="dg1"/> </cluster-connection> </cluster-connections> + + <security-settings> + <security-setting match="a1"> + <permission type="createTempQueue" roles="a1.1"/> + </security-setting> + <security-setting match="a2"> + <permission type="deleteTempQueue" roles="a2.1"/> + </security-setting> + </security-settings> + + <address-settings> + <address-setting match="a1"> + <dead-letter-address>a1.1</dead-letter-address> + <expiry-address>a1.2</expiry-address> + <redelivery-delay>1</redelivery-delay> + <max-size-bytes>2</max-size-bytes> + <page-size-bytes>3</page-size-bytes> + <message-counter-history-day-limit>4</message-counter-history-day-limit> + </address-setting> + <address-setting match="a2"> + <dead-letter-address>a2.1</dead-letter-address> + <expiry-address>a2.2</expiry-address> + <redelivery-delay>5</redelivery-delay> + <max-size-bytes>6</max-size-bytes> + <page-size-bytes>7</page-size-bytes> + <message-counter-history-day-limit>8</message-counter-history-day-limit> + </address-setting> + </address-settings> + </configuration> Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-02-08 10:28:19 UTC (rev 8867) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-02-10 14:15:24 UTC (rev 8868) @@ -19,6 +19,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.FileConfiguration; +import org.hornetq.core.security.Role; import org.hornetq.core.server.JournalType; import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; @@ -258,7 +259,67 @@ Assert.assertEquals("dg1", ccc.getDiscoveryGroupName()); } } + + + assertEquals(2, conf.getAddressesSettings().size()); + + assertTrue(conf.getAddressesSettings().get("a1") != null); + assertTrue(conf.getAddressesSettings().get("a2") != null); + + assertEquals("a1.1", conf.getAddressesSettings().get("a1").getDeadLetterAddress().toString()); + assertEquals("a1.2", conf.getAddressesSettings().get("a1").getExpiryAddress().toString()); + assertEquals(1, conf.getAddressesSettings().get("a1").getRedeliveryDelay()); + assertEquals(2, conf.getAddressesSettings().get("a1").getMaxSizeBytes()); + assertEquals(3, conf.getAddressesSettings().get("a1").getPageSizeBytes()); + assertEquals(4, conf.getAddressesSettings().get("a1").getMessageCounterHistoryDayLimit()); + assertEquals("a2.1", conf.getAddressesSettings().get("a2").getDeadLetterAddress().toString()); + assertEquals("a2.2", conf.getAddressesSettings().get("a2").getExpiryAddress().toString()); + assertEquals(5, conf.getAddressesSettings().get("a2").getRedeliveryDelay()); + assertEquals(6, conf.getAddressesSettings().get("a2").getMaxSizeBytes()); + assertEquals(7, conf.getAddressesSettings().get("a2").getPageSizeBytes()); + assertEquals(8, conf.getAddressesSettings().get("a2").getMessageCounterHistoryDayLimit()); + + + assertEquals(2, conf.getQueueConfigurations().size()); + + assertEquals("queue1", conf.getQueueConfigurations().get(0).getName()); + assertEquals("address1", conf.getQueueConfigurations().get(0).getAddress()); + assertEquals("color='red'", conf.getQueueConfigurations().get(0).getFilterString()); + assertEquals(false, conf.getQueueConfigurations().get(0).isDurable()); + + assertEquals("queue2", conf.getQueueConfigurations().get(1).getName()); + assertEquals("address2", conf.getQueueConfigurations().get(1).getAddress()); + assertEquals("color='blue'", conf.getQueueConfigurations().get(1).getFilterString()); + assertEquals(false, conf.getQueueConfigurations().get(1).isDurable()); + + assertEquals(2, conf.getSecurityRoles().size()); + + assertTrue(conf.getSecurityRoles().containsKey("a1")); + + assertTrue(conf.getSecurityRoles().containsKey("a2")); + + Role a1Role = conf.getSecurityRoles().get("a1").toArray(new Role[1])[0]; + + assertFalse(a1Role.isSend()); + assertFalse(a1Role.isConsume()); + assertFalse(a1Role.isCreateDurableQueue()); + assertFalse(a1Role.isDeleteDurableQueue()); + assertTrue(a1Role.isCreateNonDurableQueue()); + assertFalse(a1Role.isDeleteNonDurableQueue()); + assertFalse(a1Role.isManage()); + + Role a2Role = conf.getSecurityRoles().get("a2").toArray(new Role[1])[0]; + + assertFalse(a2Role.isSend()); + assertFalse(a2Role.isConsume()); + assertFalse(a2Role.isCreateDurableQueue()); + assertFalse(a2Role.isDeleteDurableQueue()); + assertFalse(a2Role.isCreateNonDurableQueue()); + assertTrue(a2Role.isDeleteNonDurableQueue()); + assertFalse(a2Role.isManage()); + + } public void testSetGetConfigurationURL()

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8867 - trunk/src/main/org/hornetq/core/protocol/stomp.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-02-08 05:28:19 -0500 (Mon, 08 Feb 2010) New Revision: 8867 Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * handle Stomp commands asynchronously Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-02-08 09:58:51 UTC (rev 8866) +++ trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-02-08 10:28:19 UTC (rev 8867) @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.concurrent.Executor; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; @@ -61,6 +62,8 @@ private final Map<RemotingConnection, StompSession> sessions = new HashMap<RemotingConnection, StompSession>(); + private Executor executor; + // Static -------------------------------------------------------- private static StompFrame createError(Exception e, StompFrame request) @@ -99,6 +102,7 @@ { this.server = server; this.marshaller = new StompMarshaller(); + this.executor = server.getExecutorFactory().getExecutor(); } // ProtocolManager implementation -------------------------------- @@ -119,8 +123,19 @@ return -1; } - public void handleBuffer(RemotingConnection connection, HornetQBuffer buffer) + public void handleBuffer(final RemotingConnection connection, final HornetQBuffer buffer) { + executor.execute(new Runnable() + { + public void run() + { + doHandleBuffer(connection, buffer); + } + }); + } + + private void doHandleBuffer(RemotingConnection connection, HornetQBuffer buffer) + { StompConnection conn = (StompConnection)connection; StompFrame request = null; try

15 years, 10 months

1
0
0 / 0

JBoss hornetq SVN: r8866 - in trunk: examples/jms/bridge and 1 other directory.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-02-08 04:58:51 -0500 (Mon, 08 Feb 2010) New Revision: 8866 Modified: trunk/docs/user-manual/en/messaging-concepts.xml trunk/examples/jms/bridge/readme.html Log: typos Modified: trunk/docs/user-manual/en/messaging-concepts.xml =================================================================== --- trunk/docs/user-manual/en/messaging-concepts.xml 2010-02-06 01:13:06 UTC (rev 8865) +++ trunk/docs/user-manual/en/messaging-concepts.xml 2010-02-08 09:58:51 UTC (rev 8866) @@ -202,14 +202,11 @@ <section> <title>STOMP</title> <para><ulink - url="http://en.wikipedia.org/wiki/Streaming_Text_Orientated_Messaging_Protocol" - >Stomp</ulink> is a very simple protocol for interoperating with messaging + url="http://stomp.codehaus.org/" + >Stomp</ulink> is a very simple text protocol for interoperating with messaging systems. It defines a wire format, so theoretically any Stomp client can work with any messaging system that supports Stomp. Stomp clients are available in many different programming languages.</para> - <para>HornetQ can be used by any Stomp client when using the <ulink - url="http://stomp.codehaus.org/StompConnect">StompConnect</ulink> broker which - translates the STOMP protocol to the JMS API.</para> <para>Please see <xref linkend="stomp"/> for using STOMP with HornetQ.</para> </section> <section> Modified: trunk/examples/jms/bridge/readme.html =================================================================== --- trunk/examples/jms/bridge/readme.html 2010-02-06 01:13:06 UTC (rev 8865) +++ trunk/examples/jms/bridge/readme.html 2010-02-08 09:58:51 UTC (rev 8866) @@ -16,10 +16,10 @@ choice for forwarding over unreliable connections, e.g. a WAN.</p> <p>They can also be configured with an optional filter expression, and will only forward messages that match that filter.</p> - <p>Furthermore they can be configured to use an optional Transformer class. A user defined Transformer class + <p>Furthermore they can be configured to use an optional Transformer class. A user-defined Transformer class can be specified which is called at forwarding time. This gives the user the opportunity to transform - the message in some way, e.g. changing it's properties or body</p> - <p>HornetQ also includes a <b>JMS Bridge</b>. This is similar in some ways to a core bridge, but uses the JMS API + the message in some ways, e.g. changing its properties or body</p> + <p>HornetQ also includes a <b>JMS Bridge</b>. This is similar to a core bridge, but uses the JMS API and can be used to bridge between any two JMS 1.1 compliant messaging systems. The core bridge is limited to bridging between HornetQ instances, but may provide better performance than the JMS bridge. The JMS bridge is covered in a separate example.</p>

15 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits February 2010