[jboss-cvs] JBoss Messaging SVN: r3785 - in trunk: src/main/org/jboss/jms/client and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 25 08:19:59 EST 2008
Author: timfox
Date: 2008-02-25 08:19:59 -0500 (Mon, 25 Feb 2008)
New Revision: 3785
Modified:
trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java
trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedManagementExample.java
trunk/src/main/org/jboss/jms/client/JBossMessageProducer.java
trunk/src/main/org/jboss/jms/client/api/ClientProducer.java
trunk/src/main/org/jboss/jms/client/impl/ClientProducerImpl.java
Log:
Few tweaks and fixed example
Modified: trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java
===================================================================
--- trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java 2008-02-25 12:17:04 UTC (rev 3784)
+++ trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java 2008-02-25 13:19:59 UTC (rev 3785)
@@ -49,15 +49,15 @@
messagingServer.start();
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(remotingConf);
ClientConnection clientConnection = cf.createConnection(null, null);
- ClientSession clientSession = clientConnection.createClientSession(false, true, true, 0);
+ ClientSession clientSession = clientConnection.createClientSession(false, true, true, 0, false);
clientSession.createQueue("Queue1", "Queue1", null, false, false);
- ClientProducer clientProducer = clientSession.createProducer();
+ ClientProducer clientProducer = clientSession.createProducer("Queue1");
ClientConsumer clientConsumer = clientSession.createConsumer("Queue1", null, false, false, true);
clientConnection.start();
MessageImpl message = new MessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte) 1);
message.setPayload("Hello".getBytes());
- clientProducer.send("Queue1", message);
+ clientProducer.send(message);
Message m = clientConsumer.receive(0);
Modified: trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedManagementExample.java
===================================================================
--- trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedManagementExample.java 2008-02-25 12:17:04 UTC (rev 3784)
+++ trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedManagementExample.java 2008-02-25 13:19:59 UTC (rev 3785)
@@ -55,10 +55,10 @@
messagingServerManagement.start();
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(remotingConf);
ClientConnection clientConnection = cf.createConnection(null, null);
- ClientSession clientSession = clientConnection.createClientSession(false, true, true, 0);
+ ClientSession clientSession = clientConnection.createClientSession(false, true, true, 0, false);
String queue = "Queue1";
clientSession.createQueue(queue, queue, null, false, false);
- ClientProducer clientProducer = clientSession.createProducer();
+ ClientProducer clientProducer = clientSession.createProducer("Queue1");
clientConnection.start();
@@ -67,28 +67,28 @@
messagingServerManagement.startMessageCounter(queue, 0);
for (int i = 0; i < 1000; i++)
{
- clientProducer.send(queue, message);
+ clientProducer.send(message);
}
MessageCounter messageCounter = messagingServerManagement.getMessageCounter(queue);
System.out.println("messageCounter = " + messageCounter);
for (int i = 0; i < 2000; i++)
{
- clientProducer.send(queue, message);
+ clientProducer.send(message);
}
messageCounter = messagingServerManagement.getMessageCounter(queue);
System.out.println("messageCounter = " + messageCounter);
for (int i = 0; i < 3000; i++)
{
- clientProducer.send(queue, message);
+ clientProducer.send(message);
}
messageCounter = messagingServerManagement.getMessageCounter(queue);
System.out.println("messageCounter = " + messageCounter);
for (int i = 0; i < 4000; i++)
{
- clientProducer.send(queue, message);
+ clientProducer.send(message);
}
messageCounter = messagingServerManagement.getMessageCounter(queue);
@@ -101,7 +101,7 @@
int counter = 0;
while (timer.isRunning())
{
- clientProducer.send(queue, message);
+ clientProducer.send(message);
counter++;
}
scheduler.shutdown();
Modified: trunk/src/main/org/jboss/jms/client/JBossMessageProducer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossMessageProducer.java 2008-02-25 12:17:04 UTC (rev 3784)
+++ trunk/src/main/org/jboss/jms/client/JBossMessageProducer.java 2008-02-25 13:19:59 UTC (rev 3785)
@@ -191,7 +191,7 @@
message.setJMSPriority(defaultPriority);
- doSend(message, defaultTimeToLive, defaultDestination);
+ doSend(message, defaultTimeToLive, null);
}
public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
@@ -202,7 +202,7 @@
message.setJMSPriority(priority);
- doSend(message, timeToLive, defaultDestination);
+ doSend(message, timeToLive, null);
}
public void send(Destination destination, Message message) throws JMSException
@@ -327,16 +327,32 @@
message.setJMSTimestamp(0);
}
- // if a default destination was already specified then this must be same destination as
- // that specified in the arguments
-
- if (this.defaultDestination != null && !this.defaultDestination.equals(destination))
+ String address = null;
+
+ if (destination == null)
{
- throw new JMSException("Where a default destination is specified " +
- "for the sender and a destination is " +
- "specified in the arguments to the send, " +
- "these destinations must be equal");
+ if (defaultDestination == null)
+ {
+ throw new InvalidDestinationException("Destination must be specified on send with an anonymous producer");
+ }
+
+ destination = defaultDestination;
}
+ else
+ {
+ if (defaultDestination != null)
+ {
+ if (!destination.equals(defaultDestination))
+ {
+ throw new JMSException("Where a default destination is specified " +
+ "for the sender and a destination is " +
+ "specified in the arguments to the send, " +
+ "these destinations must be equal");
+ }
+ }
+
+ address = destination.getAddress();
+ }
JBossMessage jbm;
@@ -414,11 +430,9 @@
JBossDestination dest = (JBossDestination)destination;
- String coreDest = dest.getAddress();
-
try
- {
- producer.send(coreDest, jbm.getCoreMessage());
+ {
+ producer.send(address, jbm.getCoreMessage());
}
catch (MessagingException e)
{
Modified: trunk/src/main/org/jboss/jms/client/api/ClientProducer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/api/ClientProducer.java 2008-02-25 12:17:04 UTC (rev 3784)
+++ trunk/src/main/org/jboss/jms/client/api/ClientProducer.java 2008-02-25 13:19:59 UTC (rev 3785)
@@ -17,6 +17,8 @@
{
String getAddress();
+ void send(Message message) throws MessagingException;
+
void send(String address, Message message) throws MessagingException;
void registerAcknowledgementHandler(AcknowledgementHandler handler);
Modified: trunk/src/main/org/jboss/jms/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/impl/ClientProducerImpl.java 2008-02-25 12:17:04 UTC (rev 3784)
+++ trunk/src/main/org/jboss/jms/client/impl/ClientProducerImpl.java 2008-02-25 13:19:59 UTC (rev 3785)
@@ -82,6 +82,15 @@
return address;
}
+ public void send(Message msg) throws MessagingException
+ {
+ checkClosed();
+
+ ProducerSendMessage message = new ProducerSendMessage(null, msg.copy());
+
+ remotingConnection.send(id, message, !msg.isDurable());
+ }
+
public void send(String address, Message msg) throws MessagingException
{
checkClosed();
@@ -90,7 +99,7 @@
remotingConnection.send(id, message, !msg.isDurable());
}
-
+
public void registerAcknowledgementHandler(AcknowledgementHandler handler)
{
// TODO
More information about the jboss-cvs-commits
mailing list