Author: jmesnil
Date: 2010-07-19 09:35:56 -0400 (Mon, 19 Jul 2010)
New Revision: 9413
Modified:
branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-jms.xsd
branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
Log:
HA refactoring
* revert connectors' XML element to <connectors> (instead of
<static-connectors>)
Modified: branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-jms.xsd
===================================================================
--- branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-jms.xsd 2010-07-19
12:19:21 UTC (rev 9412)
+++ branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-jms.xsd 2010-07-19
13:35:56 UTC (rev 9413)
@@ -29,7 +29,7 @@
<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>
- <xsd:element name="static-connectors" maxOccurs="1"
minOccurs="0">
+ <xsd:element name="connectors" maxOccurs="1"
minOccurs="0">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="connector-ref"
type="connector-refType"
Modified:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
---
branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-07-19
12:19:21 UTC (rev 9412)
+++
branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-07-19
13:35:56 UTC (rev 9413)
@@ -44,7 +44,7 @@
protected static final String ENTRY_NODE_NAME = "entry";
- protected static final String CONNECTORS_NODE_NAME = "static-connectors";
+ protected static final String CONNECTORS_NODE_NAME = "connectors";
protected static final String CONNECTION_FACTORY_NODE_NAME =
"connection-factory";
Modified:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
---
branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-07-19
12:19:21 UTC (rev 9412)
+++
branches/2_2_0_HA_Improvements/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-07-19
13:35:56 UTC (rev 9413)
@@ -1003,15 +1003,15 @@
}
else
{
+ TransportConfiguration[] connectorConfigs =
(TransportConfiguration[])cfConfig.getConnectorConfigs().toArray(new
TransportConfiguration[cfConfig.getConnectorConfigs().size()]);
+
if (cfConfig.isHA())
{
- cf =
HornetQJMSClient.createConnectionFactoryWithHA(cfConfig.getConnectorConfigs()
- .toArray(new
TransportConfiguration[0]));
+ cf = HornetQJMSClient.createConnectionFactoryWithHA(connectorConfigs);
}
else
{
- cf =
HornetQJMSClient.createConnectionFactoryWithoutHA(cfConfig.getConnectorConfigs()
-
.toArray(new TransportConfiguration[0]));
+ cf = HornetQJMSClient.createConnectionFactoryWithoutHA(connectorConfigs);
}
}
Show replies by date