June 2011 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r10811 - in branches/Branch_2_2_EAP: src/main/org/hornetq/api/core/client and 19 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-06-15 11:15:58 -0400 (Wed, 15 Jun 2011) New Revision: 10811 Modified: branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/ClientSessionFactory.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/DelegatingSession.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/Bridge.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/MessageFlowRecord.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: HORNETQ-716 - Cleanup on clustering Modified: branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd =================================================================== --- branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/config/common/schema/hornetq-configuration.xsd 2011-06-15 15:15:58 UTC (rev 10811) @@ -313,12 +313,18 @@ </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="transformer-class-name" type="xsd:string"> </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="check-period" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="connection-ttl" type="xsd:long"> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long"> - </xsd:element> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval-multiplier" type="xsd:double"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="reconnect-attempts" type="xsd:int"> - </xsd:element> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="max-retry-interval" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="reconnect-attempts" type="xsd:long"> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="failover-on-server-shutdown" type="xsd:boolean"> </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="use-duplicate-detection" type="xsd:boolean"> @@ -354,8 +360,18 @@ </xsd:element> <xsd:element maxOccurs="1" minOccurs="1" name="connector-ref" type="xsd:string"> </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="check-period" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="connection-ttl" type="xsd:long"> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long"> </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval-multiplier" type="xsd:double"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="max-retry-interval" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="reconnect-attempts" type="xsd:long"> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="use-duplicate-detection" type="xsd:boolean"> </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="forward-when-no-consumers" type="xsd:boolean"> Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/ClientSessionFactory.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -137,4 +137,6 @@ ServerLocator getServerLocator(); CoreRemotingConnection getConnection(); + + boolean isClosed(); } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -83,6 +83,8 @@ private static final long serialVersionUID = 2512460695662741413L; private static final Logger log = Logger.getLogger(ClientSessionFactoryImpl.class); + + private static final boolean isTrace = log.isTraceEnabled(); // Attributes // ----------------------------------------------------------------------------------- @@ -404,10 +406,10 @@ public void causeExit() { - exitLoop = true; synchronized (waitLock) { - waitLock.notify(); + exitLoop = true; + waitLock.notifyAll(); } } @@ -418,7 +420,7 @@ return; } - // we need to stopthe factory from connecting if it is in the middle aof trying to failover before we get the lock + // we need to stop the factory from connecting if it is in the middle of trying to failover before we get the lock causeExit(); synchronized (createSessionLock) { @@ -449,7 +451,12 @@ closed = true; } - public ServerLocator getServerLocator() + public boolean isClosed() + { + return closed; + } + + public ServerLocator getServerLocator() { return serverLocator; } @@ -497,6 +504,12 @@ return; } + + if (isTrace) + { + log.trace("Client Connection failed, calling failure listeners and trying to reconnect, reconnectAttempts=" + reconnectAttempts); + } + // We call before reconnection occurs to give the user a chance to do cleanup, like cancel messages callFailureListeners(me, false, false); @@ -881,13 +894,8 @@ synchronized (waitLock) { - while (true) + while (!exitLoop) { - if (exitLoop) - { - return; - } - if (log.isDebugEnabled()) { log.debug("Trying reconnection attempt " + count); @@ -910,14 +918,21 @@ return; } + if (isTrace) + { + log.trace("Waiting " + interval + + " milliseconds before next retry. RetryInterval=" + retryInterval + + " and multiplier = " + retryIntervalMultiplier); + } + try { - waitLock.wait(interval); + waitLock.wait(interval); } catch (InterruptedException ignore) { } - + // Exponential back-off long newInterval = (long)(interval * retryIntervalMultiplier); @@ -1086,6 +1101,13 @@ } } } + else + { + if (isTrace) + { + log.trace("No Backup configured!"); + } + } } catch (Exception e) { Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -843,8 +843,11 @@ { if (closed) { + log.debug("Session was already closed, giving up now, this=" + this); return; } + + log.debug("Calling close on session " + this); try { @@ -1607,6 +1610,10 @@ return remotingConnection; } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -1614,7 +1621,8 @@ { buffer.append(entry.getKey() + "=" + entry.getValue() + ","); } - return "ClientSessionImpl::(" + buffer.toString() + ")"; + + return "ClientSessionImpl [name=" + name + ", username=" + username + ", closed=" + closed + " metaData=(" + buffer + ")]@" + Integer.toHexString(hashCode()) ; } // Protected @@ -1776,12 +1784,21 @@ private void doCleanup(boolean failingOver) { remotingConnection.removeFailureListener(this); + + if (log.isDebugEnabled()) + { + log.debug("calling cleanup on " + this); + } synchronized (this) { closed = true; channel.close(); + + // if the server is sending a disconnect + // any pending blocked operation could hang without this + channel.returnBlocking(); } sessionFactory.removeSession(this, failingOver); Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/DelegatingSession.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -578,4 +578,10 @@ { return session.isCompressLargeMessages(); } + + public String toString() + { + return "DelegatingSession [session=" + session + "]"; + } + } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -49,6 +49,8 @@ public class DiscoveryGroupImpl implements Runnable, DiscoveryGroup { private static final Logger log = Logger.getLogger(DiscoveryGroupImpl.class); + + private static final boolean isTrace = log.isTraceEnabled(); private static final int SOCKET_TIMEOUT = 500; @@ -375,6 +377,14 @@ if (changed) { + if (isTrace) + { + log.trace("Connectors changed on Discovery:"); + for (DiscoveryEntry connector : connectors.values()) + { + log.trace(connector); + } + } callListeners(); } @@ -438,6 +448,10 @@ if (entry.getValue().getLastUpdate() + timeout <= now) { + if (isTrace) + { + log.trace("Timed out node on discovery:" + entry.getValue()); + } iter.remove(); changed = true; Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/BridgeConfiguration.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -61,17 +61,24 @@ private String password; + private final long connectionTTL; + + private final long maxRetryInterval; + + public BridgeConfiguration(final String name, final String queueName, final String forwardingAddress, final String filterString, final String transformerClassName, + final long clientFailureCheckPeriod, + final long connectionTTL, final long retryInterval, + final long maxRetryInterval, final double retryIntervalMultiplier, final int reconnectAttempts, final boolean useDuplicateDetection, final int confirmationWindowSize, - final long clientFailureCheckPeriod, final List<String> staticConnectors, final boolean ha, final String user, @@ -89,8 +96,10 @@ this.confirmationWindowSize = confirmationWindowSize; this.clientFailureCheckPeriod = clientFailureCheckPeriod; this.staticConnectors = staticConnectors; - this.user = user; + this. user = user; this.password = password; + this.connectionTTL = connectionTTL; + this.maxRetryInterval = maxRetryInterval; discoveryGroupName = null; } @@ -99,12 +108,14 @@ final String forwardingAddress, final String filterString, final String transformerClassName, + final long clientFailureCheckPeriod, + final long connectionTTL, final long retryInterval, + final long maxRetryInterval, final double retryIntervalMultiplier, final int reconnectAttempts, final boolean useDuplicateDetection, final int confirmationWindowSize, - final long clientFailureCheckPeriod, final String discoveryGroupName, final boolean ha, final String user, @@ -126,6 +137,8 @@ this.ha = ha; this.user = user; this.password = password; + this.connectionTTL = connectionTTL; + this.maxRetryInterval = maxRetryInterval; } public String getName() @@ -138,6 +151,22 @@ return queueName; } + /** + * @return the connectionTTL + */ + public long getConnectionTTL() + { + return connectionTTL; + } + + /** + * @return the maxRetryInterval + */ + public long getMaxRetryInterval() + { + return maxRetryInterval; + } + public String getForwardingAddress() { return forwardingAddress; Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -16,6 +16,8 @@ import java.io.Serializable; import java.util.List; +import org.hornetq.core.config.impl.ConfigurationImpl; + /** * A ClusterConnectionConfiguration * @@ -35,7 +37,17 @@ private final String connectorName; + private final long clientFailureCheckPeriod; + + private final long connectionTTL; + private final long retryInterval; + + private final double retryIntervalMultiplier; + + private final long maxRetryInterval; + + private final int reconnectAttempts; private final boolean duplicateDetection; @@ -50,11 +62,45 @@ private final int confirmationWindowSize; private final boolean allowDirectConnectionsOnly; + + public ClusterConnectionConfiguration(final String name, + final String address, + final String connectorName, + final long retryInterval, + final boolean duplicateDetection, + final boolean forwardWhenNoConsumers, + final int maxHops, + final int confirmationWindowSize, + final List<String> staticConnectors, + final boolean allowDirectConnectionsOnly) + { + this(name, + address, + connectorName, + ConfigurationImpl.DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD, + ConfigurationImpl.DEFAULT_CLUSTER_CONNECTION_TTL, + retryInterval, + ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER, + ConfigurationImpl.DEFAULT_CLUSTER_MAX_RETRY_INTERVAL, + ConfigurationImpl.DEFAULT_CLUSTER_RECONNECT_ATTEMPTS, + duplicateDetection, + forwardWhenNoConsumers, + maxHops, + confirmationWindowSize, + staticConnectors, + allowDirectConnectionsOnly); + } + public ClusterConnectionConfiguration(final String name, final String address, final String connectorName, + final long clientFailureCheckPeriod, + final long connectionTTL, final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, final boolean duplicateDetection, final boolean forwardWhenNoConsumers, final int maxHops, @@ -65,7 +111,12 @@ this.name = name; this.address = address; this.connectorName = connectorName; + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + this.connectionTTL = connectionTTL; this.retryInterval = retryInterval; + this.retryIntervalMultiplier = retryIntervalMultiplier; + this.maxRetryInterval = maxRetryInterval; + this.reconnectAttempts = reconnectAttempts; this.staticConnectors = staticConnectors; this.duplicateDetection = duplicateDetection; this.forwardWhenNoConsumers = forwardWhenNoConsumers; @@ -75,6 +126,7 @@ this.allowDirectConnectionsOnly = allowDirectConnectionsOnly; } + public ClusterConnectionConfiguration(final String name, final String address, final String connectorName, @@ -85,10 +137,47 @@ final int confirmationWindowSize, final String discoveryGroupName) { + this(name, + address, + connectorName, + ConfigurationImpl.DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD, + ConfigurationImpl.DEFAULT_CLUSTER_CONNECTION_TTL, + retryInterval, + ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER, + ConfigurationImpl.DEFAULT_CLUSTER_MAX_RETRY_INTERVAL, + ConfigurationImpl.DEFAULT_CLUSTER_RECONNECT_ATTEMPTS, + duplicateDetection, + forwardWhenNoConsumers, + maxHops, + confirmationWindowSize, + discoveryGroupName); + } + + + public ClusterConnectionConfiguration(final String name, + final String address, + final String connectorName, + final long clientFailureCheckPeriod, + final long connectionTTL, + final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, + final boolean duplicateDetection, + final boolean forwardWhenNoConsumers, + final int maxHops, + final int confirmationWindowSize, + final String discoveryGroupName) + { this.name = name; this.address = address; this.connectorName = connectorName; + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + this.connectionTTL = connectionTTL; this.retryInterval = retryInterval; + this.retryIntervalMultiplier = retryIntervalMultiplier; + this.maxRetryInterval = maxRetryInterval; + this.reconnectAttempts = reconnectAttempts; this.duplicateDetection = duplicateDetection; this.forwardWhenNoConsumers = forwardWhenNoConsumers; this.discoveryGroupName = discoveryGroupName; @@ -108,6 +197,46 @@ return address; } + /** + * @return the clientFailureCheckPeriod + */ + public long getClientFailureCheckPeriod() + { + return clientFailureCheckPeriod; + } + + /** + * @return the connectionTTL + */ + public long getConnectionTTL() + { + return connectionTTL; + } + + /** + * @return the retryIntervalMultiplier + */ + public double getRetryIntervalMultiplier() + { + return retryIntervalMultiplier; + } + + /** + * @return the maxRetryInterval + */ + public long getMaxRetryInterval() + { + return maxRetryInterval; + } + + /** + * @return the reconnectAttempts + */ + public int getReconnectAttempts() + { + return reconnectAttempts; + } + public String getConnectorName() { return connectorName; Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -24,6 +24,7 @@ import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.BridgeConfiguration; import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.ClusterConnectionConfiguration; @@ -166,6 +167,16 @@ public static final long DEFAULT_CLUSTER_RETRY_INTERVAL = 500; + public static final int DEFAULT_CLUSTER_RECONNECT_ATTEMPTS = -1; + + public static final long DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + + public static final long DEFAULT_CLUSTER_CONNECTION_TTL = HornetQClient.DEFAULT_CONNECTION_TTL; + + public static final double DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + + public static final long DEFAULT_CLUSTER_MAX_RETRY_INTERVAL = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL; + public static final boolean DEFAULT_DIVERT_EXCLUSIVE = false; public static final boolean DEFAULT_BRIDGE_DUPLICATE_DETECTION = true; Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -1003,12 +1003,27 @@ "max-hops", ConfigurationImpl.DEFAULT_CLUSTER_MAX_HOPS, Validators.GE_ZERO); + + long clientFailureCheckPeriod = XMLConfigurationUtil.getLong(e, "check-period", + ConfigurationImpl.DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD, Validators.GT_ZERO) ; + long connectionTTL = XMLConfigurationUtil.getLong(e, "connection-ttl", + ConfigurationImpl.DEFAULT_CLUSTER_CONNECTION_TTL, Validators.GT_ZERO) ; + + long retryInterval = XMLConfigurationUtil.getLong(e, "retry-interval", ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL, Validators.GT_ZERO); + + double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(e, "retry-interval-multiplier", + ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER, Validators.GT_ZERO); + + long maxRetryInterval = XMLConfigurationUtil.getLong(e, "max-retry-interval", ConfigurationImpl.DEFAULT_CLUSTER_MAX_RETRY_INTERVAL, Validators.GT_ZERO); + + int reconnectAttempts = XMLConfigurationUtil.getInteger(e, "reconnect-attempts", ConfigurationImpl.DEFAULT_CLUSTER_RECONNECT_ATTEMPTS, Validators.MINUS_ONE_OR_GE_ZERO); + int confirmationWindowSize = XMLConfigurationUtil.getInteger(e, "confirmation-window-size", FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, @@ -1048,7 +1063,12 @@ config = new ClusterConnectionConfiguration(name, address, connectorName, + clientFailureCheckPeriod, + connectionTTL, retryInterval, + retryIntervalMultiplier, + maxRetryInterval, + reconnectAttempts, duplicateDetection, forwardWhenNoConsumers, maxHops, @@ -1061,7 +1081,12 @@ config = new ClusterConnectionConfiguration(name, address, connectorName, + clientFailureCheckPeriod, + connectionTTL, retryInterval, + retryIntervalMultiplier, + maxRetryInterval, + reconnectAttempts, duplicateDetection, forwardWhenNoConsumers, maxHops, @@ -1101,17 +1126,26 @@ null, Validators.NO_CHECK); + // Default bridge conf + int confirmationWindowSize = XMLConfigurationUtil.getInteger(brNode, + "confirmation-window-size", + FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, + Validators.GT_ZERO); + long retryInterval = XMLConfigurationUtil.getLong(brNode, "retry-interval", HornetQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO); - // Default bridge conf - int confirmationWindowSize = XMLConfigurationUtil.getInteger(brNode, - "confirmation-window-size", - FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, - Validators.GT_ZERO); + long clientFailureCheckPeriod = XMLConfigurationUtil.getLong(brNode, "check-period", + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, Validators.GT_ZERO) ; + long connectionTTL = XMLConfigurationUtil.getLong(brNode, "connection-ttl", + HornetQClient.DEFAULT_CONNECTION_TTL, Validators.GT_ZERO) ; + + long maxRetryInterval = XMLConfigurationUtil.getLong(brNode, "max-retry-interval", HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, Validators.GT_ZERO); + + double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(brNode, "retry-interval-multiplier", HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, @@ -1173,12 +1207,14 @@ forwardingAddress, filterString, transformerClassName, + clientFailureCheckPeriod, + connectionTTL, retryInterval, + maxRetryInterval, retryIntervalMultiplier, reconnectAttempts, useDuplicateDetection, confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectorNames, ha, user, @@ -1191,12 +1227,14 @@ forwardingAddress, filterString, transformerClassName, + clientFailureCheckPeriod, + connectionTTL, retryInterval, + maxRetryInterval, retryIntervalMultiplier, reconnectAttempts, useDuplicateDetection, confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, discoveryGroupName, ha, user, Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -241,6 +241,7 @@ try { bridge.stop(); + bridge.flushExecutor(); } finally { Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -38,6 +38,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.BridgeControl; import org.hornetq.api.core.management.DivertControl; @@ -1702,12 +1703,14 @@ forwardingAddress, filterString, transformerClassName, + clientFailureCheckPeriod, + HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, retryIntervalMultiplier, reconnectAttempts, useDuplicateDetection, confirmationWindowSize, - clientFailureCheckPeriod, connectorNames, ha, user, @@ -1721,12 +1724,14 @@ forwardingAddress, filterString, transformerClassName, + clientFailureCheckPeriod, + HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, retryIntervalMultiplier, reconnectAttempts, useDuplicateDetection, confirmationWindowSize, - clientFailureCheckPeriod, connectors, ha, user, Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -13,6 +13,8 @@ package org.hornetq.core.postoffice.impl; +import java.io.PrintWriter; +import java.io.StringWriter; import java.nio.ByteBuffer; import java.util.Collection; import java.util.List; @@ -50,6 +52,8 @@ { private static final Logger log = Logger.getLogger(BindingsImpl.class); + private static boolean isTrace = log.isTraceEnabled(); + private final ConcurrentMap<SimpleString, List<Binding>> routingNameBindingMap = new ConcurrentHashMap<SimpleString, List<Binding>>(); private final Map<SimpleString, Integer> routingNamePositions = new ConcurrentHashMap<SimpleString, Integer>(); @@ -61,13 +65,16 @@ private volatile boolean routeWhenNoConsumers; private final GroupingHandler groupingHandler; - + private final PagingStore pageStore; - public BindingsImpl(final GroupingHandler groupingHandler, final PagingStore pageStore) + private final SimpleString name; + + public BindingsImpl(final SimpleString name, final GroupingHandler groupingHandler, final PagingStore pageStore) { this.groupingHandler = groupingHandler; this.pageStore = pageStore; + this.name = name; } public void setRouteWhenNoConsumers(final boolean routeWhenNoConsumers) @@ -82,6 +89,10 @@ public void addBinding(final Binding binding) { + if (isTrace) + { + log.trace("addBinding(" + binding + ") being called"); + } if (binding.isExclusive()) { exclusiveBindings.add(binding); @@ -108,6 +119,12 @@ } bindingsMap.put(binding.getID(), binding); + + if (isTrace) + { + log.trace("Adding binding " + binding + " into " + this + " bindingTable: " + debugBindings()); + } + } public void removeBinding(final Binding binding) @@ -134,6 +151,11 @@ } bindingsMap.remove(binding.getID()); + + if (isTrace) + { + log.trace("Removing binding " + binding + " into " + this + " bindingTable: " + debugBindings()); + } } public boolean redistribute(final ServerMessage message, final Queue originatingQueue, final RoutingContext context) throws Exception @@ -144,6 +166,11 @@ return false; } + if (isTrace) + { + log.trace("Redistributing message " + message); + } + SimpleString routingName = originatingQueue.getName(); List<Binding> bindings = routingNameBindingMap.get(routingName); @@ -222,12 +249,12 @@ return false; } } - + public PagingStore getPagingStore() { return pageStore; } - + public void route(final ServerMessage message, final RoutingContext context) throws Exception { boolean routed = false; @@ -247,8 +274,8 @@ if (!routed) { - //TODO this is a little inefficient since we do the lookup once to see if the property - //is there, then do it again to remove the actual property + // TODO this is a little inefficient since we do the lookup once to see if the property + // is there, then do it again to remove the actual property if (message.containsProperty(MessageImpl.HDR_ROUTE_TO_IDS)) { routeFromCluster(message, context); @@ -259,6 +286,10 @@ } else { + if (isTrace) + { + log.trace("Routing message " + message + " on binding=" + this); + } for (Map.Entry<SimpleString, List<Binding>> entry : routingNameBindingMap.entrySet()) { SimpleString routingName = entry.getKey(); @@ -283,6 +314,15 @@ } } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() + { + return "BindingsImpl [name=" + name + "]"; + } + private Binding getNextBinding(final ServerMessage message, final SimpleString routingName, final List<Binding> bindings) @@ -290,9 +330,9 @@ Integer ipos = routingNamePositions.get(routingName); int pos = ipos != null ? ipos : 0; - + int length = bindings.size(); - + int startPos = pos; Binding theBinding = null; @@ -470,7 +510,75 @@ } } } + + private String debugBindings() + { + StringWriter writer = new StringWriter(); + PrintWriter out = new PrintWriter(writer); + + out.println("\n***************************************"); + + out.println("routingNameBindingMap:"); + if (routingNameBindingMap.isEmpty()) + { + out.println("EMPTY!"); + } + for (Map.Entry<SimpleString, List<Binding>> entry : routingNameBindingMap.entrySet()) + { + out.print("key=" + entry.getKey() + ", value=" + entry.getValue()); +// for (Binding bind : entry.getValue()) +// { +// out.print(bind + ","); +// } + out.println(); + } + + out.println(); + + out.println("RoutingNamePositions:"); + if (routingNamePositions.isEmpty()) + { + out.println("EMPTY!"); + } + for (Map.Entry<SimpleString, Integer> entry : routingNamePositions.entrySet()) + { + out.println("key=" + entry.getKey() + ", value=" + entry.getValue()); + } + + out.println(); + + out.println("BindingsMap:"); + + if (bindingsMap.isEmpty()) + { + out.println("EMPTY!"); + } + for (Map.Entry<Long, Binding> entry : bindingsMap.entrySet()) + { + out.println("Key=" + entry.getKey() + ", value=" + entry.getValue()); + } + + out.println(); + + out.println("ExclusiveBindings:"); + if (exclusiveBindings.isEmpty()) + { + out.println("EMPTY!"); + } + + for (Binding binding: exclusiveBindings) + { + out.println(binding); + } + + out.println("#####################################################"); + + + return writer.toString(); + } + + private void routeFromCluster(final ServerMessage message, final RoutingContext context) throws Exception { byte[] ids = (byte[])message.removeProperty(MessageImpl.HDR_ROUTE_TO_IDS); Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -124,15 +124,30 @@ return BindingType.DIVERT; } + + /* (non-Javadoc) * @see java.lang.Object#toString() */ @Override public String toString() { - return "DivertBinding [divert=" + divert + "]"; + return "DivertBinding [id=" + id + + ", address=" + + address + + ", divert=" + + divert + + ", filter=" + + filter + + ", uniqueName=" + + uniqueName + + ", routingName=" + + routingName + + ", exclusive=" + + exclusive + + "]"; } - + public void close() throws Exception { } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -77,6 +77,8 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, BindingsFactory { private static final Logger log = Logger.getLogger(PostOfficeImpl.class); + + private static final boolean isTrace = log.isTraceEnabled(); public static final SimpleString HDR_RESET_QUEUE_DATA = new SimpleString("_HQ_RESET_QUEUE_DATA"); @@ -209,6 +211,10 @@ public void onNotification(final Notification notification) { + if (isTrace) + { + log.trace("Receiving notification : " + notification); + } synchronized (notificationLock) { NotificationType type = notification.getType(); @@ -1306,6 +1312,6 @@ public Bindings createBindings(final SimpleString address) throws Exception { - return new BindingsImpl(server.getGroupingHandler(), pagingManager.getPageStore(address)); + return new BindingsImpl(address, server.getGroupingHandler(), pagingManager.getPageStore(address)); } } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -38,6 +38,8 @@ public class ChannelImpl implements Channel { private static final Logger log = Logger.getLogger(ChannelImpl.class); + + private static final boolean isTrace = log.isTraceEnabled(); private volatile long id; @@ -159,6 +161,11 @@ synchronized (sendLock) { packet.setChannelID(id); + + if (isTrace) + { + log.trace("Sending packet nonblocking " + packet + " on channeID=" + id); + } HornetQBuffer buffer = packet.encode(connection); @@ -193,7 +200,13 @@ { lock.unlock(); } + + if (isTrace) + { + log.trace("Writing buffer for channelID=" + id); + } + // The actual send must be outside the lock, or with OIO transport, the write can block if the tcp // buffer is full, preventing any incoming buffers being handled and blocking failover connection.getTransportConnection().write(buffer, flush, batch); @@ -350,6 +363,10 @@ { if (resendCache != null) { + if (isTrace) + { + log.trace("Replaying commands on channelID=" + id); + } clearUpTo(otherLastConfirmedCommandID); for (final Packet packet : resendCache) Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/Bridge.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/Bridge.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/Bridge.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -43,8 +43,14 @@ boolean isUseDuplicateDetection(); void activate(); - + + void flushExecutor(); + void setNotificationService(NotificationService notificationService); RemotingConnection getForwardingConnection(); + + void pause() throws Exception; + + void resume() throws Exception; } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/MessageFlowRecord.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/MessageFlowRecord.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/MessageFlowRecord.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -33,7 +33,14 @@ Bridge getBridge(); void close() throws Exception; + + public void resume() throws Exception; + + boolean isClosed(); void reset() throws Exception; + void pause() throws Exception; + + boolean isPaused(); } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -23,10 +23,10 @@ import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession.BindingQuery; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.client.ClientSession.BindingQuery; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.client.impl.ServerLocatorInternal; @@ -195,8 +195,17 @@ while ((ref = refs.poll()) != null) { + if (isTrace) + { + log.trace("Cancelling reference " + ref + " on bridge " + this); + } list.addFirst(ref); } + + if (isTrace && list.isEmpty()) + { + log.trace("didn't have any references to cancel on bridge " + this); + } Queue queue = null; @@ -210,27 +219,58 @@ } } + + public void flushExecutor() + { + // Wait for any create objects runnable to complete + Future future = new Future(); + executor.execute(future); + + boolean ok = future.await(10000); + + if (!ok) + { + BridgeImpl.log.warn("Timed out waiting to stop"); + } + } + + public void stop() throws Exception { - if (started) + if (log.isDebugEnabled()) + { + log.debug("Bridge " + this.name + " being stopped"); + } + + stopping = true; + + executor.execute(new StopRunnable()); + + if (notificationService != null) { - // We need to stop the csf here otherwise the stop runnable never runs since the createobjectsrunnable is - // trying to connect to the target - // server which isn't up in an infinite loop - if (csf != null) + TypedProperties props = new TypedProperties(); + props.putSimpleStringProperty(new SimpleString("name"), name); + Notification notification = new Notification(nodeUUID.toString(), NotificationType.BRIDGE_STOPPED, props); + try { - csf.close(); + notificationService.sendNotification(notification); } + catch (Exception e) + { + BridgeImpl.log.warn("unable to send notification when broadcast group is stopped", e); + } } - - log.info("Bridge " + this.name + " being stopped"); - - stopping = true; + } - executor.execute(new StopRunnable()); + public void pause() throws Exception + { + if (log.isDebugEnabled()) + { + log.debug("Bridge " + this.name + " being paused"); + } - waitForRunnablesToComplete(); + executor.execute(new PauseRunnable()); if (notificationService != null) { @@ -248,7 +288,13 @@ } } - public boolean isStarted() + public void resume() throws Exception + { + queue.addConsumer(BridgeImpl.this); + queue.deliverAsync(); + } + + public boolean isStarted() { return started; } @@ -366,7 +412,7 @@ { return HandleStatus.NO_MATCH; } - + synchronized (this) { if (!active) @@ -424,6 +470,10 @@ public void connectionFailed(final HornetQException me, boolean failedOver) { log.warn(name + "::Connection failed with failedOver=" + failedOver, me); + if (isTrace) + { + log.trace("Calling BridgeImpl::connectionFailed(HOrnetQException me=" + me + ", boolean failedOver=" + failedOver); + } fail(false); } @@ -432,6 +482,8 @@ log.warn(name + "::Connection failed before reconnect ", exception); fail(true); } + + // Package protected --------------------------------------------- @@ -439,19 +491,29 @@ // Private ------------------------------------------------------- - private void waitForRunnablesToComplete() + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { - // Wait for any create objects runnable to complete - Future future = new Future(); - - executor.execute(future); - - boolean ok = future.await(10000); - - if (!ok) - { - BridgeImpl.log.warn("Timed out waiting to stop"); - } + return this.getClass().getName() + + " [name=" + name + + ", nodeUUID=" + + nodeUUID + + ", queue=" + + queue + + ", filter=" + + filter + + ", forwardingAddress=" + + forwardingAddress + + ", useDuplicateDetection=" + + useDuplicateDetection + + ", active=" + + active + + ", stopping=" + + stopping + + "]"; } private void fail(final boolean beforeReconnect) @@ -468,37 +530,41 @@ active = false; } - try - { + if (!session.getConnection().isDestroyed()) { if (beforeReconnect) { - synchronized (this) + try { + log.debug(name + "::Connection is destroyed, active = false now"); + + cancelRefs(); + } + catch (Exception e) { - log.debug(name + "::Connection is destroyed, active = false now"); + BridgeImpl.log.error("Failed to cancel refs", e); } - - cancelRefs(); } else { - afterConnect(); + try + { + afterConnect(); - log.debug(name + "::After reconnect, setting active=true now"); - active = true; + log.debug(name + "::After reconnect, setting active=true now"); + active = true; - if (queue != null) + if (queue != null) + { + queue.deliverAsync(); + } + } + catch (Exception e) { - queue.deliverAsync(); + BridgeImpl.log.error("Failed to call after connect", e); } } } - } - catch (Exception e) - { - BridgeImpl.log.error("Failed to cancel refs", e); - } } /* Hook for doing extra stuff after connection */ @@ -530,9 +596,21 @@ try { - csf = createSessionFactory(); - // Session is pre-acknowledge - session = (ClientSessionInternal)csf.createSession(user, password, false, true, true, true, 1); + if (csf == null || csf.isClosed()) + { + csf = createSessionFactory(); + // Session is pre-acknowledge + session = (ClientSessionInternal)csf.createSession(user, password, false, true, true, true, 1); + try + { + session.addMetaData("Session-for-bridge", name.toString()); + session.addMetaData("nodeUUID", nodeUUID.toString()); + } + catch (Throwable dontCare) + { + // addMetaData here is just for debug purposes + } + } if (forwardingAddress != null) { @@ -654,20 +732,25 @@ { try { + // We need to close the session outside of the lock, + // so any pending operation will be canceled right away + + // TODO: Why closing the CSF will make a few clustering and failover tests to + // either deadlock or take forever on waiting + // locks + csf.close(); + csf = null; + if (session != null) + { + log.debug("Cleaning up session " + session); + session.close(); + session.removeFailureListener(BridgeImpl.this); + } + synchronized (BridgeImpl.this) { - if (!started) - { - return; - } - log.debug("Closing Session for bridge " + BridgeImpl.this.name); - if (session != null) - { - session.close(); - } - started = false; active = false; @@ -692,6 +775,40 @@ } } + private class PauseRunnable implements Runnable + { + public void run() + { + try + { + synchronized (BridgeImpl.this) + { + log.debug("Closing Session for bridge " + BridgeImpl.this.name); + + started = false; + + active = false; + + } + + queue.removeConsumer(BridgeImpl.this); + + cancelRefs(); + + if (queue != null) + { + queue.deliverAsync(); + } + + log.info("paused bridge " + name); + } + catch (Exception e) + { + BridgeImpl.log.error("Failed to pause bridge", e); + } + } + } + private class CreateObjectsRunnable implements Runnable { public synchronized void run() Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -50,6 +50,8 @@ public class ClusterConnectionBridge extends BridgeImpl { private static final Logger log = Logger.getLogger(ClusterConnectionBridge.class); + + private static final boolean isTrace = log.isTraceEnabled(); private final MessageFlowRecord flowRecord; @@ -195,7 +197,7 @@ flowRecord.getAddress() + "%')"); - session.createQueue(managementNotificationAddress, notifQueueName, filter, false); + session.createTemporaryQueue(managementNotificationAddress, notifQueueName, filter); notifConsumer = session.createConsumer(notifQueueName); @@ -224,6 +226,12 @@ } @Override + public void stop() throws Exception + { + super.stop(); + } + + @Override protected ClientSessionFactory createSessionFactory() throws Exception { //We create the session factory using the specified connector @@ -234,6 +242,11 @@ @Override public void connectionFailed(HornetQException me, boolean failedOver) { + if (isTrace) + { + log.trace("Connection Failed on ClusterConnectionBridge, failedOver = " + failedOver + ", sessionClosed = " + session.isClosed(), new Exception ("trace")); + } + if (!failedOver && !session.isClosed()) { try Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -65,6 +65,8 @@ public class ClusterConnectionImpl implements ClusterConnection { private static final Logger log = Logger.getLogger(ClusterConnectionImpl.class); + + private static final boolean isTrace = log.isTraceEnabled(); private final org.hornetq.utils.ExecutorFactory executorFactory; @@ -78,7 +80,17 @@ private final SimpleString address; + private final long clientFailureCheckPeriod; + + private final long connectionTTL; + private final long retryInterval; + + private final double retryIntervalMultiplier; + + private final long maxRetryInterval; + + private final int reconnectAttempts; private final boolean useDuplicateDetection; @@ -114,7 +126,12 @@ final TransportConfiguration connector, final SimpleString name, final SimpleString address, + final long clientFailureCheckPeriod, + final long connectionTTL, final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, final boolean useDuplicateDetection, final boolean routeWhenNoConsumers, final int confirmationWindowSize, @@ -144,7 +161,17 @@ this.address = address; + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + + this.connectionTTL = connectionTTL; + this.retryInterval = retryInterval; + + this.retryIntervalMultiplier = retryIntervalMultiplier; + + this.maxRetryInterval = maxRetryInterval; + + this.reconnectAttempts = reconnectAttempts; this.useDuplicateDetection = useDuplicateDetection; @@ -188,7 +215,12 @@ final TransportConfiguration connector, final SimpleString name, final SimpleString address, - final long retryInterval, + final long clientFailureCheckPeriod, + final long connectionTTL, + final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, final boolean useDuplicateDetection, final boolean routeWhenNoConsumers, final int confirmationWindowSize, @@ -218,7 +250,17 @@ this.address = address; + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + + this.connectionTTL = connectionTTL; + this.retryInterval = retryInterval; + + this.retryIntervalMultiplier = retryIntervalMultiplier; + + this.maxRetryInterval = maxRetryInterval; + + this.reconnectAttempts = reconnectAttempts; this.useDuplicateDetection = useDuplicateDetection; @@ -355,13 +397,26 @@ { serverLocator.setNodeID(nodeUUID.toString()); - serverLocator.setReconnectAttempts(-1); + serverLocator.setReconnectAttempts(reconnectAttempts); serverLocator.setClusterConnection(true); serverLocator.setClusterTransportConfiguration(connector); serverLocator.setBackup(server.getConfiguration().isBackup()); serverLocator.setInitialConnectAttempts(-1); - serverLocator.setConfirmationWindowSize(0); + if (serverLocator.getConfirmationWindowSize() < 0) + { + // We can't have confirmationSize = -1 on the cluster Bridge + // Otherwise we won't have confirmation working + serverLocator.setConfirmationWindowSize(0); + } + + if (!useDuplicateDetection) + { + log.debug("DuplicateDetection is disabled, sending clustered messages blocked"); + } + // if not using duplicate detection, we will send blocked + serverLocator.setBlockOnDurableSend(!useDuplicateDetection); + serverLocator.setBlockOnNonDurableSend(!useDuplicateDetection); if(retryInterval > 0) { @@ -393,7 +448,7 @@ public synchronized void nodeDown(final String nodeID) { - log.debug("node " + nodeID + " being considered down on cluster connection for nodeID=" + nodeUUID); + log.debug("node " + nodeID + " being considered down on cluster connection for nodeID=" + nodeUUID, new Exception ("trace")); if (nodeID.equals(nodeUUID.toString())) { return; @@ -407,7 +462,11 @@ { try { - record.reset(); + if (isTrace) + { + log.trace("Closing clustering record " + record); + } + record.pause(); } catch (Exception e) { @@ -485,11 +544,11 @@ } else { - // FIXME apple and orange comparison. I don't understand it... - //if (!connectorPair.a.equals(record.getBridge().getForwardingConnection().getTransportConnection())) - // { - // // New live node - close it and recreate it - TODO - CAN THIS EVER HAPPEN? - //} + log.info("Reattaching nodeID=" + nodeID); + if (record.isPaused()) + { + record.resume(); + } } } catch (Exception e) @@ -502,6 +561,11 @@ public void nodeAnnounced(final String nodeID, final Pair<TransportConfiguration, TransportConfiguration> connectorPair) { + if (isTrace) + { + log.trace("nodeAnnouncedUp:" + nodeID); + } + if (nodeID.equals(nodeUUID.toString())) { return; @@ -510,6 +574,10 @@ // if the node is more than 1 hop away, we do not create a bridge for direct cluster connection if (allowDirectConnectionsOnly && !allowableConnections.contains(connectorPair.a)) { + if (isTrace) + { + log.trace("Ignoring nodeUp message as it only allows direct connections"); + } return; } @@ -517,20 +585,32 @@ // and empty static connectors to create bridges... ulgy! if (serverLocator == null) { + if (isTrace) + { + log.trace("Ignoring nodeUp as serverLocator==null"); + } return; } /*we dont create bridges to backups*/ if(connectorPair.a == null) { + if (isTrace) + { + log.trace("Igoring nodeup as connectorPair.a==null (backup)"); + } return; } synchronized (records) { + if (isTrace) + { + log.trace("Adding record for nodeID=" + nodeID); + } try { MessageFlowRecord record = records.get(nodeID); - + if (record == null) { // New node - create a new flow record @@ -556,11 +636,10 @@ } else { - // FIXME apple and orange comparison. I don't understand it... - //if (!connectorPair.a.equals(record.getBridge().getForwardingConnection().getTransportConnection())) - // { - // // New live node - close it and recreate it - TODO - CAN THIS EVER HAPPEN? - //} + if (isTrace) + { + log.trace("It already had a node created before, ignoring the nodeUp message"); + } } } catch (Exception e) @@ -576,13 +655,32 @@ final Queue queue, final boolean start) throws Exception { - MessageFlowRecordImpl record = new MessageFlowRecordImpl(queue); + MessageFlowRecordImpl record = new MessageFlowRecordImpl(nodeID, connector, queueName, queue); - Bridge bridge = new ClusterConnectionBridge(serverLocator, + records.put(nodeID, record); + + Bridge bridge = createBridge(record); + + record.setBridge(bridge); + + if (start) + { + bridge.start(); + } + } + + /** + * @param record + * @return + * @throws Exception + */ + protected Bridge createBridge(MessageFlowRecordImpl record) throws Exception + { + ClusterConnectionBridge bridge = new ClusterConnectionBridge(serverLocator, nodeUUID, - nodeID, - queueName, - queue, + record.getNodeID(), + record.getQueueName(), + record.getQueue(), executorFactory.getExecutor(), null, null, @@ -596,16 +694,9 @@ managementService.getManagementAddress(), managementService.getManagementNotificationAddress(), record, - connector); + record.getConnector()); - record.setBridge(bridge); - - records.put(nodeID, record); - - if (start) - { - bridge.start(); - } + return bridge; } // Inner classes ----------------------------------------------------------------------------------- @@ -614,15 +705,28 @@ { private Bridge bridge; + private final String nodeID; + private final TransportConfiguration connector; + private final SimpleString queueName; private final Queue queue; private final Map<SimpleString, RemoteQueueBinding> bindings = new HashMap<SimpleString, RemoteQueueBinding>(); + + private volatile boolean isClosed = false; + private volatile boolean paused = false; + private volatile boolean firstReset = false; - public MessageFlowRecordImpl(final Queue queue) + public MessageFlowRecordImpl(final String nodeID, + final TransportConfiguration connector, + final SimpleString queueName, + final Queue queue) { this.queue = queue; + this.nodeID = nodeID; + this.connector = connector; + this.queueName = queueName; } public String getAddress() @@ -630,6 +734,38 @@ return address.toString(); } + /** + * @return the nodeID + */ + public String getNodeID() + { + return nodeID; + } + + /** + * @return the connector + */ + public TransportConfiguration getConnector() + { + return connector; + } + + /** + * @return the queueName + */ + public SimpleString getQueueName() + { + return queueName; + } + + /** + * @return the queue + */ + public Queue getQueue() + { + return queue; + } + public int getMaxHops() { return maxHops; @@ -637,17 +773,47 @@ public void close() throws Exception { + if (isTrace) + { + log.trace("Stopping bridge " + bridge); + } + + isClosed = true; + clearBindings(); + bridge.stop(); + } - clearBindings(); + public void pause() throws Exception + { + paused = true; + clearBindings(); + bridge.pause(); } + public boolean isPaused() + { + return paused; + } + + public void resume() throws Exception + { + paused = false; + bridge.resume(); + } + + public boolean isClosed() + { + return isClosed; + } + public void reset() throws Exception { clearBindings(); } - public void setBridge(final Bridge bridge) + + public void setBridge(final Bridge bridge) { this.bridge = bridge; } @@ -659,6 +825,10 @@ public synchronized void onMessage(final ClientMessage message) { + if (isTrace) + { + log.trace("Receiving message " + message); + } try { // Reset the bindings Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -17,7 +17,12 @@ import java.lang.reflect.Array; import java.net.InetAddress; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; @@ -32,7 +37,10 @@ import org.hornetq.core.client.impl.ServerLocatorInternal; import org.hornetq.core.client.impl.Topology; import org.hornetq.core.client.impl.TopologyMember; -import org.hornetq.core.config.*; +import org.hornetq.core.config.BridgeConfiguration; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.PostOffice; @@ -682,8 +690,16 @@ serverLocator.setReconnectAttempts(config.getReconnectAttempts()); serverLocator.setRetryInterval(config.getRetryInterval()); serverLocator.setRetryIntervalMultiplier(config.getRetryIntervalMultiplier()); + serverLocator.setMaxRetryInterval(config.getMaxRetryInterval()); serverLocator.setClientFailureCheckPeriod(config.getClientFailureCheckPeriod()); serverLocator.setInitialConnectAttempts(config.getReconnectAttempts()); + serverLocator.setBlockOnDurableSend(!config.isUseDuplicateDetection()); + serverLocator.setBlockOnNonDurableSend(!config.isUseDuplicateDetection()); + if (!config.isUseDuplicateDetection()) + { + log.debug("Bridge " + config.getName() + + " is configured to not use duplicate detecion, it will send messages synchronously"); + } clusterLocators.add(serverLocator); Bridge bridge = new BridgeImpl(serverLocator, nodeUUID, @@ -710,14 +726,21 @@ } } - public synchronized void destroyBridge(final String name) throws Exception + public void destroyBridge(final String name) throws Exception { - Bridge bridge = bridges.remove(name); - if (bridge != null) + Bridge bridge; + + synchronized (this) { - bridge.stop(); - managementService.unregisterBridge(name); + bridge = bridges.remove(name); + if (bridge != null) + { + bridge.stop(); + managementService.unregisterBridge(name); + } } + + bridge.flushExecutor(); } private synchronized void deployClusterConnection(final ClusterConnectionConfiguration config) throws Exception @@ -769,7 +792,12 @@ connector, new SimpleString(config.getName()), new SimpleString(config.getAddress()), + config.getClientFailureCheckPeriod(), + config.getConnectionTTL(), config.getRetryInterval(), + config.getRetryIntervalMultiplier(), + config.getMaxRetryInterval(), + config.getReconnectAttempts(), config.isDuplicateDetection(), config.isForwardWhenNoConsumers(), config.getConfirmationWindowSize(), @@ -794,7 +822,12 @@ connector, new SimpleString(config.getName()), new SimpleString(config.getAddress()), + config.getClientFailureCheckPeriod(), + config.getConnectionTTL(), config.getRetryInterval(), + config.getRetryIntervalMultiplier(), + config.getMaxRetryInterval(), + config.getReconnectAttempts(), config.isDuplicateDetection(), config.isForwardWhenNoConsumers(), config.getConfirmationWindowSize(), Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -63,13 +63,11 @@ import org.hornetq.core.paging.impl.PagingManagerImpl; import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; import org.hornetq.core.persistence.GroupingInfo; -import org.hornetq.core.persistence.OperationContext; import org.hornetq.core.persistence.QueueBindingInfo; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.persistence.config.PersistedAddressSetting; import org.hornetq.core.persistence.config.PersistedRoles; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.persistence.impl.journal.OperationContextImpl; import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.DuplicateIDCache; @@ -159,6 +157,8 @@ private final MBeanServer mbeanServer; private volatile boolean started; + + private volatile boolean stopped; private volatile SecurityStore securityStore; @@ -353,6 +353,11 @@ nodeManager.startLiveNode(); + if (stopped) + { + return; + } + initialisePart2(); log.info("Server is now live"); @@ -379,6 +384,8 @@ private class SharedStoreBackupActivation implements Activation { + + volatile boolean closed = false; public void run() { try @@ -397,6 +404,11 @@ configuration.setBackup(false); + if (stopped) + { + return; + } + initialisePart2(); clusterManager.activate(); @@ -480,6 +492,7 @@ backupActivationThread.interrupt(); + // TODO: do we really need this? Thread.sleep(1000); } @@ -536,6 +549,8 @@ public synchronized void start() throws Exception { + stopped = false; + initialiseLogging(); checkJournalDirectory(); @@ -618,6 +633,7 @@ public void stop() throws Exception { + stopped = true; stop(configuration.isFailoverOnServerShutdown()); } @@ -1463,7 +1479,13 @@ private void initialisePart2() throws Exception { // Load the journal and populate queues, transactions and caches in memory - + + + if (stopped) + { + return; + } + pagingManager.reloadStores(); JournalLoadInformation[] journalInfo = loadJournals(); Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -853,6 +853,7 @@ public synchronized void cancel(final MessageReference reference, final long timeBase) throws Exception { + deliveringCount.decrementAndGet(); if (checkRedelivery(reference, timeBase)) { if (!scheduledDeliveryHandler.checkAndSchedule(reference, false)) @@ -870,7 +871,7 @@ { if (isTrace) { - log.trace("moving expired reference " + ref + " to address = " + expiryAddress + " from queue=" + this.getName(), new Exception ("trace")); + log.trace("moving expired reference " + ref + " to address = " + expiryAddress + " from queue=" + this.getName()); } move(expiryAddress, ref, true, false); } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -88,6 +88,8 @@ // Constants ----------------------------------------------------------------------------- private static final Logger log = Logger.getLogger(ServerSessionImpl.class); + + private static final boolean isTrace = log.isTraceEnabled(); // Static ------------------------------------------------------------------------------- @@ -598,6 +600,10 @@ public void commit() throws Exception { + if (isTrace) + { + log.trace("Calling commit"); + } try { tx.commit(); @@ -1075,7 +1081,7 @@ public void send(final ServerMessage message, final boolean direct) throws Exception { long id = storageManager.generateUniqueID(); - + SimpleString address = message.getAddress(); message.setMessageID(id); @@ -1096,6 +1102,12 @@ } } + if (isTrace) + { + log.trace("send(message=" + message + ", direct=" + direct + ") being called"); + } + + if (message.getAddress().equals(managementAddress)) { // It's a management message Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -84,6 +84,8 @@ // Constants ----------------------------------------------------- private static final Logger log = Logger.getLogger(ManagementServiceImpl.class); + + private static final boolean isTrace = log.isTraceEnabled(); private final MBeanServer mbeanServer; @@ -635,6 +637,12 @@ public void sendNotification(final Notification notification) throws Exception { + if (isTrace) + { + log.trace("Sending Notification = " + notification + + ", notificationEnabled=" + notificationsEnabled + + " messagingServerControl=" + messagingServerControl, new Exception ("trace")); + } if (messagingServerControl != null && notificationsEnabled) { // This needs to be synchronized since we need to ensure notifications are processed in strict sequence Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -21,10 +21,15 @@ import junit.framework.Assert; import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientConsumer; +import org.hornetq.api.core.client.ClientMessage; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.config.BridgeConfiguration; import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -118,12 +123,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, retryIntervalMultiplier, reconnectAttempts, false, confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -260,12 +267,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, retryIntervalMultiplier, reconnectAttempts, false, confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -386,12 +395,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, retryIntervalMultiplier, reconnectAttempts, false, confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -527,12 +538,14 @@ forwardAddress, null, null, + clientFailureCheckPeriod, + HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, retryIntervalMultiplier, reconnectAttempts, false, confirmationWindowSize, - clientFailureCheckPeriod, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -661,12 +674,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, retryIntervalMultiplier, reconnectAttempts, false, confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -104,12 +104,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, 0, true, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -176,6 +178,8 @@ Bridge bridge = server0.getClusterManager().getBridges().get(bridgeName); bridge.stop(); + + bridge.flushExecutor(); for (int i = 0; i < numMessages; i++) { @@ -267,12 +271,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 500, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, true, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -478,12 +484,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, 0, false, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -629,12 +637,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, 1, true, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -706,6 +716,8 @@ BridgeStartTest.log.info("stopping bridge manually"); bridge.stop(); + + bridge.flushExecutor(); for (int i = numMessages; i < numMessages * 2; i++) { @@ -739,6 +751,8 @@ Assert.assertNull(consumer1.receiveImmediate()); bridge.stop(); + + bridge.flushExecutor(); for (int i = 0; i < numMessages; i++) { Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -139,14 +139,16 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, false, // Choose confirmation size to make sure acks // are sent numMessages * messageSize / 2, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorConfig, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -339,12 +341,14 @@ forwardAddress, filterString, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, false, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -510,12 +514,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 100, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, false, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -665,12 +671,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 100, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, true, 0, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -853,12 +861,14 @@ forwardAddress, null, SimpleTransformer.class.getName(), + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, false, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -1001,12 +1011,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, false, 0, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -1242,12 +1254,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, false, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -1385,14 +1399,16 @@ // address null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, -1, false, // Choose confirmation size to make sure acks // are sent numMessages * messageSize / 2, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -116,12 +116,14 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 1000, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 1d, 0, true, 1024, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, @@ -188,6 +190,7 @@ Bridge bridge = server0.getClusterManager().getBridges().get(bridgeName); bridge.stop(); + bridge.flushExecutor(); for (int i = 0; i < numMessages; i++) { Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -113,13 +113,15 @@ forwardAddress, null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, retryInterval, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, retryIntervalMultiplier, reconnectAttempts, false, confirmationWindowSize, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - staticConnectors, + staticConnectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD); Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -1812,6 +1812,7 @@ * we need to wait a lil while between server start up to allow the server to communicate in some order. * This is to avoid split brain on startup * */ + // TODO: Do we really need this? Thread.sleep(500); } for (int node : nodes) Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -119,7 +119,7 @@ send(0, "queues.testaddress", 10, false, null); verifyNotReceive(0); } - + public void testStopAndStartTarget() throws Exception { startServers(0, 1); @@ -150,9 +150,14 @@ stopServers(1); - OnewayTwoNodeClusterTest.log.info("restarting server 1"); + OnewayTwoNodeClusterTest.log.info("restarting server 1(" + servers[1].getIdentity() + ")"); startServers(1); + + //Thread.sleep(1000); + + log.info("Server 1 id=" + servers[1].getNodeID()); + long end = System.currentTimeMillis(); Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -140,6 +140,7 @@ staticConnectors, false); backupConfig.getClusterConfigurations().add(cccLive); backupServer = createBackupServer(); + backupServer.getServer().setIdentity("bkpIdentityServer"); liveConfig = super.createDefaultConfig(); liveConfig.getAcceptorConfigurations().clear(); Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -69,10 +69,11 @@ printBindings(2); - sendInRange(1, "queues.testaddress", 0, 10, false, null); + sendInRange(1, "queues.testaddress", 0, 10, true, null); System.out.println("stopping******************************************************"); stopServers(0); + Thread.sleep(2000); System.out.println("stopped******************************************************"); startServers(0); @@ -87,7 +88,7 @@ sendInRange(1, "queues.testaddress", 10, 20, false, null); - verifyReceiveAllInRange(10, 20, 0); + verifyReceiveAllInRange(0, 20, 0); System.out.println("*****************************************************************************"); } finally Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -166,12 +166,14 @@ targetQueueConfig.getAddress(), null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, RandomUtil.randomPositiveLong(), + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, RandomUtil.randomDouble(), RandomUtil.randomPositiveInt(), RandomUtil.randomBoolean(), RandomUtil.randomPositiveInt(), - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -144,12 +144,14 @@ targetQueueConfig.getAddress(), null, null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, RandomUtil.randomPositiveLong(), + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, RandomUtil.randomDouble(), RandomUtil.randomPositiveInt(), RandomUtil.randomBoolean(), RandomUtil.randomPositiveInt(), - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectors, false, ConfigurationImpl.DEFAULT_CLUSTER_USER, Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -87,7 +87,7 @@ { final FakeBinding fake = new FakeBinding(new SimpleString("a")); - final BindingsImpl bind = new BindingsImpl(null, null); + final BindingsImpl bind = new BindingsImpl(null, null, null); bind.addBinding(fake); bind.addBinding(new FakeBinding(new SimpleString("a"))); bind.addBinding(new FakeBinding(new SimpleString("a"))); Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java 2011-06-15 14:15:02 UTC (rev 10810) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java 2011-06-15 15:15:58 UTC (rev 10811) @@ -971,7 +971,15 @@ } // We shutdown the global pools to give a better isolation between tests - ServerLocatorImpl.clearThreadPools(); + try + { + ServerLocatorImpl.clearThreadPools(); + } + catch (Throwable e) + { + log.info(threadDump(e.getMessage())); + throw new RuntimeException (e.getMessage(), e); + } } protected byte[] autoEncode(final Object... args)

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10810 - in trunk: distribution and 8 other directories.

by do-not-reply＠jboss.org

Author: borges Date: 2011-06-15 10:15:02 -0400 (Wed, 15 Jun 2011) New Revision: 10810 Modified: trunk/distribution/pom.xml trunk/hornetq-ra/hornetq-ra-rar/pom.xml trunk/pom.xml trunk/tests/concurrent-tests/pom.xml trunk/tests/jms-tests/pom.xml trunk/tests/joram-tests/pom.xml trunk/tests/performance-tests/pom.xml trunk/tests/soak-tests/pom.xml trunk/tests/stress-tests/pom.xml trunk/tests/timing-tests/pom.xml Log: Revert changes from 10809 Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/distribution/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -16,7 +16,7 @@ <dependencies> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </dependency> <dependency> <groupId>org.jboss.naming</groupId> Modified: trunk/hornetq-ra/hornetq-ra-rar/pom.xml =================================================================== --- trunk/hornetq-ra/hornetq-ra-rar/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/hornetq-ra/hornetq-ra-rar/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -28,11 +28,11 @@ </exclusion> <exclusion> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </exclusion> <exclusion> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <artifactId>jboss-transaction-api</artifactId> </exclusion> <exclusion> <groupId>jboss.jbossts</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -148,6 +148,11 @@ <artifactId>jboss-jms-api_1.1_spec</artifactId> <version>1.0.0.Final</version> </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-transaction-api</artifactId> + <version>1.0.1.20070913080910</version> + </dependency>  <dependency> @@ -160,6 +165,11 @@ <artifactId>jboss-transaction-api_1.1_spec</artifactId> <version>1.0.0.Final</version> </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jms-api</artifactId> + <version>1.1.0.20070913080910</version> + </dependency>  <dependency> Modified: trunk/tests/concurrent-tests/pom.xml =================================================================== --- trunk/tests/concurrent-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/tests/concurrent-tests/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <artifactId>jboss-transaction-api</artifactId> </dependency>  <dependency> @@ -102,7 +102,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </dependency> </dependencies> Modified: trunk/tests/jms-tests/pom.xml =================================================================== --- trunk/tests/jms-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/tests/jms-tests/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -68,7 +68,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <artifactId>jboss-transaction-api</artifactId> </dependency>  <dependency> @@ -81,7 +81,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </dependency> </dependencies> Modified: trunk/tests/joram-tests/pom.xml =================================================================== --- trunk/tests/joram-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/tests/joram-tests/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <artifactId>jboss-transaction-api</artifactId> </dependency>  <dependency> @@ -102,7 +102,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </dependency> </dependencies> Modified: trunk/tests/performance-tests/pom.xml =================================================================== --- trunk/tests/performance-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/tests/performance-tests/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <artifactId>jboss-transaction-api</artifactId> </dependency>  <dependency> @@ -102,7 +102,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </dependency> </dependencies> Modified: trunk/tests/soak-tests/pom.xml =================================================================== --- trunk/tests/soak-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/tests/soak-tests/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -96,7 +96,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <artifactId>jboss-transaction-api</artifactId> </dependency>  <dependency> @@ -109,7 +109,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </dependency> </dependencies> Modified: trunk/tests/stress-tests/pom.xml =================================================================== --- trunk/tests/stress-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/tests/stress-tests/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -96,7 +96,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <artifactId>jboss-transaction-api</artifactId> </dependency>  <dependency> @@ -109,7 +109,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </dependency> </dependencies> Modified: trunk/tests/timing-tests/pom.xml =================================================================== --- trunk/tests/timing-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) +++ trunk/tests/timing-tests/pom.xml 2011-06-15 14:15:02 UTC (rev 10810) @@ -98,7 +98,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <artifactId>jboss-transaction-api</artifactId> </dependency>  <dependency> @@ -111,7 +111,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <artifactId>jboss-jms-api</artifactId> </dependency> </dependencies>

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10809 - in trunk: distribution and 8 other directories.

by do-not-reply＠jboss.org

Author: borges Date: 2011-06-15 06:36:52 -0400 (Wed, 15 Jun 2011) New Revision: 10809 Modified: trunk/distribution/pom.xml trunk/hornetq-ra/hornetq-ra-rar/pom.xml trunk/pom.xml trunk/tests/concurrent-tests/pom.xml trunk/tests/jms-tests/pom.xml trunk/tests/joram-tests/pom.xml trunk/tests/performance-tests/pom.xml trunk/tests/soak-tests/pom.xml trunk/tests/stress-tests/pom.xml trunk/tests/timing-tests/pom.xml Log: HORNETQ-712 Adjust all other references to jboss-jms-api and jboss-transaction-api Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/distribution/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -16,7 +16,7 @@ <dependencies> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> <dependency> <groupId>org.jboss.naming</groupId> Modified: trunk/hornetq-ra/hornetq-ra-rar/pom.xml =================================================================== --- trunk/hornetq-ra/hornetq-ra-rar/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/hornetq-ra/hornetq-ra-rar/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -28,11 +28,11 @@ </exclusion> <exclusion> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </exclusion> <exclusion> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </exclusion> <exclusion> <groupId>jboss.jbossts</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -148,11 +148,6 @@ <artifactId>jboss-jms-api_1.1_spec</artifactId> <version>1.0.0.Final</version> </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> - <version>1.0.1.20070913080910</version> - </dependency>  <dependency> @@ -165,11 +160,6 @@ <artifactId>jboss-transaction-api_1.1_spec</artifactId> <version>1.0.0.Final</version> </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> - <version>1.1.0.20070913080910</version> - </dependency>  <dependency> Modified: trunk/tests/concurrent-tests/pom.xml =================================================================== --- trunk/tests/concurrent-tests/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/tests/concurrent-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency>  <dependency> @@ -102,7 +102,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/jms-tests/pom.xml =================================================================== --- trunk/tests/jms-tests/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/tests/jms-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -68,7 +68,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency>  <dependency> @@ -81,7 +81,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/joram-tests/pom.xml =================================================================== --- trunk/tests/joram-tests/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/tests/joram-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency>  <dependency> @@ -102,7 +102,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/performance-tests/pom.xml =================================================================== --- trunk/tests/performance-tests/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/tests/performance-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency>  <dependency> @@ -102,7 +102,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/soak-tests/pom.xml =================================================================== --- trunk/tests/soak-tests/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/tests/soak-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -96,7 +96,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency>  <dependency> @@ -109,7 +109,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/stress-tests/pom.xml =================================================================== --- trunk/tests/stress-tests/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/tests/stress-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -96,7 +96,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency>  <dependency> @@ -109,7 +109,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/timing-tests/pom.xml =================================================================== --- trunk/tests/timing-tests/pom.xml 2011-06-15 10:36:07 UTC (rev 10808) +++ trunk/tests/timing-tests/pom.xml 2011-06-15 10:36:52 UTC (rev 10809) @@ -98,7 +98,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency>  <dependency> @@ -111,7 +111,7 @@ </dependency> <dependency> <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies>

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10808 - trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal.

by do-not-reply＠jboss.org

Author: borges Date: 2011-06-15 06:36:07 -0400 (Wed, 15 Jun 2011) New Revision: 10808 Modified: trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java Log: Fix constant reference. Modified: trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java =================================================================== --- trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java 2011-06-15 10:35:35 UTC (rev 10807) +++ trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java 2011-06-15 10:36:07 UTC (rev 10808) @@ -15,9 +15,9 @@ import java.io.File; -import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.journal.impl.AIOSequentialFileFactory; +import org.hornetq.core.journal.impl.JournalConstants; /** * A NIOAllPossibilitiesCompactStressTest @@ -29,23 +29,6 @@ public class AIOAllPossibilitiesCompactStressTest extends AllPossibilitiesCompactStressTest { - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- @Override protected SequentialFileFactory getFileFactory() throws Exception { @@ -56,10 +39,8 @@ file.mkdir(); return new AIOSequentialFileFactory(getTestDir(), - ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_AIO, + JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO, 1000000, false); } - - }

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10807 - trunk/etc.

by do-not-reply＠jboss.org

Author: borges Date: 2011-06-15 06:35:35 -0400 (Wed, 15 Jun 2011) New Revision: 10807 Modified: trunk/etc/org.eclipse.jdt.ui.prefs Log: Remove unmanageable XML blob (that had been causing all sorts of trouble) Modified: trunk/etc/org.eclipse.jdt.ui.prefs =================================================================== --- trunk/etc/org.eclipse.jdt.ui.prefs 2011-06-15 10:29:45 UTC (rev 10806) +++ trunk/etc/org.eclipse.jdt.ui.prefs 2011-06-15 10:35:35 UTC (rev 10807) @@ -1,4 +1,4 @@ -#Thu May 26 18:07:06 CEST 2011 +#Wed Jun 15 11:33:43 CEST 2011 cleanup.add_default_serial_version_id=false cleanup.add_generated_serial_version_id=true cleanup.add_missing_annotations=true @@ -53,7 +53,7 @@ cleanup_settings_version=2 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_'JBM' +formatter_profile=_HornetQ formatter_settings_version=11 org.eclipse.jdt.ui.exception.name=e org.eclipse.jdt.ui.gettersetter.use.is=true @@ -64,7 +64,6 @@ org.eclipse.jdt.ui.ondemandthreshold=9999 org.eclipse.jdt.ui.overrideannotation=true org.eclipse.jdt.ui.staticondemandthreshold=9999 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecommen! t_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * A ${type_name}\n *\n * @author ${user}\n *\n * ${tags}\n *\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="ove! rridecomment_context" deleted\="false" description\="Comment f! or overr iding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * Copyright 2010 Red Hat, Inc.\n * Red Hat licenses this file to you under the Apache License, version\n * 2.0 (the "License"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n * http\://www.apache.org/licenses/LICENSE-2.0\n * Unless required by applicable law or agreed to in! writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n * implied. See the License for the specific language governing\n * permissions and limitations under the License.\n */\n\n${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="false" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n // Constants -----------------------------------------------------\n\n // Attributes ----------------------------------------------------\n\n // Static --------------------------------------------------------\n\n // Constructors --------------------------------------------------\n\n // Public --------------------------------------------------------\n\n // Package protected ------------------! ---------------------------\n\n // Protected ---------------! -------- ------------------------------\n\n // Private -------------------------------------------------------\n\n // Inner classes -------------------------------------------------\n\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new c! atch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};! </template><template autoinsert\="true" context\="setterbody_c! ontext" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10806 - in trunk: hornetq-bootstrap and 13 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-06-15 06:29:45 -0400 (Wed, 15 Jun 2011) New Revision: 10806 Added: trunk/hornetq-journal/hornetq-journal.iml Modified: trunk/hornetq-bootstrap/hornetq-bootstrap.iml trunk/hornetq-commons/hornetq-commons.iml trunk/hornetq-core-client/hornetq-core-client.iml trunk/hornetq-core/hornetq-core.iml trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml trunk/hornetq-jms-client/hornetq-jms-client.iml trunk/hornetq-jms/hornetq-jms.iml trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml trunk/hornetq-rest/hornetq-rest-all.iml trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml trunk/hornetq-service-sar/hornetq-service-sar.iml trunk/hornetq-spring-integration/hornetq-spring-integration.iml trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml trunk/hornetq.ipr trunk/hornetq.iws Log: intellij proj update Modified: trunk/hornetq-bootstrap/hornetq-bootstrap.iml =================================================================== --- trunk/hornetq-bootstrap/hornetq-bootstrap.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-bootstrap/hornetq-bootstrap.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -12,7 +12,10 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-core" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" /> <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" /> <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" /> Modified: trunk/hornetq-commons/hornetq-commons.iml =================================================================== --- trunk/hornetq-commons/hornetq-commons.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-commons/hornetq-commons.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -3,15 +3,17 @@ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="hornetq-core" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> - <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.2" level="project" /> </component> </module> Modified: trunk/hornetq-core/hornetq-core.iml =================================================================== --- trunk/hornetq-core/hornetq-core.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-core/hornetq-core.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -7,13 +7,13 @@ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/javacc" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/target/apidocs" /> - <excludeFolder url="file://$MODULE_DIR$/target/classes" /> - <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> </component> </module> Modified: trunk/hornetq-core-client/hornetq-core-client.iml =================================================================== --- trunk/hornetq-core-client/hornetq-core-client.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-core-client/hornetq-core-client.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -9,7 +9,10 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-core" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> </component> </module> Modified: trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml =================================================================== --- trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -10,14 +10,18 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-core" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" /> <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" /> <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" /> <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.20070913080910" level="project" /> <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" /> </component> </module> Modified: trunk/hornetq-jms/hornetq-jms.iml =================================================================== --- trunk/hornetq-jms/hornetq-jms.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-jms/hornetq-jms.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -11,9 +11,12 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-core" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" /> <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" /> </component> </module> Modified: trunk/hornetq-jms-client/hornetq-jms-client.iml =================================================================== --- trunk/hornetq-jms-client/hornetq-jms-client.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-jms-client/hornetq-jms-client.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -10,9 +10,12 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-jms" /> <orderEntry type="module" module-name="hornetq-core" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" /> <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" /> </component> </module> Added: trunk/hornetq-journal/hornetq-journal.iml =================================================================== --- trunk/hornetq-journal/hornetq-journal.iml (rev 0) +++ trunk/hornetq-journal/hornetq-journal.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="module" module-name="hornetq-commons" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + </component> +</module> + Modified: trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml =================================================================== --- trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -10,10 +10,13 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-core" scope="PROVIDED" /> + <orderEntry type="module" module-name="hornetq-commons" scope="PROVIDED" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" scope="PROVIDED" /> <orderEntry type="module" module-name="hornetq-jms" scope="PROVIDED" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" /> Modified: trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml =================================================================== --- trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -12,7 +12,12 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.hornetq:hornetq-core:2.2.3-SNAPSHOT" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.hornetq:hornetq-jms:2.2.3-SNAPSHOT" level="project" /> + <orderEntry type="module" module-name="hornetq-core" scope="PROVIDED" /> + <orderEntry type="module" module-name="hornetq-commons" scope="PROVIDED" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" scope="PROVIDED" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:resteasy-jaxrs:2.1.0.GA" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:jaxrs-api:2.1.0.GA" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.scannotation:scannotation:1.0.2" level="project" /> @@ -29,11 +34,10 @@ <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.6.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.6.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-xc:1.6.3" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.hornetq:hornetq-jms:2.2.3-SNAPSHOT" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" /> + <orderEntry type="module" module-name="hornetq-jms" scope="PROVIDED" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Beta1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Beta1" level="project" /> <orderEntry type="library" name="Maven: junit:junit:4.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.jboss.resteasy:tjws:2.1.0.GA" level="project" /> Modified: trunk/hornetq-rest/hornetq-rest-all.iml =================================================================== --- trunk/hornetq-rest/hornetq-rest-all.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-rest/hornetq-rest-all.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <exclude-output /> Modified: trunk/hornetq-service-sar/hornetq-service-sar.iml =================================================================== --- trunk/hornetq-service-sar/hornetq-service-sar.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-service-sar/hornetq-service-sar.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -10,10 +10,13 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-core" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> <orderEntry type="module" module-name="hornetq-jms" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" /> <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" /> <orderEntry type="module" module-name="hornetq-jboss-as-integration" /> <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" /> @@ -22,6 +25,7 @@ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" /> <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" /> <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.20070913080910" level="project" /> </component> </module> Modified: trunk/hornetq-spring-integration/hornetq-spring-integration.iml =================================================================== --- trunk/hornetq-spring-integration/hornetq-spring-integration.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-spring-integration/hornetq-spring-integration.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -10,10 +10,13 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-core" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> <orderEntry type="module" module-name="hornetq-jms" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" /> <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" /> Modified: trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml =================================================================== --- trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml 2011-06-15 10:29:45 UTC (rev 10806) @@ -10,7 +10,10 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq-core" /> + <orderEntry type="module" module-name="hornetq-commons" /> <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" /> + <orderEntry type="module" module-name="hornetq-journal" /> <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" /> </component> </module> Modified: trunk/hornetq.ipr =================================================================== --- trunk/hornetq.ipr 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq.ipr 2011-06-15 10:29:45 UTC (rev 10806) @@ -392,6 +392,7 @@ <module fileurl="file://$PROJECT_DIR$/hornetq.iml" filepath="$PROJECT_DIR$/hornetq.iml" /> <module fileurl="file://$PROJECT_DIR$/distribution/hornetq/hornetq (1).iml" filepath="$PROJECT_DIR$/distribution/hornetq/hornetq (1).iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-bootstrap/hornetq-bootstrap.iml" filepath="$PROJECT_DIR$/hornetq-bootstrap/hornetq-bootstrap.iml" /> + <module fileurl="file://$PROJECT_DIR$/hornetq-commons/hornetq-commons.iml" filepath="$PROJECT_DIR$/hornetq-commons/hornetq-commons.iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-core/hornetq-core.iml" filepath="$PROJECT_DIR$/hornetq-core/hornetq-core.iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-core-client/hornetq-core-client.iml" filepath="$PROJECT_DIR$/hornetq-core-client/hornetq-core-client.iml" /> <module fileurl="file://$PROJECT_DIR$/distribution/hornetq-distribution.iml" filepath="$PROJECT_DIR$/distribution/hornetq-distribution.iml" /> @@ -400,7 +401,7 @@ <module fileurl="file://$PROJECT_DIR$/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml" filepath="$PROJECT_DIR$/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-jms/hornetq-jms.iml" filepath="$PROJECT_DIR$/hornetq-jms/hornetq-jms.iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-jms-client/hornetq-jms-client.iml" filepath="$PROJECT_DIR$/hornetq-jms-client/hornetq-jms-client.iml" /> - <module fileurl="file://$PROJECT_DIR$/hornetq-logging/hornetq-logging.iml" filepath="$PROJECT_DIR$/hornetq-logging/hornetq-logging.iml" /> + <module fileurl="file://$PROJECT_DIR$/hornetq-journal/hornetq-journal.iml" filepath="$PROJECT_DIR$/hornetq-journal/hornetq-journal.iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml" filepath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml" filepath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-ra/hornetq-rar-pom.iml" filepath="$PROJECT_DIR$/hornetq-ra/hornetq-rar-pom.iml" /> @@ -411,7 +412,6 @@ <module fileurl="file://$PROJECT_DIR$/tests/hornetq-tests-pom.iml" filepath="$PROJECT_DIR$/tests/hornetq-tests-pom.iml" /> <module fileurl="file://$PROJECT_DIR$/hornetq-twitter-integration/hornetq-twitter-integration.iml" filepath="$PROJECT_DIR$/hornetq-twitter-integration/hornetq-twitter-integration.iml" /> <module fileurl="file://$PROJECT_DIR$/tests/integration-tests/integration-tests.iml" filepath="$PROJECT_DIR$/tests/integration-tests/integration-tests.iml" /> - <module fileurl="file://$PROJECT_DIR$/distribution/jboss-mc/jboss-mc.iml" filepath="$PROJECT_DIR$/distribution/jboss-mc/jboss-mc.iml" /> <module fileurl="file://$PROJECT_DIR$/tests/jms-tests/jms-tests.iml" filepath="$PROJECT_DIR$/tests/jms-tests/jms-tests.iml" /> <module fileurl="file://$PROJECT_DIR$/distribution/jnp-client/jnp-client.iml" filepath="$PROJECT_DIR$/distribution/jnp-client/jnp-client.iml" /> <module fileurl="file://$PROJECT_DIR$/tests/joram-tests/joram-tests.iml" filepath="$PROJECT_DIR$/tests/joram-tests/joram-tests.iml" /> @@ -693,6 +693,17 @@ <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> </SOURCES> </library> + <library name="Maven: log4j:log4j:1.2.16"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar!/" /> + </SOURCES> + </library> <library name="Maven: net.jcip:jcip-annotations:1.0"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar!/" /> @@ -792,6 +803,17 @@ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA-sources.jar!/" /> </SOURCES> </library> + <library name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.20070913080910"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910-sources.jar!/" /> + </SOURCES> + </library> <library name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar!/" /> @@ -946,6 +968,28 @@ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Beta1/jboss-jms-api_1.1_spec-1.0.0.Beta1-sources.jar!/" /> </SOURCES> </library> + <library name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final-sources.jar!/" /> + </SOURCES> + </library> <library name="Maven: org.jboss:jboss-common-core:2.2.14.GA"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar!/" /> Modified: trunk/hornetq.iws =================================================================== --- trunk/hornetq.iws 2011-06-15 10:28:04 UTC (rev 10805) +++ trunk/hornetq.iws 2011-06-15 10:29:45 UTC (rev 10806) @@ -1,29 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment=""> + <list readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment="" /> + <list default="true" id="79260711-ec34-4afa-9678-e2f3090f876b" name="intellij" comment=""> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/hornetq-journal/hornetq-journal.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-bootstrap/hornetq-bootstrap.iml" afterPath="$PROJECT_DIR$/hornetq-bootstrap/hornetq-bootstrap.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-bootstrap/pom.xml" afterPath="$PROJECT_DIR$/hornetq-bootstrap/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-core-client/pom.xml" afterPath="$PROJECT_DIR$/hornetq-core-client/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-core/pom.xml" afterPath="$PROJECT_DIR$/hornetq-core/pom.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-commons/hornetq-commons.iml" afterPath="$PROJECT_DIR$/hornetq-commons/hornetq-commons.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-core-client/hornetq-core-client.iml" afterPath="$PROJECT_DIR$/hornetq-core-client/hornetq-core-client.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-core/hornetq-core.iml" afterPath="$PROJECT_DIR$/hornetq-core/hornetq-core.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml" afterPath="$PROJECT_DIR$/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml" afterPath="$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jms-client/pom.xml" afterPath="$PROJECT_DIR$/hornetq-jms-client/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jms/pom.xml" afterPath="$PROJECT_DIR$/hornetq-jms/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-logging/pom.xml" afterPath="$PROJECT_DIR$/hornetq-logging/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-rar-pom.iml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-rar-pom.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/pom.xml" afterPath="$PROJECT_DIR$/hornetq-ra/pom.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jms-client/hornetq-jms-client.iml" afterPath="$PROJECT_DIR$/hornetq-jms-client/hornetq-jms-client.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jms/hornetq-jms.iml" afterPath="$PROJECT_DIR$/hornetq-jms/hornetq-jms.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-rest/hornetq-rest-all.iml" afterPath="$PROJECT_DIR$/hornetq-rest/hornetq-rest-all.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-rest/hornetq-rest/hornetq-rest.iml" afterPath="$PROJECT_DIR$/hornetq-rest/hornetq-rest/hornetq-rest.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-service-sar/pom.xml" afterPath="$PROJECT_DIR$/hornetq-service-sar/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-spring-integration/pom.xml" afterPath="$PROJECT_DIR$/hornetq-spring-integration/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-twitter-integration/pom.xml" afterPath="$PROJECT_DIR$/hornetq-twitter-integration/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iml" afterPath="$PROJECT_DIR$/hornetq.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-service-sar/hornetq-service-sar.iml" afterPath="$PROJECT_DIR$/hornetq-service-sar/hornetq-service-sar.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-spring-integration/hornetq-spring-integration.iml" afterPath="$PROJECT_DIR$/hornetq-spring-integration/hornetq-spring-integration.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-twitter-integration/hornetq-twitter-integration.iml" afterPath="$PROJECT_DIR$/hornetq-twitter-integration/hornetq-twitter-integration.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.ipr" afterPath="$PROJECT_DIR$/hornetq.ipr" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> </list> <ignored path=".idea/workspace.xml" /> <ignored path="$USER_HOME_GRAILS$/" /> @@ -46,7 +41,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <breakpoint url="file://$PROJECT_DIR$/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java" line="15" class="Class at JMSClusteredTestBase.java:15" package=""> + <breakpoint url="file://$PROJECT_DIR$/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java" line="15" class="JMSClusteredTestBase.java" package=""> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -101,54 +96,54 @@ <component name="FileEditorManager"> <leaf> <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/hornetq-bootstrap/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-ra/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="19" selection-start="1177" selection-end="1177" vertical-scroll-proportion="0.0"> + <state line="18" column="12" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/jnp-client/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="0" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.0"> + <state line="81" column="30" selection-start="2841" selection-end="2841" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml"> + <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/distribution/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="0" selection-start="1181" selection-end="1181" vertical-scroll-proportion="0.0"> + <state line="32" column="22" selection-start="1014" selection-end="1014" vertical-scroll-proportion="1.0105263"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml"> + <file leaf-file-name="dep.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="24" selection-start="2411" selection-end="2411" vertical-scroll-proportion="0.0"> + <state line="225" column="51" selection-start="9010" selection-end="9010" vertical-scroll-proportion="-17.8"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/hornetq-ra/pom.xml"> + <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/distribution/jboss-mc/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="18" column="12" selection-start="423" selection-end="423" vertical-scroll-proportion="0.35620052"> + <state line="11" column="15" selection-start="421" selection-end="429" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/hornetq-service-sar/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="0" selection-start="1172" selection-end="1172" vertical-scroll-proportion="0.0"> + <state line="13" column="5" selection-start="642" selection-end="643" vertical-scroll-proportion="-0.6"> <folding /> </state> </provider> @@ -157,7 +152,7 @@ <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/hornetq-spring-integration/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="18" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.0"> + <state line="55" column="18" selection-start="2092" selection-end="2092" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> @@ -166,7 +161,7 @@ <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/hornetq-twitter-integration/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="25" column="19" selection-start="930" selection-end="930" vertical-scroll-proportion="0.0"> + <state line="25" column="19" selection-start="896" selection-end="896" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> @@ -175,7 +170,7 @@ <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="477" column="51" selection-start="17347" selection-end="17347" vertical-scroll-proportion="0.0"> + <state line="477" column="51" selection-start="17291" selection-end="17291" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> @@ -203,9 +198,6 @@ <component name="IdeDocumentHistory"> <option name="changedFiles"> <list> - <option value="$PROJECT_DIR$/docs/pom.xml" /> - <option value="$PROJECT_DIR$/distribution/pom.xml" /> - <option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/hornetq-core-client/pom.xml" /> <option value="$PROJECT_DIR$/hornetq-jms-client/pom.xml" /> <option value="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml" /> @@ -219,6 +211,9 @@ <option value="$PROJECT_DIR$/hornetq-bootstrap/pom.xml" /> <option value="$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml" /> <option value="$PROJECT_DIR$/hornetq-ra/pom.xml" /> + <option value="$PROJECT_DIR$/distribution/microcontainer/pom.xml" /> + <option value="$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml" /> + <option value="$PROJECT_DIR$/distribution/pom.xml" /> </list> </option> </component> @@ -1165,8 +1160,6 @@ <sortByType /> </navigator> <panes> - <pane id="Scope" /> - <pane id="Favorites" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -1174,6 +1167,10 @@ <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1181,7 +1178,15 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq2" /> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1191,13 +1196,25 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq2" /> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-ra" /> + <option name="myItemId" value="org" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1205,36 +1222,320 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq2" /> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-ra" /> + <option name="myItemId" value="org" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-ra-rar" /> + <option name="myItemId" value="jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="kernel" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="kernel" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="plugins" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="kernel" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="plugins" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="bootstrap" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="kernel" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="plugins" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="bootstrap" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="basic" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="distribution" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="distribution" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jnp-client" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="distribution" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-mc" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="distribution" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-mc" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="target" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="distribution" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="distribution" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="distribution" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="assembly" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </pane> <pane id="PackagesPane" /> + <pane id="Favorites" /> + <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1" value="287" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="225" /> <property name="project.structure.last.edited" value="Modules" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="225" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3" value="35" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="247" /> + <property name="project.structure.proportion" value="0.15" /> <property name="OverrideImplement.combined" value="true" /> - <property name="project.structure.proportion" value="0.15" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="247" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1" value="1" /> <property name="options.splitter.main.proportions" value="0.3" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1" value="1" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder0" value="0" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3" value="3" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3" value="3" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder2" value="2" /> <property name="recentsLimit" value="5" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2" value="200" /> @@ -1256,12 +1557,12 @@ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3" value="3" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4" value="4" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1" value="1" /> + <property name="project.structure.side.proportion" value="0.2" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder2" value="2" /> - <property name="project.structure.side.proportion" value="0.2" /> + <property name="MemberChooser.copyJavadoc" value="false" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder0" value="0" /> - <property name="MemberChooser.copyJavadoc" value="false" /> + <property name="dynamic.classpath" value="false" /> <property name="options.searchVisible" value="true" /> - <property name="dynamic.classpath" value="false" /> </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> @@ -1269,11 +1570,11 @@ <recent name="org.hornetq.jms.example" /> </key> <key name="CopyFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/distribution/microcontainer" /> <recent name="$PROJECT_DIR$/docs/rest-manual/en" /> <recent name="$PROJECT_DIR$/docs" /> <recent name="$PROJECT_DIR$/distribution/hornetq" /> <recent name="$PROJECT_DIR$/examples/src/main/assembly" /> - <recent name="$PROJECT_DIR$/tests/performance-tests" /> </key> <key name="MoveMembersDialog.RECENTS_KEY"> <recent name="org.hornetq.api.core.client.HornetQClient" /> @@ -1432,14 +1733,14 @@ <MavenGeneralSettings> <option name="checksumPolicy" value="FAIL" /> <option name="failureBehavior" value="FAST" /> + <option name="localRepository" value="" /> <option name="mavenHome" value="" /> - <option name="mavenSettingsFile" value="" /> <option name="nonRecursive" value="false" /> - <option name="overriddenLocalRepository" value="" /> <option name="pluginUpdatePolicy" value="DO_NOT_UPDATE" /> <option name="printErrorStackTraces" value="false" /> <option name="snapshotUpdatePolicy" value="ALWAYS_UPDATE" /> <option name="usePluginRegistry" value="false" /> + <option name="userSettingsFile" value="" /> <option name="workOffline" value="false" /> </MavenGeneralSettings> </option> @@ -1473,14 +1774,6 @@ <option name="Maven.BeforeRunTask" enabled="false" /> </method> </configuration> - <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit"> - <method> - <option name="AntTarget" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="Maven.BeforeRunTask" enabled="false" /> - <option name="ValidateXdebugSetup" enabled="true" /> - </method> - </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1493,14 +1786,6 @@ <option name="Maven.BeforeRunTask" enabled="false" /> </method> </configuration> - <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" adl_options="" air_descriptor_path="" air_program_params="" air_publisher_id="" air_root_dir_path="" air_run_mode="AppDescriptor" browser_family="FIREFOX" class_name="" debugger_sdk="Module SDK" html_or_swf_file_path="" launcher_type="OSDefault" main_class_name="" method_name="" module_name="" output_log_level="" package_name="" player_path="/usr/bin/flashplayer" port="0" run_mode="HtmlOrSwfFile" run_trusted="false" scope="Class" socket_policy_port="0" url_to_launch="http://"> - <method> - <option name="AntTarget" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="Make" enabled="true" /> - <option name="Maven.BeforeRunTask" enabled="false" /> - </method> - </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -1539,18 +1824,6 @@ <option name="Maven.BeforeRunTask" enabled="false" /> </method> </configuration> - <configuration default="true" type="PhpUnitRemoteRunConfigurationType" factoryName="PHPUnit on Server"> - <method> - <option name="AntTarget" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="FtpUpload" enabled="false"> - <server_id /> - <server_name /> - </option> - <option name="Maven.BeforeRunTask" enabled="false" /> - <option name="ValidateXdebugSetup" enabled="true" /> - </method> - </configuration> <configuration default="true" type="JUnit" factoryName="JUnit"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma" /> <module name="" /> @@ -1748,6 +2021,8 @@ <component name="SvnConfiguration" maxAnnotateRevisions="500"> <option name="USER" value="" /> <option name="PASSWORD" value="" /> + <option name="mySSHConnectionTimeout" value="30000" /> + <option name="mySSHReadTimeout" value="30000" /> <option name="LAST_MERGED_REVISION" /> <option name="MERGE_DRY_RUN" value="false" /> <option name="MERGE_DIFF_USE_ANCESTRY" value="true" /> @@ -1816,30 +2091,30 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="24" width="1920" height="1152" extended-state="0" /> + <frame x="0" y="25" width="1920" height="1150" extended-state="0" /> <editor active="false" /> <layout> - <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1958042" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22398414" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.48007968" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16749257" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.12687312" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24959914" sideWeight="0.7006937" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.09816613" sideWeight="0.8041958" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.0993022" sideWeight="0.5199203" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24217907" sideWeight="0.8041958" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24208266" sideWeight="0.5199203" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16749257" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23609756" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.12687312" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22200198" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="IntelliHeap" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22398414" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> @@ -1847,6 +2122,15 @@ <component name="VcsManagerConfiguration"> <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> + <option name="CHECK_NEW_TODO" value="true" /> + <option name="myTodoPanelSettings"> + <value> + <are-packages-shown value="false" /> + <are-modules-shown value="false" /> + <flatten-packages value="false" /> + <is-autoscroll-to-source value="false" /> + </value> + </option> <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" /> <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" /> <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" /> @@ -1858,8 +2142,9 @@ <option name="CHANGED_ON_SERVER_INTERVAL" value="60" /> <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" /> <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> + <option name="DEFAULT_PATCH_EXTENSION" value="patch" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="tidied up poms" /> + <option name="LAST_COMMIT_MESSAGE" value="fixed release by adding mc deps jar" /> <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" /> @@ -1872,7 +2157,6 @@ <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> - <MESSAGE value="intellij project files
" /> <MESSAGE value="moved examples back
" /> <MESSAGE value="cleaned up examples build" /> <MESSAGE value="added dependency for jnpserver and jms api" /> @@ -1897,6 +2181,7 @@ <MESSAGE value="dont deploy tests and docs and distribution" /> <MESSAGE value="added correct snapshot repos" /> <MESSAGE value="tidied up poms" /> + <MESSAGE value="fixed release by adding mc deps jar" /> </component> <component name="XDebuggerManager"> <breakpoint-manager /> @@ -1974,92 +2259,112 @@ </buildFile> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/distribution/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-bootstrap/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="3" selection-start="1401" selection-end="1401" vertical-scroll-proportion="0.0" /> + <state line="32" column="19" selection-start="1143" selection-end="1143" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/concurrent-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="132" column="14" selection-start="4661" selection-end="4661" vertical-scroll-proportion="0.0" /> + <state line="42" column="0" selection-start="1474" selection-end="1474" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-core-client/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="10" selection-start="767" selection-end="767" vertical-scroll-proportion="0.0" /> + <state line="33" column="0" selection-start="1166" selection-end="1166" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-jms-client/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="10" selection-start="763" selection-end="763" vertical-scroll-proportion="0.0" /> + <state line="63" column="24" selection-start="2396" selection-end="2396" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-jms/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-service-sar/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="19" selection-start="968" selection-end="968" vertical-scroll-proportion="0.0" /> + <state line="32" column="0" selection-start="1138" selection-end="1138" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-logging/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-spring-integration/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="25" column="0" selection-start="841" selection-end="841" vertical-scroll-proportion="0.0" /> + <state line="55" column="18" selection-start="2092" selection-end="2092" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-twitter-integration/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="0" selection-start="1181" selection-end="1181" vertical-scroll-proportion="0.0" /> + <state line="25" column="19" selection-start="896" selection-end="896" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-service-sar/pom.xml"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="0" selection-start="1172" selection-end="1172" vertical-scroll-proportion="0.0" /> + <state line="477" column="51" selection-start="17291" selection-end="17291" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-spring-integration/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="18" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.0" /> + <state line="8" column="43" selection-start="248" selection-end="394" vertical-scroll-proportion="0.0" /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-twitter-integration/pom.xml"> + <entry file="jar://$MAVEN_REPOSITORY$/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA.jar!/org/jboss/kernel/plugins/bootstrap/basic/BasicBootstrap.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="25" column="19" selection-start="930" selection-end="930" vertical-scroll-proportion="0.0" /> + <state line="10" column="157" selection-start="421" selection-end="421" vertical-scroll-proportion="0.26642984"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-ra/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="477" column="51" selection-start="17347" selection-end="17347" vertical-scroll-proportion="0.0"> + <state line="18" column="12" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-core/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/jnp-client/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="8" column="43" selection-start="248" selection-end="394" vertical-scroll-proportion="0.0"> + <state line="81" column="30" selection-start="2841" selection-end="2841" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-bootstrap/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="19" selection-start="1177" selection-end="1177" vertical-scroll-proportion="0.0"> + <state line="13" column="5" selection-start="642" selection-end="643" vertical-scroll-proportion="-0.6"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/jboss-mc/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="0" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.0"> + <state line="11" column="15" selection-start="421" selection-end="429" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="24" selection-start="2411" selection-end="2411" vertical-scroll-proportion="0.0" /> + <state line="225" column="51" selection-start="9010" selection-end="9010" vertical-scroll-proportion="-17.8"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-ra/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="18" column="12" selection-start="423" selection-end="423" vertical-scroll-proportion="0.35620052"> + <state line="32" column="22" selection-start="1014" selection-end="1014" vertical-scroll-proportion="1.0105263"> <folding /> </state> </provider>

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10805 - in trunk/distribution: hornetq/src/main/assembly and 1 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-06-15 06:28:04 -0400 (Wed, 15 Jun 2011) New Revision: 10805 Added: trunk/distribution/jboss-mc/ trunk/distribution/jboss-mc/pom.xml Modified: trunk/distribution/hornetq/src/main/assembly/dep.xml trunk/distribution/pom.xml Log: fixed release by adding mc deps jar Modified: trunk/distribution/hornetq/src/main/assembly/dep.xml =================================================================== --- trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-06-15 02:08:33 UTC (rev 10804) +++ trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-06-15 10:28:04 UTC (rev 10805) @@ -235,6 +235,18 @@ <moduleSet> <useAllReactorProjects>true</useAllReactorProjects> <includes> + <include>org.hornetq:jboss-mc</include> + </includes> + <binaries> + <includeDependencies>false</includeDependencies> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + </binaries> + </moduleSet> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> <include>org.hornetq:hornetq-examples</include> </includes> <sources> <includeModuleDirectory>false</includeModuleDirectory> Added: trunk/distribution/jboss-mc/pom.xml =================================================================== --- trunk/distribution/jboss-mc/pom.xml (rev 0) +++ trunk/distribution/jboss-mc/pom.xml 2011-06-15 10:28:04 UTC (rev 10805) @@ -0,0 +1,111 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + + <parent> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-distribution</artifactId> + <version>2.2.3-SNAPSHOT</version> + </parent> + + <artifactId>jboss-mc</artifactId> + <packaging>jar</packaging> + <name>JBoss Microcontainer jar</name> + + <dependencies> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-mdr</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <filters> + <filter> + <artifact>org.jboss.logging:jboss-logging-spi</artifact> + </filter> + <filter> + <artifact>org.jboss.microcontainer:jboss-kernel</artifact> + </filter> + <filter> + <artifact>org.jboss.microcontainer:jboss-dependency</artifact> + </filter> + <filter> + <artifact>org.jboss:jboss-reflect</artifact> + </filter> + <filter> + <artifact>org.jboss:jboss-common-core</artifact> + </filter> + <filter> + <artifact>org.jboss:jboss-mdr</artifact> + </filter> + <filter> + <artifact>org.jboss:jbossxb</artifact> + </filter> + <filter> + <artifact>sun-jaxb:jaxb-api</artifact> + </filter> + </filters> + </configuration> + </execution> + + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> + +</project> Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2011-06-15 02:08:33 UTC (rev 10804) +++ trunk/distribution/pom.xml 2011-06-15 10:28:04 UTC (rev 10805) @@ -30,6 +30,7 @@ <modules> <module>jnp-client</module> + <module>jboss-mc</module> <module>hornetq</module> </modules>

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10804 - branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/deployers/impl.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-06-14 22:08:33 -0400 (Tue, 14 Jun 2011) New Revision: 10804 Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java Log: fixing test Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2011-06-15 01:22:16 UTC (rev 10803) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2011-06-15 02:08:33 UTC (rev 10804) @@ -1021,7 +1021,7 @@ long maxRetryInterval = XMLConfigurationUtil.getLong(e, "max-retry-interval", ConfigurationImpl.DEFAULT_CLUSTER_MAX_RETRY_INTERVAL, Validators.GT_ZERO); - int reconnectAttempts = XMLConfigurationUtil.getInteger(e, "reconnect-attempts", ConfigurationImpl.DEFAULT_CLUSTER_RECONNECT_ATTEMPTS, Validators.GT_ZERO); + int reconnectAttempts = XMLConfigurationUtil.getInteger(e, "reconnect-attempts", ConfigurationImpl.DEFAULT_CLUSTER_RECONNECT_ATTEMPTS, Validators.MINUS_ONE_OR_GE_ZERO); int confirmationWindowSize = XMLConfigurationUtil.getInteger(e,

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10803 - in branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-06-14 21:22:16 -0400 (Tue, 14 Jun 2011) New Revision: 10803 Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java Log: Fixing tests Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2011-06-14 15:05:40 UTC (rev 10802) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2011-06-15 01:22:16 UTC (rev 10803) @@ -241,6 +241,7 @@ try { bridge.stop(); + bridge.flushExecutor(); } finally { Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-06-14 15:05:40 UTC (rev 10802) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-06-15 01:22:16 UTC (rev 10803) @@ -23,10 +23,10 @@ import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession.BindingQuery; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.client.ClientSession.BindingQuery; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.client.impl.ServerLocatorInternal; @@ -242,35 +242,8 @@ public void stop() throws Exception { + log.debug("Bridge " + this.name + " being stopped"); - // TODO: Remove this during merge: - // If we close the csf, at the same time we could have the bridge calling close and proper cancellations (not just reseting as we used to do) - // we could have either Dead locks or very slow shutdowns on the testsuite. - // The solution I could find so far was to just leave the csf on - - // TODO: Need to find a better way to close the CSF - - -// if (started) -// { -// executor.execute(new Runnable() -// { -// public void run() -// { -// // We need to stop the csf here otherwise the stop runnable never runs since the createobjectsrunnable is -// // trying to connect to the target -// // server which isn't up in an infinite loop -// if (csf != null) -// { -// csf.close(); -// csf = null; -// } -// } -// }); -// } -// - log.info("Bridge " + this.name + " being stopped"); - stopping = true; executor.execute(new StopRunnable()); @@ -757,7 +730,6 @@ private class StopRunnable implements Runnable { - Exception created = new Exception ("Stop bridge called at for session = " + session); public void run() { try @@ -768,11 +740,10 @@ // TODO: Why closing the CSF will make a few clustering and failover tests to // either deadlock or take forever on waiting // locks - //csf.close(); + csf.close(); csf = null; if (session != null) { - log.info("Stopping bridge called at ", created); log.info("Cleaning up session " + session); session.close(); session.removeFailureListener(BridgeImpl.this); Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-06-14 15:05:40 UTC (rev 10802) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-06-15 01:22:16 UTC (rev 10803) @@ -726,14 +726,21 @@ } } - public synchronized void destroyBridge(final String name) throws Exception + public void destroyBridge(final String name) throws Exception { - Bridge bridge = bridges.remove(name); - if (bridge != null) + Bridge bridge; + + synchronized (this) { - bridge.stop(); - managementService.unregisterBridge(name); + bridge = bridges.remove(name); + if (bridge != null) + { + bridge.stop(); + managementService.unregisterBridge(name); + } } + + bridge.flushExecutor(); } private synchronized void deployClusterConnection(final ClusterConnectionConfiguration config) throws Exception

14 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r10802 - in branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq: core/client/impl and 2 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-06-14 11:05:40 -0400 (Tue, 14 Jun 2011) New Revision: 10802 Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/api/core/client/ClientSessionFactory.java branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/Bridge.java branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/MessageFlowRecord.java branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java Log: bridge, added pause method Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/api/core/client/ClientSessionFactory.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2011-06-14 14:05:34 UTC (rev 10801) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2011-06-14 15:05:40 UTC (rev 10802) @@ -137,4 +137,6 @@ ServerLocator getServerLocator(); CoreRemotingConnection getConnection(); + + boolean isClosed(); } Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-06-14 14:05:34 UTC (rev 10801) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-06-14 15:05:40 UTC (rev 10802) @@ -451,7 +451,12 @@ closed = true; } - public ServerLocator getServerLocator() + public boolean isClosed() + { + return closed; + } + + public ServerLocator getServerLocator() { return serverLocator; } Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/Bridge.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/Bridge.java 2011-06-14 14:05:34 UTC (rev 10801) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/Bridge.java 2011-06-14 15:05:40 UTC (rev 10802) @@ -57,4 +57,8 @@ void setNotificationService(NotificationService notificationService); RemotingConnection getForwardingConnection(); + + void pause() throws Exception; + + void resume() throws Exception; } Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/MessageFlowRecord.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/MessageFlowRecord.java 2011-06-14 14:05:34 UTC (rev 10801) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/MessageFlowRecord.java 2011-06-14 15:05:40 UTC (rev 10802) @@ -40,4 +40,7 @@ void reset() throws Exception; + void pause() throws Exception; + + boolean isPaused(); } Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-06-14 14:05:34 UTC (rev 10801) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-06-14 15:05:40 UTC (rev 10802) @@ -291,8 +291,36 @@ } } - public boolean isStarted() + public void pause() throws Exception { + log.info("Bridge " + this.name + " being paused"); + + executor.execute(new PauseRunnable()); + + if (notificationService != null) + { + TypedProperties props = new TypedProperties(); + props.putSimpleStringProperty(new SimpleString("name"), name); + Notification notification = new Notification(nodeUUID.toString(), NotificationType.BRIDGE_STOPPED, props); + try + { + notificationService.sendNotification(notification); + } + catch (Exception e) + { + BridgeImpl.log.warn("unable to send notification when broadcast group is stopped", e); + } + } + } + + public void resume() throws Exception + { + queue.addConsumer(BridgeImpl.this); + queue.deliverAsync(); + } + + public boolean isStarted() + { return started; } @@ -596,21 +624,21 @@ try { - csf = createSessionFactory(); - // Session is pre-acknowledge - session = (ClientSessionInternal)csf.createSession(user, password, false, true, true, true, 1); - - try + if (csf == null || csf.isClosed()) { - session.addMetaData("Session-for-bridge", name.toString()); - session.addMetaData("nodeUUID", nodeUUID.toString()); + csf = createSessionFactory(); + // Session is pre-acknowledge + session = (ClientSessionInternal)csf.createSession(user, password, false, true, true, true, 1);try + { + session.addMetaData("Session-for-bridge", name.toString()); + session.addMetaData("nodeUUID", nodeUUID.toString()); + } + catch (Throwable dontCare) + { + // addMetaData here is just for debug purposes + } } - catch (Throwable dontCare) - { - // addMetaData here is just for debug purposes - } - if (forwardingAddress != null) { BindingQuery query = null; @@ -778,6 +806,40 @@ } } + private class PauseRunnable implements Runnable + { + public void run() + { + try + { + synchronized (BridgeImpl.this) + { + log.debug("Closing Session for bridge " + BridgeImpl.this.name); + + started = false; + + active = false; + + } + + queue.removeConsumer(BridgeImpl.this); + + cancelRefs(); + + if (queue != null) + { + queue.deliverAsync(); + } + + log.info("paused bridge " + name); + } + catch (Exception e) + { + BridgeImpl.log.error("Failed to pause bridge", e); + } + } + } + private class CreateObjectsRunnable implements Runnable { public synchronized void run() Modified: branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-06-14 14:05:34 UTC (rev 10801) +++ branches/Branch_2_2_EAP-cluster-cleanup/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-06-14 15:05:40 UTC (rev 10802) @@ -466,7 +466,7 @@ { log.trace("Closing clustering record " + record); } - record.close(); + record.pause(); } catch (Exception e) { @@ -545,7 +545,7 @@ else { log.info("Reattaching nodeID=" + nodeID); - if (record.isClosed()) + if (record.isPaused()) { record.resume(); } @@ -714,6 +714,8 @@ private volatile boolean isClosed = false; + private volatile boolean paused = false; + private volatile boolean firstReset = false; public MessageFlowRecordImpl(final String nodeID, @@ -781,13 +783,24 @@ bridge.stop(); } - - public void resume() throws Exception + + public void pause() throws Exception { - isClosed = false; - this.bridge = createBridge(this); - bridge.start(); + paused = true; + clearBindings(); + bridge.pause(); } + + public boolean isPaused() + { + return paused; + } + + public void resume() throws Exception + { + paused = false; + bridge.resume(); + } public boolean isClosed() { @@ -799,7 +812,8 @@ clearBindings(); } - public void setBridge(final Bridge bridge) + + public void setBridge(final Bridge bridge) { this.bridge = bridge; }

14 years, 6 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits June 2011