[jboss-cvs] JBoss Messaging SVN: r2736 - in trunk/docs/examples: distributed-topic/src/org/jboss/example/jms/distributedtopic and 3 other directories.

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

Author: timfox
Date: 2007-05-29 13:29:26 -0400 (Tue, 29 May 2007)
New Revision: 2736

Modified:
   trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java
   trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/DistributedTopicExample.java
   trunk/docs/examples/queue-failover/src/org/jboss/example/jms/failover/QueueFailoverExample.java
   trunk/docs/examples/stateless-clustered/etc/jndi.properties
   trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/client/Client.java
Log:
Fixed some of the smoke tests


Modified: trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java
===================================================================
--- trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java	2007-05-29 16:01:31 UTC (rev 2735)
+++ trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java	2007-05-29 17:29:26 UTC (rev 2736)
@@ -67,7 +67,7 @@
 
          ic = new InitialContext();
 
-         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
+         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ClusteredConnectionFactory");
          Queue distributedQueue = (Queue)ic.lookup(destinationName);
          log("Distributed queue " + destinationName + " exists");
 

Modified: trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/DistributedTopicExample.java
===================================================================
--- trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/DistributedTopicExample.java	2007-05-29 16:01:31 UTC (rev 2735)
+++ trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/DistributedTopicExample.java	2007-05-29 17:29:26 UTC (rev 2736)
@@ -62,7 +62,7 @@
 
          ic = new InitialContext();
 
-         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
+         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ClusteredConnectionFactory");
          Topic distributedTopic = (Topic)ic.lookup(destinationName);
          log("Distributed topic " + destinationName + " exists");
 

Modified: trunk/docs/examples/queue-failover/src/org/jboss/example/jms/failover/QueueFailoverExample.java
===================================================================
--- trunk/docs/examples/queue-failover/src/org/jboss/example/jms/failover/QueueFailoverExample.java	2007-05-29 16:01:31 UTC (rev 2735)
+++ trunk/docs/examples/queue-failover/src/org/jboss/example/jms/failover/QueueFailoverExample.java	2007-05-29 17:29:26 UTC (rev 2736)
@@ -63,7 +63,7 @@
 
          ic = new InitialContext();
 
-         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
+         ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ClusteredConnectionFactory");
 
          Queue distributedQueue = (Queue)ic.lookup(destinationName);
          log("Distributed queue " + destinationName + " exists");

Modified: trunk/docs/examples/stateless-clustered/etc/jndi.properties
===================================================================
--- trunk/docs/examples/stateless-clustered/etc/jndi.properties	2007-05-29 16:01:31 UTC (rev 2735)
+++ trunk/docs/examples/stateless-clustered/etc/jndi.properties	2007-05-29 17:29:26 UTC (rev 2736)
@@ -1,4 +1,4 @@
 ### JBossNS properties
 java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=localhost:1099
+java.naming.provider.url=localhost:1199
 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces

Modified: trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/client/Client.java
===================================================================
--- trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/client/Client.java	2007-05-29 16:01:31 UTC (rev 2735)
+++ trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/client/Client.java	2007-05-29 17:29:26 UTC (rev 2736)
@@ -51,18 +51,9 @@
  */
 public class Client extends ExampleSupport
 {
-   private InitialContext createHAInitialContext() throws Exception
-   {
-      Properties p = new Properties();
-      p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
-      p.put(Context.URL_PKG_PREFIXES, "jboss.naming:org.jnp.interfaces");
-      p.put(Context.PROVIDER_URL, "localhost:1100,localhost:1200");
-      return new InitialContext(p);
-   }
-
    public void example() throws Exception
    {            
-      InitialContext haic = createHAInitialContext();
+      InitialContext haic = new InitialContext();
       
       StatelessClusteredSessionExampleHome home =
          (StatelessClusteredSessionExampleHome)haic.lookup("ejb/StatelessClusteredSessionExample");            
@@ -85,7 +76,7 @@
       log("Queue browse result: " + num);
 
       Queue queue = (Queue)haic.lookup(queueName);
-      ConnectionFactory cf = (ConnectionFactory) new InitialContext().lookup("/XAConnectionFactory");
+      ConnectionFactory cf = (ConnectionFactory) haic.lookup("/XAConnectionFactory");
       Connection conn = cf.createConnection();
 
       try