[jboss-cvs] JBoss Messaging SVN: r3289 - in branches/Branch_MC_Integration_New: docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue and 1 other directories.

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

Author: ataylor
Date: 2007-11-06 07:03:15 -0500 (Tue, 06 Nov 2007)
New Revision: 3289

Modified:
   branches/Branch_MC_Integration_New/docs/examples/distributed-queue/build.xml
   branches/Branch_MC_Integration_New/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java
   branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-beans.xml
Log:
initial microcontainer integration, fixes for clustering

Modified: branches/Branch_MC_Integration_New/docs/examples/distributed-queue/build.xml
===================================================================
--- branches/Branch_MC_Integration_New/docs/examples/distributed-queue/build.xml	2007-11-06 10:26:18 UTC (rev 3288)
+++ branches/Branch_MC_Integration_New/docs/examples/distributed-queue/build.xml	2007-11-06 12:03:15 UTC (rev 3289)
@@ -19,7 +19,7 @@
    <property name="messaging.client.jar.path" value="../../"/>
    <property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
    <property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
-   <property name="jboss.configuration0" value="messaging"/>
+   <property name="jboss.configuration0" value="messaging-node0"/>
    <property name="example.queue.name" value="testDistributedQueue"/>
 
    <path id="common.compilation.classpath">

Modified: branches/Branch_MC_Integration_New/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java
===================================================================
--- branches/Branch_MC_Integration_New/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java	2007-11-06 10:26:18 UTC (rev 3288)
+++ branches/Branch_MC_Integration_New/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java	2007-11-06 12:03:15 UTC (rev 3289)
@@ -73,6 +73,8 @@
          connection1 = cf.createConnection();
 
          // Let's make sure that (this example is also a smoke test)
+         log("server 0 id=" + getServerID(connection0));
+         log("server 1 id=" + getServerID(connection1));
          assertNotEquals(getServerID(connection0), getServerID(connection1));
 
          // Create a session, and a producer on the first connection

Modified: branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-beans.xml
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-beans.xml	2007-11-06 10:26:18 UTC (rev 3288)
+++ branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-beans.xml	2007-11-06 12:03:15 UTC (rev 3289)
@@ -145,6 +145,20 @@
       <property name="supportsFailover">true</property>
       <property name="supportsLoadBalancing">true</property>
    </bean>
+
+   <bean name="jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory"
+         class="org.jboss.jms.server.connectionfactory.ConnectionFactory">
+      <property name="name">jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory</property>
+      <property name="connector">
+         <inject bean="Remoting"/>
+      </property>
+      <property name="serverPeer">
+         <inject bean="ServerPeer"/>
+      </property>
+      <property name="supportsFailover">false</property>
+      <property name="supportsLoadBalancing">false</property>
+   </bean>
+
    <!--cant use the LTDS as its dependant on the jboss-jca service running does this matter-->
    <!--<bean name="DataSource" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
         <property name="jndiName">MessagingDS</property>