You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2013/07/21 18:18:48 UTC
svn commit: r1505412 [1/2] - in /activemq/activemq-blaze/trunk: ./
src/main/java/org/apache/activeblaze/
src/main/java/org/apache/activeblaze/cluster/
src/main/java/org/apache/activeblaze/group/
src/main/java/org/apache/activeblaze/impl/network/ src/ma...
Author: rajdavies
Date: Sun Jul 21 16:18:47 2013
New Revision: 1505412
URL: http://svn.apache.org/r1505412
Log:
fix failing tests
Removed:
activemq/activemq-blaze/trunk/activeblaze.iml
Modified:
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelImpl.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeConfiguration.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessage.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Destination.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Subscription.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelImpl.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterGroup.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterState.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ElectionService.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelImpl.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupMessage.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/Group.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/BaseNetwork.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/MulticastNetwork.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/Network.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/NetworkFactory.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/StaticNetwork.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/DefaultChainedProcessor.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableBuffer.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableFactory.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ConsumerProcessor.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ProducerProcessor.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessor.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/BaseTransport.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/MulticastTransport.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/UdpTransport.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnection.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionFactory.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/PropertyUtil.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/SendRequest.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/URISupport.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsBytesMessage.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMapMessage.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessage.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessageTransformation.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsObjectMessage.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsStreamMessage.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsTextMessage.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/IOUtils.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MarshallingSupport.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MemberImpl.java
activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/PacketAudit.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeChannelTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeMessageTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/ClusterStateTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/group/BlazeGroupChannelTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/ChainedProcessorTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/TerminatedChainedProcessor.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkProcessor.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkSwitch.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessorTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/transport/MulticastTransportTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/transport/UdpTransportTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/jms/perf/PerfConsumer.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/jms/perf/PerfProducer.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/jms/perf/SimpleTopicTest.java
activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/util/PropertyUtilTest.java
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelImpl.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelImpl.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelImpl.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelImpl.java Sun Jul 21 16:18:47 2013
@@ -16,10 +16,6 @@
*/
package org.apache.activeblaze;
-import java.net.URI;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
import org.apache.activeblaze.impl.network.Network;
import org.apache.activeblaze.impl.network.NetworkFactory;
import org.apache.activeblaze.impl.processor.ChainedProcessor;
@@ -30,6 +26,10 @@ import org.apache.activeblaze.util.Prope
import org.apache.activeblaze.wire.Buffer;
import org.apache.activeblaze.wire.Packet;
+import java.net.URI;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
/**
* <p/>
* A <CODE>BlazeChannel</CODE> handles all client communication, either unicast,
@@ -85,7 +85,6 @@ public class BlazeChannelImpl extends De
}
/**
- *
* @param destination
* @param l
* @throws Exception
@@ -96,7 +95,6 @@ public class BlazeChannelImpl extends De
}
/**
- *
* @param subs
* @param l
* @throws Exception
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeConfiguration.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeConfiguration.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeConfiguration.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeConfiguration.java Sun Jul 21 16:18:47 2013
@@ -16,10 +16,10 @@
*/
package org.apache.activeblaze;
-import java.util.Map;
-
import org.apache.activeblaze.util.PropertyUtil;
+import java.util.Map;
+
/**
* Basic Configuration for a BlazeChannel
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessage.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessage.java Sun Jul 21 16:18:47 2013
@@ -16,22 +16,12 @@
*/
package org.apache.activeblaze;
+import org.apache.activeblaze.wire.*;
+
import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.activeblaze.wire.Buffer;
-import org.apache.activeblaze.wire.BufferInputStream;
-import org.apache.activeblaze.wire.BufferOutputStream;
-import org.apache.activeblaze.wire.IOUtils;
-import org.apache.activeblaze.wire.MarshallingSupport;
-import org.apache.activeblaze.wire.Packet;
-import org.apache.activeblaze.wire.PacketType;
-
/**
* A <CODE>BlazeMessage</CODE> object is used to send a set of name-value pairs.
* The names are <CODE>String</CODE> objects, and the values are primitive data
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Destination.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Destination.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Destination.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Destination.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,13 @@
*/
package org.apache.activeblaze;
-import java.io.IOException;
-
import org.apache.activeblaze.wire.Buffer;
import org.apache.activeblaze.wire.BufferInputStream;
import org.apache.activeblaze.wire.BufferOutputStream;
import org.apache.activeblaze.wire.ByteBool;
+import java.io.IOException;
+
/**
* Holds information about a Destination
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Subscription.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Subscription.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Subscription.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Subscription.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,13 @@
*/
package org.apache.activeblaze;
-import java.io.IOException;
-
import org.apache.activeblaze.impl.destination.DestinationMatch;
import org.apache.activeblaze.wire.Buffer;
import org.apache.activeblaze.wire.BufferInputStream;
import org.apache.activeblaze.wire.BufferOutputStream;
+import java.io.IOException;
+
/**
* Subscription Info
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelImpl.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelImpl.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelImpl.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelImpl.java Sun Jul 21 16:18:47 2013
@@ -16,21 +16,17 @@
*/
package org.apache.activeblaze.cluster;
-import java.net.URI;
-
import org.apache.activeblaze.BlazeMessage;
import org.apache.activeblaze.group.BlazeGroupChannelImpl;
import org.apache.activeblaze.group.Group;
import org.apache.activeblaze.group.Member;
import org.apache.activeblaze.util.SendRequest;
-import org.apache.activeblaze.wire.Election;
-import org.apache.activeblaze.wire.MemberImpl;
-import org.apache.activeblaze.wire.Packet;
-import org.apache.activeblaze.wire.PacketType;
-import org.apache.activeblaze.wire.StateValue;
+import org.apache.activeblaze.wire.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.net.URI;
+
/**
* A <CODE>BlazeGroupChannel</CODE> enables peer-based point to point
* communication and maintains a coordinator (elected leader) for the group
@@ -111,7 +107,6 @@ public class BlazeClusterGroupChannelImp
}
/**
- *
* @param l
* @throws Exception
*/
@@ -122,7 +117,6 @@ public class BlazeClusterGroupChannelImp
}
/**
- *
* @return
*/
public BlazeClusterGroupConfiguration getConfiguration() {
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterGroup.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterGroup.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterGroup.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterGroup.java Sun Jul 21 16:18:47 2013
@@ -16,16 +16,6 @@
*/
package org.apache.activeblaze.cluster;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.activeblaze.group.Group;
import org.apache.activeblaze.group.Member;
import org.apache.activeblaze.wire.Election;
@@ -33,6 +23,12 @@ import org.apache.activeblaze.wire.Membe
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* Implementation of Group State
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterState.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterState.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterState.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterState.java Sun Jul 21 16:18:47 2013
@@ -16,23 +16,6 @@
*/
package org.apache.activeblaze.cluster;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-
import org.apache.activeblaze.BaseService;
import org.apache.activeblaze.BlazeRuntimeException;
import org.apache.activeblaze.group.Member;
@@ -43,6 +26,10 @@ import org.apache.activeblaze.wire.State
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.io.Serializable;
+import java.util.*;
+import java.util.concurrent.*;
+
/**
* <p/>
* A <CODE>ClusterState</CODE> is a distributed collaboration implementation
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ElectionService.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ElectionService.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ElectionService.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ElectionService.java Sun Jul 21 16:18:47 2013
@@ -16,9 +16,6 @@
*/
package org.apache.activeblaze.cluster;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.activeblaze.BaseService;
import org.apache.activeblaze.group.Member;
import org.apache.activeblaze.util.AsyncGroupRequest;
@@ -27,6 +24,9 @@ import org.apache.activeblaze.wire.Membe
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Responsible for calling an election amongst the members and deciding a
* coordinator
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java Sun Jul 21 16:18:47 2013
@@ -16,15 +16,11 @@
*/
package org.apache.activeblaze.group;
+import org.apache.activeblaze.*;
+
import java.util.List;
import java.util.Set;
-import org.apache.activeblaze.BlazeChannel;
-import org.apache.activeblaze.BlazeMessage;
-import org.apache.activeblaze.BlazeMessageListener;
-import org.apache.activeblaze.Destination;
-import org.apache.activeblaze.Subscription;
-
/**
* <p/>
* A <CODE>BlazeGroupChannel</CODE> enables peer-based point to point communication
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelImpl.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelImpl.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelImpl.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelImpl.java Sun Jul 21 16:18:47 2013
@@ -16,22 +16,7 @@
*/
package org.apache.activeblaze.group;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.activeblaze.BlazeChannelImpl;
-import org.apache.activeblaze.BlazeMessage;
-import org.apache.activeblaze.BlazeMessageListener;
-import org.apache.activeblaze.BlazeNoRouteException;
-import org.apache.activeblaze.BlazeRuntimeException;
-import org.apache.activeblaze.Destination;
-import org.apache.activeblaze.Processor;
-import org.apache.activeblaze.Subscription;
-import org.apache.activeblaze.SubscriptionHolder;
+import org.apache.activeblaze.*;
import org.apache.activeblaze.impl.processor.ChainedProcessor;
import org.apache.activeblaze.impl.processor.DefaultChainedProcessor;
import org.apache.activeblaze.impl.reliable.ReliableFactory;
@@ -47,6 +32,13 @@ import org.apache.activeblaze.wire.Packe
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+
/**
* <p/>
* A <CODE>BlazeGroupChannel</CODE> enables peer-based point to point
@@ -589,7 +581,6 @@ public class BlazeGroupChannelImpl exten
}
/**
- *
* @param packet
* @throws Exception
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupMessage.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupMessage.java Sun Jul 21 16:18:47 2013
@@ -16,10 +16,10 @@
*/
package org.apache.activeblaze.group;
-import java.io.IOException;
-
import org.apache.activeblaze.BlazeMessage;
+import java.io.IOException;
+
/**
* Has information about the sender of the Message
* This type of message is created on receiver
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/Group.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/Group.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/Group.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/Group.java Sun Jul 21 16:18:47 2013
@@ -16,26 +16,15 @@
*/
package org.apache.activeblaze.group;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
import org.apache.activeblaze.BaseService;
import org.apache.activeblaze.Subscription;
import org.apache.activeblaze.wire.MemberImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.*;
+import java.util.concurrent.*;
+
/**
* Maintains members of a group
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/BaseNetwork.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/BaseNetwork.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/BaseNetwork.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/BaseNetwork.java Sun Jul 21 16:18:47 2013
@@ -16,9 +16,6 @@
*/
package org.apache.activeblaze.impl.network;
-import java.net.InetSocketAddress;
-import java.net.URI;
-
import org.apache.activeblaze.ExceptionListener;
import org.apache.activeblaze.Processor;
import org.apache.activeblaze.impl.processor.ChainedProcessor;
@@ -29,6 +26,9 @@ import org.apache.activeblaze.impl.trans
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.net.InetSocketAddress;
+import java.net.URI;
+
/**
* Base class for network broadcast protocols
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/MulticastNetwork.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/MulticastNetwork.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/MulticastNetwork.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/MulticastNetwork.java Sun Jul 21 16:18:47 2013
@@ -16,12 +16,12 @@
*/
package org.apache.activeblaze.impl.network;
-import java.net.InetSocketAddress;
-
import org.apache.activeblaze.impl.transport.BaseTransport;
import org.apache.activeblaze.impl.transport.TransportFactory;
import org.apache.activeblaze.wire.Packet;
+import java.net.InetSocketAddress;
+
/**
* Uses multicast to implement a Network
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/Network.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/Network.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/Network.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/Network.java Sun Jul 21 16:18:47 2013
@@ -16,10 +16,10 @@
*/
package org.apache.activeblaze.impl.network;
-import java.net.URI;
-
import org.apache.activeblaze.impl.processor.ChainedProcessor;
+import java.net.URI;
+
/**
* <p/>
* A <CODE>Network</CODE> defines operations that can be applied to remote
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/NetworkFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/NetworkFactory.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/NetworkFactory.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/NetworkFactory.java Sun Jul 21 16:18:47 2013
@@ -16,12 +16,12 @@
*/
package org.apache.activeblaze.impl.network;
-import java.net.URI;
-import java.util.Map;
-
import org.apache.activeblaze.util.ObjectFinder;
import org.apache.activeblaze.util.PropertyUtil;
+import java.net.URI;
+import java.util.Map;
+
/**
* create a new Network instance
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/StaticNetwork.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/StaticNetwork.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/StaticNetwork.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/network/StaticNetwork.java Sun Jul 21 16:18:47 2013
@@ -16,12 +16,6 @@
*/
package org.apache.activeblaze.impl.network;
-import java.net.BindException;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.activeblaze.BlazeException;
import org.apache.activeblaze.impl.transport.BaseTransport;
import org.apache.activeblaze.impl.transport.TransportFactory;
@@ -29,6 +23,12 @@ import org.apache.activeblaze.util.URISu
import org.apache.activeblaze.util.URISupport.CompositeData;
import org.apache.activeblaze.wire.Packet;
+import java.net.BindException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Uses a list of URI's to create a network
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/DefaultChainedProcessor.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/DefaultChainedProcessor.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/DefaultChainedProcessor.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/DefaultChainedProcessor.java Sun Jul 21 16:18:47 2013
@@ -16,11 +16,7 @@
*/
package org.apache.activeblaze.impl.processor;
-import org.apache.activeblaze.BaseService;
-import org.apache.activeblaze.BlazeConfiguration;
-import org.apache.activeblaze.BlazeException;
-import org.apache.activeblaze.ExceptionListener;
-import org.apache.activeblaze.Processor;
+import org.apache.activeblaze.*;
import org.apache.activeblaze.wire.Packet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableBuffer.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableBuffer.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableBuffer.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableBuffer.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,13 @@
*/
package org.apache.activeblaze.impl.reliable;
+import org.apache.activeblaze.wire.Packet;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.activeblaze.wire.Packet;
-
/**
* Holds a buffer of Packets to replay
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableFactory.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableFactory.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReliableFactory.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,13 @@
*/
package org.apache.activeblaze.impl.reliable;
-import java.util.Map;
-
import org.apache.activeblaze.impl.processor.ChainedProcessor;
import org.apache.activeblaze.impl.processor.DefaultChainedProcessor;
import org.apache.activeblaze.util.ObjectFinder;
import org.apache.activeblaze.util.PropertyUtil;
+import java.util.Map;
+
/**
* Find a reliable implementation
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ConsumerProcessor.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ConsumerProcessor.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ConsumerProcessor.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ConsumerProcessor.java Sun Jul 21 16:18:47 2013
@@ -16,12 +16,6 @@
*/
package org.apache.activeblaze.impl.reliable.swp;
-import java.net.SocketAddress;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
import org.apache.activeblaze.impl.reliable.ReliableBuffer;
import org.apache.activeblaze.wire.Ack;
import org.apache.activeblaze.wire.Nack;
@@ -30,6 +24,12 @@ import org.apache.activeblaze.wire.Packe
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
/**
* Consumer part of SWP
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ProducerProcessor.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ProducerProcessor.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ProducerProcessor.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/ProducerProcessor.java Sun Jul 21 16:18:47 2013
@@ -16,6 +16,12 @@
*/
package org.apache.activeblaze.impl.reliable.swp;
+import org.apache.activeblaze.BlazeNoRouteException;
+import org.apache.activeblaze.impl.reliable.ReliableBuffer;
+import org.apache.activeblaze.wire.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.net.SocketAddress;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -24,16 +30,6 @@ import java.util.concurrent.locks.Condit
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.activeblaze.BlazeNoRouteException;
-import org.apache.activeblaze.impl.reliable.ReliableBuffer;
-import org.apache.activeblaze.wire.Ack;
-import org.apache.activeblaze.wire.Control;
-import org.apache.activeblaze.wire.Nack;
-import org.apache.activeblaze.wire.Packet;
-import org.apache.activeblaze.wire.PacketType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* state on a request
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessor.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessor.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessor.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessor.java Sun Jul 21 16:18:47 2013
@@ -16,6 +16,13 @@
*/
package org.apache.activeblaze.impl.reliable.swp;
+import org.apache.activeblaze.impl.processor.DefaultChainedProcessor;
+import org.apache.activeblaze.util.LRUCache;
+import org.apache.activeblaze.util.SendRequest;
+import org.apache.activeblaze.wire.Packet;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.net.SocketAddress;
import java.util.Map;
import java.util.Timer;
@@ -24,13 +31,6 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.activeblaze.impl.processor.DefaultChainedProcessor;
-import org.apache.activeblaze.util.LRUCache;
-import org.apache.activeblaze.util.SendRequest;
-import org.apache.activeblaze.wire.Packet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* This is a sliding window protocol for unicast reliability
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/BaseTransport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/BaseTransport.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/BaseTransport.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/BaseTransport.java Sun Jul 21 16:18:47 2013
@@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFac
import java.net.SocketAddress;
import java.net.URI;
+import java.util.LinkedList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
@@ -47,6 +48,7 @@ public abstract class BaseTransport exte
private boolean broadcast = true;
private boolean enableAudit = false;
private int maxDispatchQueueSize = 1024;
+ private LinkedList<Packet> initializingList;
private Disruptor<EventPacket> disruptor;
private RingBuffer<EventPacket> ringBuffer;
private ExecutorService executorService;
@@ -71,6 +73,7 @@ public abstract class BaseTransport exte
if (this.localURI != null) {
this.bufferOfLocalURI = new Buffer(this.localURI.toString());
}
+ initializingList = new LinkedList<Packet>();
int maxDispatchSize = getMaxDispatchQueueSize();
//disruptor needs this to be a power of 2
if ((maxDispatchSize & (maxDispatchSize - 1)) != 0) {
@@ -80,7 +83,6 @@ public abstract class BaseTransport exte
maxDispatchSize |= maxDispatchQueueSize >> 2;
maxDispatchSize |= maxDispatchQueueSize >> 4;
maxDispatchSize |= maxDispatchQueueSize >> 16;
- maxDispatchSize |= maxDispatchQueueSize >> 32;
maxDispatchSize++;
LOG.warn("maxDispatchQueueSize has to be a power of 2 - setting from " + getMaxDispatchQueueSize() + " to " + maxDispatchSize);
setMaxDispatchQueueSize(maxDispatchSize);
@@ -89,13 +91,14 @@ public abstract class BaseTransport exte
}
public void doShutDown() throws Exception {
+ initializingList.clear();
super.doShutDown();
- this.audit.shutDown();
+ audit.shutDown();
}
public void doStart() throws Exception {
super.doStart();
- this.audit.start();
+ audit.start();
executorService = Executors.newSingleThreadExecutor(new ThreadFactory() {
@@ -134,6 +137,11 @@ public abstract class BaseTransport exte
};
disruptor.handleEventsWith(handler);
ringBuffer = disruptor.start();
+ //drain down initializingList of Packets
+ for (Packet packet : initializingList) {
+ addToDisruptor(packet);
+ }
+ initializingList.clear();
}
private void passUpStream(Packet packet) throws Exception {
@@ -290,10 +298,11 @@ public abstract class BaseTransport exte
public void upStream(Packet packet) throws Exception {
if (!isStopped()) {
if (!this.enableAudit || !this.audit.isDuplicate(packet)) {
- long sequence = ringBuffer.next();
- EventPacket eventPacket = ringBuffer.get(sequence);
- eventPacket.setPacket(packet);
- ringBuffer.publish(sequence);
+ if (ringBuffer == null) {
+ initializingList.add(packet);
+ } else {
+ addToDisruptor(packet);
+ }
} else {
if (LOG.isDebugEnabled()) {
@@ -303,6 +312,13 @@ public abstract class BaseTransport exte
}
}
+ private void addToDisruptor(Packet packet) {
+ long sequence = ringBuffer.next();
+ EventPacket eventPacket = ringBuffer.get(sequence);
+ eventPacket.setPacket(packet);
+ ringBuffer.publish(sequence);
+ }
+
public final synchronized void downStream(Packet packet) throws Exception {
if (isInitialized()) {
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/MulticastTransport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/MulticastTransport.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/MulticastTransport.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/MulticastTransport.java Sun Jul 21 16:18:47 2013
@@ -109,7 +109,7 @@ public class MulticastTransport extends
}
public void sendData(SocketAddress to, byte[] data, int offset, int length) throws Exception {
- if (isInitialized()) {
+ if (isInitialized() && this.datagramChannel.isOpen()) {
ByteBuffer byteBuffer = ByteBuffer.wrap(data, offset, length);
while (byteBuffer.hasRemaining()) {
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/UdpTransport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/UdpTransport.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/UdpTransport.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/UdpTransport.java Sun Jul 21 16:18:47 2013
@@ -94,7 +94,7 @@ public class UdpTransport extends BaseTr
}
public void sendData(SocketAddress to, byte[] data, int offset, int length) throws Exception {
- if (isInitialized()) {
+ if (isInitialized() && this.datagramChannel.isOpen()) {
ByteBuffer byteBuffer = ByteBuffer.wrap(data, offset, length);
this.datagramChannel.send(byteBuffer, to);
}
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnection.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnection.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnection.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnection.java Sun Jul 21 16:18:47 2013
@@ -16,16 +16,16 @@
*/
package org.apache.activeblaze.jms;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.jms.*;
-import javax.jms.IllegalStateException;
import org.apache.activeblaze.BlazeMessageListener;
import org.apache.activeblaze.Subscription;
import org.apache.activeblaze.group.BlazeGroupChannel;
import org.apache.activeblaze.util.IdGenerator;
+import javax.jms.*;
+import javax.jms.IllegalStateException;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
/**
* Implementation of a JMS Connection
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionFactory.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionFactory.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionFactory.java Sun Jul 21 16:18:47 2013
@@ -16,17 +16,6 @@
*/
package org.apache.activeblaze.jms;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
import org.apache.activeblaze.BlazeRuntimeException;
import org.apache.activeblaze.group.BlazeGroupChannelFactory;
import org.apache.activeblaze.group.BlazeGroupConfiguration;
@@ -34,6 +23,11 @@ import org.apache.activeblaze.jndi.JNDIS
import org.apache.activeblaze.util.IdGenerator;
import org.apache.activeblaze.util.PropertyUtil;
+import javax.jms.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
/**
* Jms ConnectionFactory implementation
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,12 @@
*/
package org.apache.activeblaze.jms;
+import javax.jms.ConnectionMetaData;
import java.util.Enumeration;
import java.util.Vector;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.jms.ConnectionMetaData;
-
/**
* A <CODE>ConnectionMetaData</CODE> object provides information describing
* the <CODE>Connection</CODE> object.
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java Sun Jul 21 16:18:47 2013
@@ -16,18 +16,14 @@
*/
package org.apache.activeblaze.jms;
-import java.io.Externalizable;
-import java.util.Map;
-
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
-import javax.jms.Topic;
import org.apache.activeblaze.Destination;
import org.apache.activeblaze.jndi.JNDIStorable;
import org.apache.activeblaze.wire.Buffer;
+import javax.jms.*;
+import java.io.Externalizable;
+import java.util.Map;
+
/**
* Jms Destination
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java Sun Jul 21 16:18:47 2013
@@ -16,6 +16,14 @@
*/
package org.apache.activeblaze.jms;
+import org.apache.activeblaze.BlazeMessage;
+import org.apache.activeblaze.BlazeMessageListener;
+import org.apache.activeblaze.Subscription;
+import org.apache.activeblaze.wire.BlazeJmsMessage;
+import org.apache.activeblaze.wire.BlazeJmsMessageTransformation;
+
+import javax.jms.IllegalStateException;
+import javax.jms.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
@@ -23,17 +31,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import org.apache.activeblaze.BlazeMessage;
-import org.apache.activeblaze.BlazeMessageListener;
-import org.apache.activeblaze.Subscription;
-import org.apache.activeblaze.wire.BlazeJmsMessage;
-import org.apache.activeblaze.wire.BlazeJmsMessageTransformation;
-
/**
* implementation of a Jms Message Consumer
*/
@@ -155,7 +152,6 @@ public class BlazeJmsMessageConsumer imp
}
/**
- *
* @param message
*/
public void onMessage(BlazeJmsMessage message) {
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,8 @@
*/
package org.apache.activeblaze.jms;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
+import javax.jms.*;
import javax.jms.IllegalStateException;
-import javax.jms.InvalidDestinationException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
/**
* Implementation of a Jms MessageProducer
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java Sun Jul 21 16:18:47 2013
@@ -16,9 +16,10 @@
*/
package org.apache.activeblaze.jms;
-import javax.jms.Queue;
import org.apache.activeblaze.Destination;
+import javax.jms.Queue;
+
/**
* Queue implementation
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java Sun Jul 21 16:18:47 2013
@@ -17,10 +17,7 @@
package org.apache.activeblaze.jms;
import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
+import javax.jms.*;
/**
* Implementation of a Queue Sender
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java Sun Jul 21 16:18:47 2013
@@ -16,15 +16,8 @@
*/
package org.apache.activeblaze.jms;
-import javax.jms.Destination;
+import javax.jms.*;
import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.TemporaryTopic;
-import javax.jms.Topic;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSubscriber;
/**
* Jms QueueSession implementation
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java Sun Jul 21 16:18:47 2013
@@ -16,19 +16,13 @@
*/
package org.apache.activeblaze.jms;
-import java.io.Serializable;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.activeblaze.wire.*;
import javax.jms.*;
import javax.jms.IllegalStateException;
-import org.apache.activeblaze.wire.BlazeJmsBytesMessage;
-import org.apache.activeblaze.wire.BlazeJmsMapMessage;
-import org.apache.activeblaze.wire.BlazeJmsMessage;
-import org.apache.activeblaze.wire.BlazeJmsMessageTransformation;
-import org.apache.activeblaze.wire.BlazeJmsObjectMessage;
-import org.apache.activeblaze.wire.BlazeJmsStreamMessage;
-import org.apache.activeblaze.wire.BlazeJmsTextMessage;
+import java.io.Serializable;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* JMS Session implementation
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java Sun Jul 21 16:18:47 2013
@@ -16,9 +16,10 @@
*/
package org.apache.activeblaze.jms;
-import javax.jms.TemporaryQueue;
import org.apache.activeblaze.Destination;
+import javax.jms.TemporaryQueue;
+
/**
* TemporaryQueue
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java Sun Jul 21 16:18:47 2013
@@ -16,9 +16,10 @@
*/
package org.apache.activeblaze.jms;
-import javax.jms.TemporaryTopic;
import org.apache.activeblaze.Destination;
+import javax.jms.TemporaryTopic;
+
/**
* Temporary Topic
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java Sun Jul 21 16:18:47 2013
@@ -16,9 +16,10 @@
*/
package org.apache.activeblaze.jms;
-import javax.jms.Topic;
import org.apache.activeblaze.Destination;
+import javax.jms.Topic;
+
/**
* TemporaryQueue
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java Sun Jul 21 16:18:47 2013
@@ -17,10 +17,7 @@
package org.apache.activeblaze.jms;
import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Topic;
-import javax.jms.TopicPublisher;
+import javax.jms.*;
/**
* Implementation of a TopicPublisher
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java Sun Jul 21 16:18:47 2013
@@ -16,21 +16,16 @@
*/
package org.apache.activeblaze.jndi;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.naming.*;
+import javax.naming.spi.ObjectFactory;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
-import javax.naming.spi.ObjectFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Converts objects implementing JNDIStorable into a property fields so they can be stored and regenerated from JNDI
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java Sun Jul 21 16:18:47 2013
@@ -16,6 +16,9 @@
*/
package org.apache.activeblaze.jndi;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.naming.Referenceable;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -23,10 +26,6 @@ import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.Map;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.naming.Referenceable;
-
/**
* Facilitates objects to be stored in JNDI as properties
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/PropertyUtil.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/PropertyUtil.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/PropertyUtil.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/PropertyUtil.java Sun Jul 21 16:18:47 2013
@@ -16,11 +16,7 @@
*/
package org.apache.activeblaze.util;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.beans.PropertyEditor;
-import java.beans.PropertyEditorManager;
+import java.beans.*;
import java.lang.reflect.Method;
import java.net.URI;
import java.net.URLDecoder;
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/SendRequest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/SendRequest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/SendRequest.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/SendRequest.java Sun Jul 21 16:18:47 2013
@@ -16,12 +16,12 @@
*/
package org.apache.activeblaze.util;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.activeblaze.wire.Packet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* state on a request
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/URISupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/URISupport.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/URISupport.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/URISupport.java Sun Jul 21 16:18:47 2013
@@ -21,12 +21,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @version $Revision$
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsBytesMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsBytesMessage.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsBytesMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsBytesMessage.java Sun Jul 21 16:18:47 2013
@@ -16,21 +16,16 @@
*/
package org.apache.activeblaze.wire;
+import org.apache.activeblaze.BlazeException;
+import org.apache.activeblaze.BlazeRuntimeException;
+import org.apache.activeblaze.jms.BlazeJmsExceptionSupport;
+
+import javax.jms.*;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.IOException;
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.MessageEOFException;
-import javax.jms.MessageFormatException;
-import javax.jms.MessageNotReadableException;
-import javax.jms.MessageNotWriteableException;
-import org.apache.activeblaze.BlazeException;
-import org.apache.activeblaze.BlazeRuntimeException;
-import org.apache.activeblaze.jms.BlazeJmsExceptionSupport;
-
/**
* A <CODE>BytesMessage</CODE> object is used to send a message containing a
* stream of uninterpreted bytes. It inherits from the <CODE>Message</CODE>
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMapMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMapMessage.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMapMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMapMessage.java Sun Jul 21 16:18:47 2013
@@ -16,18 +16,18 @@
*/
package org.apache.activeblaze.wire;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.activeblaze.BlazeException;
+import org.apache.activeblaze.BlazeRuntimeException;
import javax.jms.JMSException;
import javax.jms.MapMessage;
import javax.jms.MessageFormatException;
import javax.jms.MessageNotWriteableException;
-import org.apache.activeblaze.BlazeException;
-import org.apache.activeblaze.BlazeRuntimeException;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
/**
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessage.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessage.java Sun Jul 21 16:18:47 2013
@@ -16,20 +16,16 @@
*/
package org.apache.activeblaze.wire;
-import java.io.IOException;
-import java.util.Enumeration;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageFormatException;
import org.apache.activeblaze.BlazeMessage;
import org.apache.activeblaze.BlazeMessageFormatException;
import org.apache.activeblaze.BlazeRuntimeException;
import org.apache.activeblaze.jms.BlazeJmsDestination;
import org.apache.activeblaze.util.Callback;
+import javax.jms.*;
+import java.io.IOException;
+import java.util.Enumeration;
+
/**
* Implementation of a Jms Message
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessageTransformation.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessageTransformation.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessageTransformation.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessageTransformation.java Sun Jul 21 16:18:47 2013
@@ -16,20 +16,12 @@
*/
package org.apache.activeblaze.wire;
-import java.util.Enumeration;
-
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageEOFException;
-import javax.jms.ObjectMessage;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
import org.apache.activeblaze.BlazeMessage;
import org.apache.activeblaze.jms.BlazeJmsDestination;
+import javax.jms.*;
+import java.util.Enumeration;
+
/**
* A helper class for converting normal JMS interfaces into ActiveMQ specific
* ones.
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsObjectMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsObjectMessage.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsObjectMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsObjectMessage.java Sun Jul 21 16:18:47 2013
@@ -16,16 +16,16 @@
*/
package org.apache.activeblaze.wire;
+import org.apache.activeblaze.BlazeException;
+import org.apache.activeblaze.BlazeRuntimeException;
+
+import javax.jms.JMSException;
+import javax.jms.ObjectMessage;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import org.apache.activeblaze.BlazeException;
-import org.apache.activeblaze.BlazeRuntimeException;
-
/**
* An <CODE>ObjectMessage</CODE> object is used to send a message that contains
* a serializable object in the Java programming language ("Java object"). It
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsStreamMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsStreamMessage.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsStreamMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsStreamMessage.java Sun Jul 21 16:18:47 2013
@@ -16,21 +16,16 @@
*/
package org.apache.activeblaze.wire;
+import org.apache.activeblaze.BlazeException;
+import org.apache.activeblaze.BlazeRuntimeException;
+import org.apache.activeblaze.jms.BlazeJmsExceptionSupport;
+
+import javax.jms.*;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.IOException;
-import javax.jms.JMSException;
-import javax.jms.MessageEOFException;
-import javax.jms.MessageFormatException;
-import javax.jms.MessageNotReadableException;
-import javax.jms.MessageNotWriteableException;
-import javax.jms.StreamMessage;
-import org.apache.activeblaze.BlazeException;
-import org.apache.activeblaze.BlazeRuntimeException;
-import org.apache.activeblaze.jms.BlazeJmsExceptionSupport;
-
/**
* A <CODE>StreamMessage</CODE> object is used to send a stream of primitive
* types in the Java programming language. It is filled and read sequentially.
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsTextMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsTextMessage.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsTextMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsTextMessage.java Sun Jul 21 16:18:47 2013
@@ -16,12 +16,12 @@
*/
package org.apache.activeblaze.wire;
-import java.io.IOException;
+import org.apache.activeblaze.BlazeException;
+import org.apache.activeblaze.BlazeRuntimeException;
import javax.jms.JMSException;
import javax.jms.TextMessage;
-import org.apache.activeblaze.BlazeException;
-import org.apache.activeblaze.BlazeRuntimeException;
+import java.io.IOException;
/**
* @version $Revision$
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/IOUtils.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/IOUtils.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/IOUtils.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/IOUtils.java Sun Jul 21 16:18:47 2013
@@ -16,20 +16,13 @@
*/
package org.apache.activeblaze.wire;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
+import org.apache.activeblaze.util.ClassLoadingAwareObjectInputStream;
+
+import java.io.*;
import java.nio.ByteBuffer;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
-import org.apache.activeblaze.util.ClassLoadingAwareObjectInputStream;
-
/**
* Utilities for ByteBuffers
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MarshallingSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MarshallingSupport.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MarshallingSupport.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MarshallingSupport.java Sun Jul 21 16:18:47 2013
@@ -20,11 +20,7 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.UTFDataFormatException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* The fixed version of the UTF8 encoding function. Some older JVM's UTF8
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MemberImpl.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MemberImpl.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MemberImpl.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MemberImpl.java Sun Jul 21 16:18:47 2013
@@ -16,6 +16,10 @@
*/
package org.apache.activeblaze.wire;
+import org.apache.activeblaze.Subscription;
+import org.apache.activeblaze.group.Member;
+import org.apache.activeblaze.impl.destination.DestinationMatch;
+
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -24,10 +28,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.activeblaze.Subscription;
-import org.apache.activeblaze.group.Member;
-import org.apache.activeblaze.impl.destination.DestinationMatch;
-
/**
* Implementation of a Member
*/
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/PacketAudit.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/PacketAudit.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/PacketAudit.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/PacketAudit.java Sun Jul 21 16:18:47 2013
@@ -16,12 +16,12 @@
*/
package org.apache.activeblaze.wire;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
import org.apache.activeblaze.BaseService;
import org.apache.activeblaze.util.BitArrayBin;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
/**
* Checks for duplicates
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeChannelTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeChannelTest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeChannelTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeChannelTest.java Sun Jul 21 16:18:47 2013
@@ -16,14 +16,14 @@
*/
package org.apache.activeblaze;
+import junit.framework.TestCase;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.TestCase;
-
/**
* Basic test for BlazeChannel
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeMessageTest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeMessageTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/BlazeMessageTest.java Sun Jul 21 16:18:47 2013
@@ -16,15 +16,15 @@
*/
package org.apache.activeblaze;
+import junit.framework.TestCase;
+import org.apache.activeblaze.wire.Buffer;
+import org.apache.activeblaze.wire.IOUtils;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import junit.framework.TestCase;
-import org.apache.activeblaze.wire.Buffer;
-import org.apache.activeblaze.wire.IOUtils;
-
/**
* Test BlazeMessage
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelTest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelTest.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,13 @@
*/
package org.apache.activeblaze.cluster;
+import junit.framework.TestCase;
+import org.apache.activeblaze.group.Member;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import junit.framework.TestCase;
-import org.apache.activeblaze.group.Member;
-
/**
* Test for clustered channel
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/ClusterStateTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/ClusterStateTest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/ClusterStateTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/cluster/ClusterStateTest.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,13 @@
*/
package org.apache.activeblaze.cluster;
+import junit.framework.TestCase;
+import org.apache.activeblaze.group.Member;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import junit.framework.TestCase;
-import org.apache.activeblaze.group.Member;
-
/**
* Tests for ClusterState
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/group/BlazeGroupChannelTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/group/BlazeGroupChannelTest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/group/BlazeGroupChannelTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/group/BlazeGroupChannelTest.java Sun Jul 21 16:18:47 2013
@@ -16,15 +16,15 @@
*/
package org.apache.activeblaze.group;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
import junit.framework.TestCase;
import org.apache.activeblaze.BlazeChannel;
import org.apache.activeblaze.BlazeMessage;
import org.apache.activeblaze.BlazeMessageListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
/**
* Test BlazeGroupChannel
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/ChainedProcessorTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/ChainedProcessorTest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/ChainedProcessorTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/ChainedProcessorTest.java Sun Jul 21 16:18:47 2013
@@ -16,11 +16,11 @@
*/
package org.apache.activeblaze.impl.processor;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import junit.framework.TestCase;
import org.apache.activeblaze.wire.Packet;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* Test some basics in ChainedProcessor
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/TerminatedChainedProcessor.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/TerminatedChainedProcessor.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/TerminatedChainedProcessor.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/TerminatedChainedProcessor.java Sun Jul 21 16:18:47 2013
@@ -16,11 +16,11 @@
*/
package org.apache.activeblaze.impl.processor;
+import org.apache.activeblaze.wire.Packet;
+
import java.util.ArrayList;
import java.util.List;
-import org.apache.activeblaze.wire.Packet;
-
/**
* Test Processor
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkProcessor.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkProcessor.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkProcessor.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkProcessor.java Sun Jul 21 16:18:47 2013
@@ -16,11 +16,11 @@
*/
package org.apache.activeblaze.impl.reliable.swp;
-import java.net.SocketAddress;
-
import org.apache.activeblaze.impl.processor.DefaultChainedProcessor;
import org.apache.activeblaze.wire.Packet;
+import java.net.SocketAddress;
+
/**
* Changes downStream() to upStream and vice versa
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkSwitch.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkSwitch.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkSwitch.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/MockNetworkSwitch.java Sun Jul 21 16:18:47 2013
@@ -16,10 +16,10 @@
*/
package org.apache.activeblaze.impl.reliable.swp;
-import java.net.InetSocketAddress;
-
import org.apache.activeblaze.wire.Packet;
+import java.net.InetSocketAddress;
+
/**
* Mock network
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessorTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessorTest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessorTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/reliable/swp/SwpProcessorTest.java Sun Jul 21 16:18:47 2013
@@ -16,6 +16,13 @@
*/
package org.apache.activeblaze.impl.reliable.swp;
+import junit.framework.TestCase;
+import org.apache.activeblaze.BlazeMessage;
+import org.apache.activeblaze.impl.processor.DefaultChainedProcessor;
+import org.apache.activeblaze.impl.transport.UdpTransport;
+import org.apache.activeblaze.util.IdGenerator;
+import org.apache.activeblaze.wire.Packet;
+
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.net.URI;
@@ -24,13 +31,6 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import junit.framework.TestCase;
-import org.apache.activeblaze.BlazeMessage;
-import org.apache.activeblaze.impl.processor.DefaultChainedProcessor;
-import org.apache.activeblaze.impl.transport.UdpTransport;
-import org.apache.activeblaze.util.IdGenerator;
-import org.apache.activeblaze.wire.Packet;
-
/**
* Test the SwpProcessor
*/
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/transport/MulticastTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/transport/MulticastTransportTest.java?rev=1505412&r1=1505411&r2=1505412&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/transport/MulticastTransportTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/transport/MulticastTransportTest.java Sun Jul 21 16:18:47 2013
@@ -16,13 +16,13 @@
*/
package org.apache.activeblaze.impl.transport;
-import java.net.InetSocketAddress;
-import java.net.URI;
-
import junit.framework.TestCase;
import org.apache.activeblaze.BlazeMessage;
import org.apache.activeblaze.impl.processor.TerminatedChainedProcessor;
+import java.net.InetSocketAddress;
+import java.net.URI;
+
/**
* Test Multicast Transport
*/