[hornetq-commits] JBoss hornetq SVN: r7988 - in branches/hornetq_grouping: src/main/org/hornetq/core/postoffice/impl and 1 other directories.

Author: ataylor Date: 2009-09-24 07:47:36 -0400 (Thu, 24 Sep 2009) New Revision: 7988 Modified: branches/hornetq_grouping/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java branches/hornetq_grouping/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java Log: example fixes Modified: branches/hornetq_grouping/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java =================================================================== --- branches/hornetq_grouping/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java 2009-09-24 09:58:07 UTC (rev 7987) +++ branches/hornetq_grouping/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java 2009-09-24 11:47:36 UTC (rev 7988) @@ -39,7 +39,6 @@ public boolean runExample() throws Exception { - Thread.sleep(5000); Connection connection0 = null; Connection connection1 = null; @@ -73,7 +72,7 @@ ic2 = getContext(2); // Step 5. Look-up a JMS Connection Factory object from JNDI on server 1 - ConnectionFactory cf2 = (ConnectionFactory)ic1.lookup("/ConnectionFactory"); + ConnectionFactory cf2 = (ConnectionFactory)ic2.lookup("/ConnectionFactory"); // Step 6. We create a JMS Connection connection0 which is a connection to server 0 connection0 = cf0.createConnection(); @@ -122,11 +121,30 @@ producer0.send(message); + System.out.println("Sent messages: " + message.getText() + " to node 0"); + } + + for (int i = 0; i < numMessages; i++) + { + TextMessage message = session1.createTextMessage("This is text message " + (i + 10)); + + message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + producer1.send(message); + System.out.println("Sent messages: " + message.getText() + " to node 1"); + + } + + for (int i = 0; i < numMessages; i++) + { + TextMessage message = session2.createTextMessage("This is text message " + (i + 20)); + + message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + producer2.send(message); - System.out.println("Sent messages: " + message.getText()); + System.out.println("Sent messages: " + message.getText() + " to node 2"); } // Step 14. We now consume those messages on *both* server 0 and server 1. @@ -134,7 +152,7 @@ // JMS Queues implement point-to-point message where each message is only ever consumed by a // maximum of one consumer - for (int i = 0; i < numMessages; i += 2) + for (int i = 0; i < numMessages * 3; i++) { TextMessage message0 = (TextMessage)consumer.receive(5000); Modified: branches/hornetq_grouping/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java =================================================================== --- branches/hornetq_grouping/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2009-09-24 09:58:07 UTC (rev 7987) +++ branches/hornetq_grouping/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2009-09-24 11:47:36 UTC (rev 7988) @@ -264,11 +264,6 @@ public void route(final ServerMessage message, final Transaction tx) throws Exception { boolean routed = false; - Object o = message.getProperty("count_prop"); - if (o != null) - { - System.out.println("routing message " + o); - } if (!exclusiveBindings.isEmpty()) { for (Binding binding : exclusiveBindings) @@ -478,7 +473,6 @@ if( chosen != null ) { - System.out.println("sending message" + message.getProperty("count_prop") + " to " + chosen.getClusterName()); chosen.willRoute(message); chosen.getBindable().preroute(message, tx); chosen.getBindable().route(message, tx); @@ -503,14 +497,12 @@ } if( chosen != null) { - System.out.println("found sending message" + message.getProperty("count_prop") + " to " + chosen.getClusterName()); chosen.willRoute(message); chosen.getBindable().preroute(message, tx); chosen.getBindable().route(message, tx); } else { - System.out.println("BindingsImpl.route"); throw new HornetQException(HornetQException.QUEUE_DOES_NOT_EXIST, "queue " + resp.getChosen() + " has been removed cannot deliver message, queues should not be removed when grouping is used"); } } Modified: branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java =================================================================== --- branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java 2009-09-24 09:58:07 UTC (rev 7987) +++ branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java 2009-09-24 11:47:36 UTC (rev 7988) @@ -70,12 +70,10 @@ Response response = new Response(proposal.getProposalType(), proposal.getProposal()); if (map.putIfAbsent(response.getResponseType(), response.getChosen()) == null) { - log.info("accepted proposal for " + proposal.getProposalType() + " with value " + proposal.getProposal()); return response; } else { - log.info("denied proposal for " + proposal.getProposalType() + " with value " + proposal.getProposal()); return new Response(proposal.getProposalType(), proposal.getProposal(), map.get(proposal.getProposalType())); } } @@ -87,7 +85,6 @@ public void send(Response response, int distance) throws Exception { Object value = response.getAlternative() != null ? response.getAlternative() : response.getOriginal(); - log.info("sending proposal response for " + response.getResponseType() + " with value " + value); TypedProperties props = new TypedProperties(); props.putStringProperty(ManagementHelper.HDR_PROPOSAL_TYPE, response.getResponseType()); props.putStringProperty(ManagementHelper.HDR_PROPOSAL_VALUE, (SimpleString)response.getOriginal()); Modified: branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java =================================================================== --- branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java 2009-09-24 09:58:07 UTC (rev 7987) +++ branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java 2009-09-24 11:47:36 UTC (rev 7988) @@ -77,7 +77,6 @@ { lock.lock(); TypedProperties props = new TypedProperties(); - log.info("sending proposal for " + proposal.getProposalType() + " with value " + proposal.getProposal()); props.putStringProperty(ManagementHelper.HDR_PROPOSAL_TYPE, proposal.getProposalType()); props.putStringProperty(ManagementHelper.HDR_PROPOSAL_VALUE, (SimpleString)proposal.getProposal()); props.putIntProperty(ManagementHelper.HDR_BINDING_TYPE, BindingType.LOCAL_QUEUE_INDEX); @@ -102,7 +101,6 @@ public void proposed(Response response) throws Exception { Object value = response.getAlternative() != null ? response.getAlternative() : response.getOriginal(); - log.info("received proposal response for " + response.getResponseType() + " with value " + value); try { lock.lock();