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

[do-not-reply at jboss.org]

Author: ataylor
Date: 2010-12-09 12:55:46 -0500 (Thu, 09 Dec 2010)
New Revision: 10024

Modified:
   trunk/examples/jms/clustered-static-discovery/server3/hornetq-configuration.xml
   trunk/src/config/common/schema/hornetq-configuration.xsd
   trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
Log:
config fixes

Modified: trunk/examples/jms/clustered-static-discovery/server3/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-static-discovery/server3/hornetq-configuration.xml	2010-12-09 17:15:38 UTC (rev 10023)
+++ trunk/examples/jms/clustered-static-discovery/server3/hornetq-configuration.xml	2010-12-09 17:55:46 UTC (rev 10024)
@@ -46,7 +46,7 @@
          <use-duplicate-detection>true</use-duplicate-detection>
          <forward-when-no-consumers>true</forward-when-no-consumers>
          <max-hops>1</max-hops>
-         <static-connectors allow-direct-connections-only="false">
+         <static-connectors>
             <connector-ref>server0-connector</connector-ref>
          </static-connectors>
       </cluster-connection>

Modified: trunk/src/config/common/schema/hornetq-configuration.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-configuration.xsd	2010-12-09 17:15:38 UTC (rev 10023)
+++ trunk/src/config/common/schema/hornetq-configuration.xsd	2010-12-09 17:55:46 UTC (rev 10024)
@@ -366,7 +366,7 @@
                         <xsd:sequence>
                             <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string"/>
                         </xsd:sequence>
-                        <xsd:attribute name="allow-direct-connections" type="xsd:boolean" use="optional"/>
+                        <xsd:attribute name="allow-direct-connections-only" type="xsd:boolean" use="optional"/>
                     </xsd:complexType>
                 </xsd:element>	
 				<xsd:element maxOccurs="1" minOccurs="1" name="discovery-group-ref">

Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java	2010-12-09 17:15:38 UTC (rev 10023)
+++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java	2010-12-09 17:55:46 UTC (rev 10024)
@@ -1003,7 +1003,7 @@
 
       List<String> staticConnectorNames = new ArrayList<String>();
 
-      boolean allowDirectConnectionsOnly = true;
+      boolean allowDirectConnectionsOnly = false;
       
       NodeList children = e.getChildNodes();
 
@@ -1018,8 +1018,10 @@
          else if (child.getNodeName().equals("static-connectors"))
          {
             Node attr = child.getAttributes().getNamedItem("allow-direct-connections-only");
-
-            allowDirectConnectionsOnly = "true".equalsIgnoreCase(attr.getNodeValue()) || allowDirectConnectionsOnly;
+            if(attr != null)
+            {
+               allowDirectConnectionsOnly = "true".equalsIgnoreCase(attr.getNodeValue()) || allowDirectConnectionsOnly;
+            }
             getStaticConnectors(staticConnectorNames, child);
          }
       }