[hornetq-commits] JBoss hornetq SVN: r8415 - in trunk: src/config/common/schema and 2 other directories.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2009-11-26 09:31:48 -0500 (Thu, 26 Nov 2009)
New Revision: 8415

Modified:
   trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml
   trunk/src/config/common/schema/hornetq-jms.xsd
   trunk/src/config/jboss-as/clustered/hornetq-jms.xml
   trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
Log:
fixed schema for connectors and example configs

Modified: trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml	2009-11-26 14:01:04 UTC (rev 8414)
+++ trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml	2009-11-26 14:31:48 UTC (rev 8415)
@@ -31,7 +31,9 @@
    
    <!-- This is used by the example to send the management operations, it's not central to the example -->
    <connection-factory name="ConnectionFactory2">
-      <connector-ref connector-name="netty-connector2"/>
+      <connectors>
+         <connector-ref connector-name="netty-connector2"/>
+      </connectors>
       <entries>
          <entry name="ConnectionFactory2"/>                     
       </entries>

Modified: trunk/src/config/common/schema/hornetq-jms.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-jms.xsd	2009-11-26 14:01:04 UTC (rev 8414)
+++ trunk/src/config/common/schema/hornetq-jms.xsd	2009-11-26 14:31:48 UTC (rev 8415)
@@ -26,7 +26,6 @@
    <xsd:element name="connection-factory">
    	<xsd:complexType>
    		<xsd:all>
-           	<xsd:element name="connector-ref" type="connector-refType" maxOccurs="1" minOccurs="0"></xsd:element>
            	<xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
            	<xsd:element name="discovery-initial-wait-timeout" type="xsd:long" maxOccurs="1" minOccurs="0"></xsd:element>
            	

Modified: trunk/src/config/jboss-as/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-jms.xml	2009-11-26 14:01:04 UTC (rev 8414)
+++ trunk/src/config/jboss-as/clustered/hornetq-jms.xml	2009-11-26 14:31:48 UTC (rev 8415)
@@ -13,7 +13,9 @@
    </connection-factory>
    
    <connection-factory name="InVMConnectionFactory">
-      <connector-ref connector-name="in-vm"/>
+      <connectors>
+         <connector-ref connector-name="in-vm"/>
+      </connectors>
       <entries>
          <entry name="java:/ConnectionFactory"/>
          <entry name="java:/XAConnectionFactory"/>

Modified: trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml	2009-11-26 14:01:04 UTC (rev 8414)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml	2009-11-26 14:31:48 UTC (rev 8415)
@@ -13,7 +13,9 @@
    </connection-factory>
    
    <connection-factory name="InVMConnectionFactory">
-      <connector-ref connector-name="in-vm"/>
+      <connectors>
+         <connector-ref connector-name="in-vm"/>
+      </connectors>
       <entries>
          <entry name="java:/ConnectionFactory"/>
          <entry name="java:/XAConnectionFactory"/>