[jboss-cvs] JBoss Messaging SVN: r4335 - in trunk: examples/jms and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 29 06:13:34 EDT 2008
Author: timfox
Date: 2008-05-29 06:13:34 -0400 (Thu, 29 May 2008)
New Revision: 4335
Modified:
trunk/build-messaging.xml
trunk/examples/jms/build.xml
trunk/examples/jms/config/jndi.properties
trunk/examples/jms/src/org/jboss/jms/example/DurableSubscriberExample.java
trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
trunk/examples/jms/src/org/jboss/jms/example/QueueExample.java
trunk/examples/jms/src/org/jboss/jms/example/TopicExample.java
trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java
trunk/examples/messaging/src/org/jboss/messaging/example/SSLClient.java
trunk/examples/messaging/src/org/jboss/messaging/example/SimpleClient.java
trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java
Log:
Some cosmetic tweaks to examples etc
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/build-messaging.xml 2008-05-29 10:13:34 UTC (rev 4335)
@@ -762,7 +762,9 @@
<classpath refid="jms.test.execution.classpath"/>
</java>
</target>
- <!--examples-->
+
+ <!-- Examples -->
+
<target name="queueExample" depends="client-jar">
<ant dir="${examples.dir}/jms" antfile="build.xml" target="queueExample"/>
</target>
@@ -771,10 +773,24 @@
<ant dir="${examples.dir}/jms" antfile="build.xml" target="topicExample"/>
</target>
- <target name="DurSubExample" depends="client-jar">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="DurSubExample"/>
+ <target name="durSubExample" depends="client-jar">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="durSubExample"/>
</target>
+
+ <target name="SimpleClient" depends="client-jar">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="SimpleClient"/>
+ </target>
+ <target name="SSLClient" depends="client-jar">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="SSLClient"/>
+ </target>
+
+ <target name="SimpleExample" depends="jar, client-jar">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="SimpleExample"/>
+ </target>
+
+ <!-- Performance examples -->
+
<target name="perfListener" depends="client-jar">
<ant dir="${examples.dir}/jms" antfile="build.xml" target="perfListener"/>
</target>
@@ -803,15 +819,5 @@
<ant dir="${examples.dir}/jms" antfile="build.xml" target="perfTransactionalSender"/>
</target>
- <target name="SimpleClient" depends="client-jar">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="SimpleClient"/>
- </target>
- <target name="SSLClient" depends="client-jar">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="SSLClient"/>
- </target>
-
- <target name="SimpleExample" depends="jar, client-jar">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="SimpleExample"/>
- </target>
</project>
Modified: trunk/examples/jms/build.xml
===================================================================
--- trunk/examples/jms/build.xml 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/jms/build.xml 2008-05-29 10:13:34 UTC (rev 4335)
@@ -69,8 +69,8 @@
<echo>* to run examples execute one of the following *</echo>
<echo>* ant queueExample *</echo>
<echo>* ant topicExample *</echo>
- <echo>* ant DurSubExample *</echo>
- <echo>* ant perfListener followed by ant perfSender *</echo>
+ <echo>* ant durSubExample *</echo>
+ <echo>* etc *</echo>
<echo>*****************************************************************</echo>
</target>
@@ -102,7 +102,7 @@
</java>
</target>
- <target name="DurSubExample" depends="compile"
+ <target name="durSubExample" depends="compile"
description="-> publish/subscribe example using a topic and a durable subscriber">
<java classname="org.jboss.jms.example.DurableSubscriberExample" fork="true">
<classpath refid="runtime.classpath"/>
Modified: trunk/examples/jms/config/jndi.properties
===================================================================
--- trunk/examples/jms/config/jndi.properties 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/jms/config/jndi.properties 2008-05-29 10:13:34 UTC (rev 4335)
@@ -1,3 +1,3 @@
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
+java.naming.provider.url=jnp://192.168.1.13:1099
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Modified: trunk/examples/jms/src/org/jboss/jms/example/DurableSubscriberExample.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/DurableSubscriberExample.java 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/jms/src/org/jboss/jms/example/DurableSubscriberExample.java 2008-05-29 10:13:34 UTC (rev 4335)
@@ -21,7 +21,15 @@
*/
package org.jboss.jms.example;
-import javax.jms.*;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.jms.TopicSubscriber;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -32,7 +40,7 @@
*/
public class DurableSubscriberExample
{
- public static void main(String[] args)
+ public static void main(final String[] args)
{
Connection connection = null;
try
@@ -60,17 +68,14 @@
topicSubscriber.close();
session.unsubscribe("myuniqueid");
}
- catch (NamingException e)
+ catch (Exception e)
{
e.printStackTrace();
}
- catch (JMSException jmsException)
- {
- jmsException.printStackTrace();
- }
finally
{
if (connection != null)
+ {
try
{
connection.close();
@@ -79,6 +84,7 @@
{
e.printStackTrace();
}
+ }
}
}
}
Modified: trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java 2008-05-29 10:13:34 UTC (rev 4335)
@@ -36,13 +36,15 @@
import javax.jms.Queue;
import javax.jms.Session;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
import org.jboss.jms.util.PerfParams;
import org.jboss.messaging.core.logging.Logger;
/**
- * a performance example that can be used to gather simple performance figures.
+ * A simple example that can be used to gather basic performance measurements.
+ *
+ * It can be run against any JMS compliant provider, just by changing the jndi.properties file from
+ * the examples/jms/config directory, and ensuring that the providers client libraries are on the classpath
*
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
@@ -51,12 +53,16 @@
public class PerfExample
{
private static Logger log = Logger.getLogger(PerfExample.class);
+
private Queue queue;
+
private Connection connection;
+
private Session session;
+
private long start;
- public static void main(String[] args)
+ public static void main(final String[] args)
{
PerfExample perfExample = new PerfExample();
@@ -89,11 +95,10 @@
{
perfExample.runSender(perfParams);
}
-
}
- private void init(boolean transacted, String queueLookup, String connectionFactoryLookup, boolean dupsOk)
- throws NamingException, JMSException
+ private void init(final boolean transacted, final String queueLookup, final String connectionFactoryLookup,
+ final boolean dupsOk) throws Exception
{
InitialContext initialContext = new InitialContext();
queue = (Queue) initialContext.lookup(queueLookup);
@@ -102,7 +107,7 @@
session = connection.createSession(transacted, transacted ? Session.SESSION_TRANSACTED : (dupsOk ? Session.DUPS_OK_ACKNOWLEDGE : Session.AUTO_ACKNOWLEDGE));
}
- private void displayAverage(long numberOfMessages, long start, long end)
+ private void displayAverage(final long numberOfMessages, final long start, final long end)
{
double duration = (1.0 * end - start) / 1000; // in seconds
double average = (1.0 * numberOfMessages / duration);
@@ -119,11 +124,9 @@
log.info("warming up by sending " + perfParams.getNoOfWarmupMessages() + " messages");
sendMessages(perfParams.getNoOfWarmupMessages(), perfParams.getTransactionBatchSize(), perfParams.getDeliveryMode(), perfParams.isSessionTransacted(), false);
log.info("warmed up");
-
start = System.currentTimeMillis();
sendMessages(perfParams.getNoOfMessagesToSend(), perfParams.getTransactionBatchSize(), perfParams.getDeliveryMode(), perfParams.isSessionTransacted(), true);
long end = System.currentTimeMillis();
-
displayAverage(perfParams.getNoOfMessagesToSend(), start, end);
}
catch (Exception e)
@@ -133,6 +136,7 @@
finally
{
if (connection != null)
+ {
try
{
connection.close();
@@ -141,10 +145,12 @@
{
e.printStackTrace();
}
+ }
}
}
- private void sendMessages(int numberOfMessages, int txBatchSize, int deliveryMode, boolean transacted, boolean display) throws JMSException
+ private void sendMessages(final int numberOfMessages, final int txBatchSize, final int deliveryMode,
+ final boolean transacted, final boolean display) throws JMSException
{
MessageProducer producer = session.createProducer(queue);
producer.setDisableMessageID(true);
@@ -154,7 +160,7 @@
byte[] payload = new byte[1024];
bytesMessage.writeBytes(payload);
- int modulo = numberOfMessages / 10;
+ final int modulo = numberOfMessages / 10;
boolean committed = false;
for (int i = 1; i <= numberOfMessages; i++)
@@ -213,6 +219,7 @@
finally
{
if (connection != null)
+ {
try
{
connection.close();
@@ -221,10 +228,11 @@
{
e.printStackTrace();
}
+ }
}
}
- private void drainQueue(MessageConsumer consumer) throws JMSException
+ private void drainQueue(final MessageConsumer consumer) throws JMSException
{
log.info("draining queue");
while (true)
@@ -238,22 +246,21 @@
}
}
- /**
- * a message listener
- */
- class PerfListener implements MessageListener
+ private class PerfListener implements MessageListener
{
- private CountDownLatch countDownLatch;
+ private final CountDownLatch countDownLatch;
- private PerfParams perfParams;
+ private final PerfParams perfParams;
private boolean warmingUp = true;
+
private boolean started = false;
- private int modulo;
- private AtomicLong count = new AtomicLong(0);
+ private final int modulo;
+
+ private final AtomicLong count = new AtomicLong(0);
- public PerfListener(CountDownLatch countDownLatch, PerfParams perfParams)
+ public PerfListener(final CountDownLatch countDownLatch, final PerfParams perfParams)
{
this.countDownLatch = countDownLatch;
this.perfParams = perfParams;
@@ -261,7 +268,7 @@
this.modulo = perfParams.getNoOfMessagesToSend() / 10;
}
- public void onMessage(Message message)
+ public void onMessage(final Message message)
{
try
{
Modified: trunk/examples/jms/src/org/jboss/jms/example/QueueExample.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/QueueExample.java 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/jms/src/org/jboss/jms/example/QueueExample.java 2008-05-29 10:13:34 UTC (rev 4335)
@@ -43,7 +43,7 @@
{
final static Logger log = Logger.getLogger(QueueExample.class);
- public static void main(String[] args)
+ public static void main(final String[] args)
{
Connection connection = null;
try
@@ -74,6 +74,7 @@
finally
{
if(connection != null)
+ {
try
{
connection.close();
@@ -82,6 +83,7 @@
{
e.printStackTrace();
}
+ }
}
}
}
Modified: trunk/examples/jms/src/org/jboss/jms/example/TopicExample.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/TopicExample.java 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/jms/src/org/jboss/jms/example/TopicExample.java 2008-05-29 10:13:34 UTC (rev 4335)
@@ -39,7 +39,7 @@
{
final static Logger log = Logger.getLogger(TopicExample.class);
- public static void main(String[] args)
+ public static void main(final String[] args)
{
Connection connection = null;
try
@@ -85,17 +85,15 @@
{
}
}
- catch (NamingException e)
+ catch (Exception e)
{
e.printStackTrace();
}
- catch (JMSException jmsException)
- {
- jmsException.printStackTrace();
- }
+
finally
{
if (connection != null)
+ {
try
{
connection.close();
@@ -104,6 +102,7 @@
{
e.printStackTrace();
}
+ }
}
}
}
Modified: trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/jms/src/org/jboss/jms/util/PerfParams.java 2008-05-29 10:13:34 UTC (rev 4335)
@@ -25,15 +25,20 @@
import java.io.Serializable;
/**
+ *
+ * Class that holds the parameters used in the performance examples
+ *
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
public class PerfParams implements Serializable
{
- int noOfMessagesToSend = 1000;
- int noOfWarmupMessages;
- int deliveryMode = DeliveryMode.NON_PERSISTENT;
- boolean isSessionTransacted = false;
- int transactionBatchSize = 5000;
+ private static final long serialVersionUID = -4336539641012356002L;
+
+ private int noOfMessagesToSend = 1000;
+ private int noOfWarmupMessages;
+ private int deliveryMode = DeliveryMode.NON_PERSISTENT;
+ private boolean isSessionTransacted = false;
+ private int transactionBatchSize = 5000;
private boolean drainQueue = true;
private String queueLookup = "/queue/testPerfQueue";
private String connectionFactoryLookup = "/ConnectionFactory";
@@ -79,7 +84,6 @@
isSessionTransacted = sessionTransacted;
}
-
public int getTransactionBatchSize()
{
return transactionBatchSize;
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/SSLClient.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/SSLClient.java 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/SSLClient.java 2008-05-29 10:13:34 UTC (rev 4335)
@@ -47,7 +47,7 @@
*/
public class SSLClient
{
- public static void main(String[] args)
+ public static void main(final String[] args)
{
ClientConnection clientConnection = null;
try
@@ -85,7 +85,7 @@
}
finally
{
- if(clientConnection != null)
+ if (clientConnection != null)
{
try
{
@@ -97,6 +97,5 @@
}
}
}
-
}
}
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/SimpleClient.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/SimpleClient.java 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/SimpleClient.java 2008-05-29 10:13:34 UTC (rev 4335)
@@ -46,7 +46,7 @@
*/
public class SimpleClient
{
- public static void main(String[] args)
+ public static void main(final String[] args)
{
ClientConnection clientConnection = null;
try
@@ -59,7 +59,7 @@
SimpleString queue = new SimpleString("queuejms.testQueue");
ClientProducer clientProducer = clientSession.createProducer(queue);
ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
- System.currentTimeMillis(), (byte) 1);
+ System.currentTimeMillis(), (byte) 1);
message.getBody().putString("Hello!");
clientProducer.send(message);
ClientConsumer clientConsumer = clientSession.createConsumer(queue);
@@ -85,6 +85,5 @@
}
}
}
-
}
}
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java 2008-05-29 09:43:53 UTC (rev 4334)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java 2008-05-29 10:13:34 UTC (rev 4335)
@@ -49,11 +49,12 @@
/**
* A simple server is started with TCP transport, a message is sent and received.
+ *
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
public class SimpleExample
{
- public static void main(String[] args) throws Exception
+ public static void main(final String[] args) throws Exception
{
MessagingServer messagingServer = null;
ClientConnection clientConnection = null;
More information about the jboss-cvs-commits
mailing list