[jboss-cvs] JBoss Messaging SVN: r3635 - trunk/docs/examples/embedded/src/org/jboss/example/embedded.

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

Author: jmesnil
Date: 2008-01-28 08:04:56 -0500 (Mon, 28 Jan 2008)
New Revision: 3635

Modified:
   trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java
   trunk/docs/examples/embedded/src/org/jboss/example/embedded/MessagingServerFactory.java
Log:
* fixed ClassCastException (ClientConsumer.receive() now returns o.j.m.core.Message)
* added method MessagingServerFactory.stop(MessagingServer) to cleanly stop MINA & persistence services (normally handled by the microcontainer)

Modified: trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java
===================================================================
--- trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java	2008-01-28 06:31:56 UTC (rev 3634)
+++ trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java	2008-01-28 13:04:56 UTC (rev 3635)
@@ -23,15 +23,14 @@
 
 import javax.jms.Session;
 
-import org.jboss.example.embedded.MessagingServerFactory;
 import org.jboss.jms.client.api.ClientConnection;
 import org.jboss.jms.client.api.ClientConnectionFactory;
 import org.jboss.jms.client.api.ClientConsumer;
 import org.jboss.jms.client.api.ClientSession;
 import org.jboss.jms.client.impl.ClientConnectionFactoryImpl;
-import org.jboss.jms.message.JBossMessage;
 import org.jboss.messaging.core.Destination;
 import org.jboss.messaging.core.DestinationType;
+import org.jboss.messaging.core.Message;
 import org.jboss.messaging.core.MessagingServer;
 import org.jboss.messaging.core.impl.DestinationImpl;
 import org.jboss.messaging.core.impl.MessageImpl;
@@ -46,7 +45,7 @@
       MessagingServer messagingServer = MessagingServerFactory.createMessagingServer();
       messagingServer.start();
       messagingServer.createQueue("Queue1");
-      ClientConnectionFactory cf = new ClientConnectionFactoryImpl("tcp://localhost:5400?timeout=5");
+      ClientConnectionFactory cf = new ClientConnectionFactoryImpl("tcp://localhost:5400");
       ClientConnection clientConnection = cf.createConnection(null, null);
       ClientSession clientSession = clientConnection.createClientSession(false, Session.AUTO_ACKNOWLEDGE, false);
 
@@ -58,10 +57,10 @@
 
       ClientConsumer clientConsumer = clientSession.createClientConsumer(destination, null, false, null);
       clientConnection.start();
-      JBossMessage m = (JBossMessage) clientConsumer.receive(0);
-      System.out.println("m = " + new String(m.getCoreMessage().getPayload()));
+      Message m = clientConsumer.receive(0);
+      System.out.println("m = " + new String(m.getPayload()));
       clientConnection.close();
 
-      messagingServer.stop();
+      MessagingServerFactory.stop(messagingServer);
    }
 }

Modified: trunk/docs/examples/embedded/src/org/jboss/example/embedded/MessagingServerFactory.java
===================================================================
--- trunk/docs/examples/embedded/src/org/jboss/example/embedded/MessagingServerFactory.java	2008-01-28 06:31:56 UTC (rev 3634)
+++ trunk/docs/examples/embedded/src/org/jboss/example/embedded/MessagingServerFactory.java	2008-01-28 13:04:56 UTC (rev 3635)
@@ -36,6 +36,8 @@
  */
 public class MessagingServerFactory
 {
+   private static final String HOME_DIR = System.getProperty("user.home");
+   
    public static MessagingServer createMessagingServer() throws Exception
    {
       MinaService minaService = new MinaService("tcp", "localhost", 5400);
@@ -64,10 +66,10 @@
          }
       });
       BDBJEPersistenceManager persistenceManager = new BDBJEPersistenceManager();
-      persistenceManager.setLargeMessageRepository("${user.home}/bdbje/large");
+      persistenceManager.setLargeMessageRepository( HOME_DIR + "/bdbje/large");
       persistenceManager.setMinLargeMessageSize(1000000);
       BDBJEEnvironment bdbjeEnvironment = new RealBDBJEEnvironment();
-      bdbjeEnvironment.setEnvironmentPath("${user.home}/bdbje/env");
+      bdbjeEnvironment.setEnvironmentPath(HOME_DIR + "/bdbje/env");
       bdbjeEnvironment.setCreateEnvironment(true);
       bdbjeEnvironment.setSyncVM(true);
       bdbjeEnvironment.setSyncOS(false);
@@ -79,4 +81,11 @@
       messagingServer.setAuthenticationManager(new AuthenticationManager());
       return messagingServer;
    }
+   
+   public static void stop(MessagingServer server) throws Exception
+   {
+      server.stop();
+      server.getMinaService().stop();
+      server.getPersistenceManager().stop();
+   }
 }