[jboss-cvs] JBoss Messaging SVN: r1412 - in trunk/docs/examples: common/src/org/jboss/example/jms/common topic/src/org/jboss/example/jms/topic

[jboss-cvs-commits at lists.jboss.org]

Author: ovidiu.feodorov at jboss.com
Date: 2006-09-30 03:42:38 -0400 (Sat, 30 Sep 2006)
New Revision: 1412

Removed:
   trunk/docs/examples/common/src/org/jboss/example/jms/common/ExampleSupportCluster.java
Modified:
   trunk/docs/examples/topic/src/org/jboss/example/jms/topic/TopicExample.java
Log:
minor refactoring

Deleted: trunk/docs/examples/common/src/org/jboss/example/jms/common/ExampleSupportCluster.java
===================================================================
--- trunk/docs/examples/common/src/org/jboss/example/jms/common/ExampleSupportCluster.java	2006-09-30 07:41:10 UTC (rev 1411)
+++ trunk/docs/examples/common/src/org/jboss/example/jms/common/ExampleSupportCluster.java	2006-09-30 07:42:38 UTC (rev 1412)
@@ -1,66 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.example.jms.common;
-
-import javax.naming.InitialContext;
-import javax.naming.Context;
-import java.util.Properties;
-
-/**
- * @author Clebert Suconic
- */
-public abstract class ExampleSupportCluster extends ExampleSupport
-{
-
-    /** This will get the Context specific to a cluster */
-    public InitialContext getServerContext(int serverNumber) throws Exception
-    {
-        String serverIP = System.getProperty("CLUSTER_IP_" + serverNumber);
-        if (serverIP==null)
-        {
-            String errorMessage = "You should define CLUSTER_IP_" + serverNumber + " in your java properties or in your server.properites at your example's directory";
-            System.out.println(errorMessage);
-            throw new Exception(errorMessage);
-        }
-        return getServerContext(serverIP);
-    }
-
-    public InitialContext getServerContext(String serverIP) throws Exception
-    {
-        String jndiProviderClass = "org.jnp.interfaces.NamingContextFactory";
-        Properties contextProperties = new Properties();
-        contextProperties.put(Context.INITIAL_CONTEXT_FACTORY,
-            jndiProviderClass);
-        contextProperties.put(Context.PROVIDER_URL,
-            "jnp://" + serverIP+ ":1099");
-        return new InitialContext(contextProperties);
-    }
-
-
-
-    protected void run()
-    {
-       try
-       {
-          InitialContext ct1 = getServerContext(1);
-          InitialContext ct2 = getServerContext(2);
-           setup(ct1);
-           setup(ct2);
-          example();
-           tearDown(ct1);
-           tearDown(ct2);
-       }
-       catch(Throwable t)
-       {
-          t.printStackTrace();
-          setFailure(true);
-       }
-
-       reportResultAndExit();
-    }
-
-}

Modified: trunk/docs/examples/topic/src/org/jboss/example/jms/topic/TopicExample.java
===================================================================
--- trunk/docs/examples/topic/src/org/jboss/example/jms/topic/TopicExample.java	2006-09-30 07:41:10 UTC (rev 1411)
+++ trunk/docs/examples/topic/src/org/jboss/example/jms/topic/TopicExample.java	2006-09-30 07:42:38 UTC (rev 1412)
@@ -46,68 +46,74 @@
    {
       String destinationName = getDestinationJNDIName();
 
-       InitialContext ic = null;
-       Connection connection = null;
+      InitialContext ic = null;
+      Connection connection = null;
 
-       try {
+      try {
 
-           ic = new InitialContext();
+         ic = new InitialContext();
 
-           ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
-           Topic topic = (Topic)ic.lookup(destinationName);
-           log("Topic " + destinationName + " exists");
+         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
+         Topic topic = (Topic)ic.lookup(destinationName);
+         log("Topic " + destinationName + " exists");
 
-           connection = cf.createConnection();
-           Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-           MessageProducer publisher = session.createProducer(topic);
-           MessageConsumer subscriber = session.createConsumer(topic);
+         connection = cf.createConnection();
+         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         MessageProducer publisher = session.createProducer(topic);
+         MessageConsumer subscriber = session.createConsumer(topic);
 
-           ExampleListener messageListener = new ExampleListener();
-           subscriber.setMessageListener(messageListener);
-           connection.start();
+         ExampleListener messageListener = new ExampleListener();
+         subscriber.setMessageListener(messageListener);
+         connection.start();
 
-           TextMessage message = session.createTextMessage("Hello!");
-           publisher.send(message);
-           log("The message was successfully published on the topic");
+         TextMessage message = session.createTextMessage("Hello!");
+         publisher.send(message);
+         log("The message was successfully published on the topic");
 
-           messageListener.waitForMessage();
+         messageListener.waitForMessage();
 
-           message = (TextMessage)messageListener.getMessage();
-           log("Received message: " + message.getText());
-           assertEquals("Hello!", message.getText());
+         message = (TextMessage)messageListener.getMessage();
+         log("Received message: " + message.getText());
+         assertEquals("Hello!", message.getText());
 
-           displayProviderInfo(connection.getMetaData());
+         displayProviderInfo(connection.getMetaData());
 
-       }finally{
+      }
+      finally
+      {
+         if(ic != null)
+         {
+            try {
+               ic.close();
+            }
+            catch(Exception e)
+            {
+               throw e;
+            }
+         }
 
-           if(ic != null) {
-               try {
-                   ic.close();
-               }catch(Exception e){
-                   throw e;
-               }
-           }
-
-           //ALWAYS close your connection in a finally block to avoid leaks
-           //Closing connection also takes care of closing its related objects e.g. sessions
-           closeConnection(connection);
-       }
+         // ALWAYS close your connection in a finally block to avoid leaks.
+         // Closing connection also takes care of closing its related objects e.g. sessions.
+         closeConnection(connection);
+      }
    }
 
    private void closeConnection(Connection con) throws JMSException {
 
-       try {
-		   if (con != null) {
-               con.close();
-	       }
-
-       }catch(JMSException jmse) {
-           log("Could not close connection " + con +" exception was " +jmse);
-           throw jmse;
-       }
+      try
+      {
+         if (con != null)
+         {
+            con.close();
+         }
+      }
+      catch(JMSException jmse)
+      {
+         log("Could not close connection " + con +" exception was " +jmse);
+         throw jmse;
+      }
    }
 
-
    protected boolean isQueueExample()
    {
       return false;