[jboss-cvs] JBoss Messaging SVN: r2325 - in trunk: src/etc/server/default/deploy and 1 other directories.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-02-15 09:17:18 -0500 (Thu, 15 Feb 2007)
New Revision: 2325

Modified:
   trunk/build-messaging.xml
   trunk/src/etc/server/default/deploy/connection-factories-service.xml
   trunk/src/etc/server/default/deploy/jms-ds.xml
   trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-842

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2007-02-15 13:42:04 UTC (rev 2324)
+++ trunk/build-messaging.xml	2007-02-15 14:17:18 UTC (rev 2325)
@@ -493,6 +493,11 @@
                  required by 4.0.1sp1 and lower
             -->
             <include name="org/jboss/util/propertyeditor/**"/>
+            <!--
+                Need by 4.0.1sp1 (and maybe others).
+                http://jira.jboss.org/jira/browse/JBMESSAGING-840
+            -->
+            <include name="org/jboss/util/timeout/**"/>
          </patternset>
       </unjar>
 

Modified: trunk/src/etc/server/default/deploy/connection-factories-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/connection-factories-service.xml	2007-02-15 13:42:04 UTC (rev 2324)
+++ trunk/src/etc/server/default/deploy/connection-factories-service.xml	2007-02-15 14:17:18 UTC (rev 2325)
@@ -28,4 +28,28 @@
       <attribute name="LoadBalancingFactory">org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</attribute>
    </mbean>
 
+   <!--
+        A "local" non-clustered ConnectionFactory that doesn't have neither load balancing nor
+        failover capabilities. It creates connections to the server node that deployed it.
+   -->
+
+   <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+      name="jboss.messaging.connectionfactory:service=NonClusteredConnectionFactory"
+      xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+      <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=socket</depends>
+      <depends>jboss.messaging:service=PostOffice</depends>
+
+      <attribute name="JNDIBindings">
+         <bindings>
+            <binding>/NonClusteredConnectionFactory</binding>
+            <binding>/NonClusteredXAConnectionFactory</binding>
+            <binding>java:/NonClusteredConnectionFactory</binding>
+            <binding>java:/NonClusteredXAConnectionFactory</binding>
+         </bindings>
+      </attribute>
+
+      <attribute name="Clustered">false</attribute>
+   </mbean>
+
 </server>
\ No newline at end of file

Modified: trunk/src/etc/server/default/deploy/jms-ds.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jms-ds.xml	2007-02-15 13:42:04 UTC (rev 2324)
+++ trunk/src/etc/server/default/deploy/jms-ds.xml	2007-02-15 14:17:18 UTC (rev 2325)
@@ -6,14 +6,18 @@
   <!-- JMS Stuff                                                            -->
   <!-- ==================================================================== -->
 
-  <!-- The JMS provider loader -->
+   <!--
+       The JMS provider loader. Currently pointing to a non-clustered ConnectionFactory. Need to
+       be replaced with a clustered non-load-balanced ConnectionFactory when it becomes available.
+       See http://jira.jboss.org/jira/browse/JBMESSAGING-843. 
+   -->
    <mbean code="org.jboss.jms.jndi.JMSProviderLoader"
           name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider">
       <attribute name="ProviderName">DefaultJMSProvider</attribute>
       <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
-      <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
-      <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
-      <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
+      <attribute name="FactoryRef">java:/NonClusteredXAConnectionFactory</attribute>
+      <attribute name="QueueFactoryRef">java:/NonClusteredXAConnectionFactory</attribute>
+      <attribute name="TopicFactoryRef">java:/NonClusteredXAConnectionFactory</attribute>
    </mbean>
 
    <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"

Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2007-02-15 13:42:04 UTC (rev 2324)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2007-02-15 14:17:18 UTC (rev 2325)
@@ -315,15 +315,18 @@
                Map.Entry entry = (Map.Entry)i.next();
                String uniqueName = (String)entry.getKey();
 
-               ClientClusteredConnectionFactoryDelegate del =
-                  (ClientClusteredConnectionFactoryDelegate)delegates.get(uniqueName);
+               Object del = delegates.get(uniqueName);
 
                if (del == null)
                {
-                  throw new IllegalStateException("Cannot find cf with name " + uniqueName);
+                  throw new IllegalStateException(
+                     "Cannot find connection factory with name " + uniqueName);
                }
 
-               del.setFailoverMap(failoverMap);
+               if (del instanceof ClientClusteredConnectionFactoryDelegate)
+               {
+                  ((ClientClusteredConnectionFactoryDelegate)del).setFailoverMap(failoverMap);
+               }
             }
          }
          else if (sKey.startsWith(CF_PREFIX) && originatorNodeID != serverPeer.getServerPeerID())