[hornetq-commits] JBoss hornetq SVN: r8089 - in trunk/src/config: jboss-as/non-clustered and 2 other directories.

[do-not-reply at jboss.org]

Author: timfox
Date: 2009-10-13 08:51:26 -0400 (Tue, 13 Oct 2009)
New Revision: 8089

Modified:
   trunk/src/config/jboss-as/clustered/hornetq-jms.xml
   trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
   trunk/src/config/stand-alone/clustered/hornetq-jms.xml
   trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml
Log:
updated connection factory definitions to be more appropriate for app server and standalone usage

Modified: trunk/src/config/jboss-as/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-jms.xml	2009-10-13 12:44:22 UTC (rev 8088)
+++ trunk/src/config/jboss-as/clustered/hornetq-jms.xml	2009-10-13 12:51:26 UTC (rev 8089)
@@ -2,27 +2,26 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 
-   <connection-factory name="ConnectionFactory">
+   <connection-factory name="NettyConnectionFactory">
       <connector-ref connector-name="netty"/>
       <entries>
          <entry name="ConnectionFactory"/>
          <entry name="XAConnectionFactory"/>
       </entries>
    </connection-factory>
-
-   <connection-factory name="ClusteredConnectionFactory">
-      <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+   
+   <connection-factory name="InVMConnectionFactory">
+      <connector-ref connector-name="in-vm"/>
       <entries>
-         <entry name="/ClusteredConnectionFactory"/>
-         <entry name="/ClusteredXAConnectionFactory"/>
-         <entry name="java:/ClusteredConnectionFactory"/>
-         <entry name="java:/ClusteredXAConnectionFactory"/>
+         <entry name="java:/ConnectionFactory"/>
+         <entry name="java:/XAConnectionFactory"/>
       </entries>
    </connection-factory>
 
    <queue name="DLQ">
       <entry name="/queue/DLQ"/>
    </queue>
+   
    <queue name="ExpiryQueue">
       <entry name="/queue/ExpiryQueue"/>
    </queue>

Modified: trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml	2009-10-13 12:44:22 UTC (rev 8088)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml	2009-10-13 12:51:26 UTC (rev 8089)
@@ -2,17 +2,26 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 
-   <connection-factory name="ConnectionFactory">
+   <connection-factory name="NettyConnectionFactory">
       <connector-ref connector-name="netty"/>
       <entries>
-         <entry name="ConnectionFactory"/>
-         <entry name="XAConnectionFactory"/>
+         <entry name="/ConnectionFactory"/>
+         <entry name="/XAConnectionFactory"/>
       </entries>
    </connection-factory>
    
+   <connection-factory name="InVMConnectionFactory">
+      <connector-ref connector-name="in-vm"/>
+      <entries>
+         <entry name="java:/ConnectionFactory"/>
+         <entry name="java:/XAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+   
    <queue name="DLQ">
       <entry name="/queue/DLQ"/>
    </queue>
+   
    <queue name="ExpiryQueue">
       <entry name="/queue/ExpiryQueue"/>
    </queue>

Modified: trunk/src/config/stand-alone/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/hornetq-jms.xml	2009-10-13 12:44:22 UTC (rev 8088)
+++ trunk/src/config/stand-alone/clustered/hornetq-jms.xml	2009-10-13 12:51:26 UTC (rev 8089)
@@ -2,13 +2,11 @@
 	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	       xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 	
-	<connection-factory name="ConnectionFactory">
+	<connection-factory name="NettyConnectionFactory">
 		<connector-ref connector-name="netty"/>
 		<entries>
-			<entry name="ConnectionFactory"/>
-			<entry name="XAConnectionFactory"/>
-			<entry name="java:/ConnectionFactory"/>
-			<entry name="java:/XAConnectionFactory"/>
+			<entry name="/ConnectionFactory"/>
+			<entry name="/XAConnectionFactory"/>
 		</entries>
 	</connection-factory>
 	

Modified: trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml	2009-10-13 12:44:22 UTC (rev 8088)
+++ trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml	2009-10-13 12:51:26 UTC (rev 8089)
@@ -2,13 +2,11 @@
 	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	       xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
 	
-	<connection-factory name="ConnectionFactory">
+	<connection-factory name="NettyConnectionFactory">
 		<connector-ref connector-name="netty"/>
 		<entries>
-			<entry name="ConnectionFactory"/>
-			<entry name="XAConnectionFactory"/>
-			<entry name="java:/ConnectionFactory"/>
-			<entry name="java:/XAConnectionFactory"/>
+			<entry name="/ConnectionFactory"/>
+			<entry name="/XAConnectionFactory"/>
 		</entries>
 	</connection-factory>