activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r1504961 [1/11] - 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/destination/ s...
Date Fri, 19 Jul 2013 18:44:24 GMT
Author: rajdavies
Date: Fri Jul 19 18:44:21 2013
New Revision: 1504961

URL: http://svn.apache.org/r1504961
Log:
Updated to not use protobuf (for now) and use nio2

Added:
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsBytesMessage.java   (contents, props changed)
      - copied, changed from r755483, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsBytesMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMapMessage.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsMapMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessage.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsMessageTransformation.java   (contents, props changed)
      - copied, changed from r753178, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsMessageTransformation.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsObjectMessage.java   (contents, props changed)
      - copied, changed from r755483, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsObjectMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsStreamMessage.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsStreamMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BlazeJmsTextMessage.java   (contents, props changed)
      - copied, changed from r755483, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsTextMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/BufferOutputStream.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BufferOutputStream.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/IOUtils.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/IOUtils.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MarshallingSupport.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/MarshallingSupport.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/MemberImpl.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/MemberImpl.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/Packet.java   (contents, props changed)
      - copied, changed from r754975, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/Packet.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/PacketAudit.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/PacketAudit.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/wire/StateValue.java   (contents, props changed)
      - copied, changed from r752825, activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/StateValue.java
Removed:
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessageProcessor.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/StateKey.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/StateValue.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/MemberImpl.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/CompressionProcessor.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/FragmentationProcessor.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/Packet.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/PacketAudit.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/PacketMessageType.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsBytesMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsMapMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsMessageTransformation.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsObjectMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsStreamMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsTextMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/MarshallingSupport.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BufferOutputStream.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/IOUtils.java
    activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/CompressionProcessorTest.java
    activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/impl/processor/FragmentationProcessorTest.java
Modified:
    activemq/activemq-blaze/trunk/pom.xml
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BaseService.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannel.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelFactory.java
    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/BlazeException.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessage.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessageFormatException.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeMessageListener.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeNoRouteException.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeRuntimeException.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Destination.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/ExceptionListener.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Processor.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Service.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/Subscription.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/SubscriptionHolder.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannel.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/BlazeClusterGroupChannelFactory.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/BlazeClusterGroupConfiguration.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/ClusterNotMasterException.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/ClusterStateChangedListener.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ClusterUpdateException.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/DefaultClusterStateListener.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/ElectionService.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/MasterChangedListener.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/cluster/package.html
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannel.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/BlazeGroupChannelFactory.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/BlazeGroupConfiguration.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/DefaultMemberChangedListener.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/Group.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/Member.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/MemberChangedListener.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/group/package.html
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/destination/DestinationMatch.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/destination/package.html
    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/network/package.html
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/processor/ChainedProcessor.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/processor/package.html
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/ReceivedPacket.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/ReliablePacket.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/package.html
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/simple/SimpleReliableProcessor.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/simple/package.html
    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/reliable/swp/package.html
    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/ThreadChainedProcessor.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/transport/TransportFactory.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/impl/transport/package.html
    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/BlazeJmsExceptionSupport.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/BlazeJmsQueueReceiver.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/BlazeJmsTempDestination.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/jms/BlazeJmsTopicSession.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSubscriber.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/AsyncGroupRequest.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArray.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArrayBin.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/Callback.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/ClassLoadingAwareObjectInputStream.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/IdGenerator.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/LRUCache.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/LinkedNode.java
    activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/ObjectFinder.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/RequestCallback.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/util/package.html
    activemq/activemq-blaze/trunk/src/main/proto/blaze.proto
    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/BlazePointcastChannelTest.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/BlazePointcastClusterGroupChannelTest.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/destination/DestinationMatchTest.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/PacketAuditTest.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/PerfRate.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/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/pom.xml?rev=1504961&r1=1504960&r2=1504961&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/pom.xml (original)
+++ activemq/activemq-blaze/trunk/pom.xml Fri Jul 19 18:44:21 2013
@@ -15,118 +15,97 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
+<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.apache.activemq</groupId>
+        <artifactId>activemq-parent</artifactId>
+        <version>5.2.0</version>
+    </parent>
+
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
-    <version>5.2.0</version>
-  </parent>
-  
-  <groupId>org.apache.activemq</groupId>
-  <artifactId>activeblaze</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <description>reliable multicast</description>
-
-  <properties>
-	<activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
-  </properties>
-
-  <dependencies>
-	<!-- =============================== -->
-    <!-- Required Dependencies -->
-    <!-- =============================== -->
-	<dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-	  <version>1.1</version>
-    </dependency>
-    
-    
- 
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-	  <version>1.1.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
- 	<version>1.2.14</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.activemq.protobuf</groupId>
-      <artifactId>activemq-protobuf</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency> 
-	
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.activemq.protobuf</groupId>
-        <artifactId>activemq-protobuf</artifactId>
-        <configuration>
-          <type>alt</type>
-        </configuration>
-        <version>1.0-SNAPSHOT</version>
-         <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>pertest</forkMode>
-          <childDelegation>false</childDelegation>
-          <useFile>true</useFile>
-          <argLine>-Xmx512M</argLine>
-
-           <systemProperties>
-            <property>
-              <name>org.apache.activemq.default.directory.prefix</name>
-              <value>target/</value>
-            </property>
-          </systemProperties>
-
-          <includes>
-            <include>**/*Test.*</include>
-          </includes>
-          <excludes>
-            <exclude>**/perf/*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <artifactId>activeblaze</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <description>reliable multicast</description>
+
+    <properties>
+        <activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <!-- =============================== -->
+        <!-- Required Dependencies -->
+        <!-- =============================== -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkMode>pertest</forkMode>
+                    <childDelegation>false</childDelegation>
+                    <useFile>true</useFile>
+                    <argLine>-Xmx512M</argLine>
+
+                    <systemProperties>
+                        <property>
+                            <name>org.apache.activemq.default.directory.prefix</name>
+                            <value>target/</value>
+                        </property>
+                    </systemProperties>
+
+                    <includes>
+                        <include>**/*Test.*</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/perf/*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BaseService.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BaseService.java?rev=1504961&r1=1504960&r2=1504961&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BaseService.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BaseService.java Fri Jul 19 18:44:21 2013
@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.Atomi
 
 /**
  * Implementation of a Service
- * 
  */
 public abstract class BaseService implements Service {
     AtomicBoolean initialialized = new AtomicBoolean();
@@ -56,9 +55,9 @@ public abstract class BaseService implem
     }
 
     public final boolean start() throws Exception {
-        
-            init();
-      
+
+        init();
+
         boolean result = this.started.compareAndSet(false, true);
         this.started.set(true);
         if (result) {

Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannel.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannel.java?rev=1504961&r1=1504960&r2=1504961&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannel.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannel.java Fri Jul 19 18:44:21 2013
@@ -17,29 +17,22 @@
 package org.apache.activeblaze;
 
 /**
- * <P>
+ * <p/>
  * A <CODE>BlazeChannel</CODE> is a wrapper for reliable multicast communication
- * 
  */
 public interface BlazeChannel extends Service {
     /**
      * @return the id
-     */    
+     */
     public String getId();
 
     /**
      * broadcast as message
-     * @param destination
-     * @param msg
-     * @throws Exception 
      */
     public void broadcast(String destination, BlazeMessage msg) throws Exception;
-    
+
     /**
      * broadcast as message
-     * @param destination
-     * @param msg
-     * @throws Exception 
      */
     public void broadcast(Destination destination, BlazeMessage msg) throws Exception;
 
@@ -47,43 +40,31 @@ public interface BlazeChannel extends Se
      * @return the configuration
      */
     public BlazeConfiguration getConfiguration();
-    
+
     /**
      * Add a listener for messages
-     * @param destination
-     * @param l
-     * @throws Exception 
      */
     public void addBlazeTopicMessageListener(String destination, BlazeMessageListener l) throws Exception;
-    
-    
+
+
     /**
      * Add a listener for messages
-     * @param subscription
-     * @param l
-     * @throws Exception
      */
     public void addBlazeTopicMessageListener(Subscription subscription, BlazeMessageListener l) throws Exception;
+
     /**
      * Remove a listener for messages
-     * @param destination
-     * @param l 
-     * @throws Exception 
      */
-    public void removeBlazeTopicMessageListener(String destination,BlazeMessageListener l) throws Exception;
-    
+    public void removeBlazeTopicMessageListener(String destination, BlazeMessageListener l) throws Exception;
+
     /**
      * Remove the subscription
-     * @param suscription
-     * @param l 
-     * @throws Exception
      */
     public void removeBlazeTopicMessageListener(Subscription suscription, BlazeMessageListener l) throws Exception;
-    
+
     /**
      * Set an exception listener for async exceptions that can be generated
      * by a Transport thread
-     * @param l
      */
     public void setExceptionListener(ExceptionListener l);
 

Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelFactory.java?rev=1504961&r1=1504960&r2=1504961&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelFactory.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeChannelFactory.java Fri Jul 19 18:44:21 2013
@@ -21,26 +21,25 @@ package org.apache.activeblaze;
  */
 public class BlazeChannelFactory {
     private BlazeConfiguration configuration;
-    
+
     /**
      * Default Constructor
      */
     public BlazeChannelFactory() {
         this.configuration = new BlazeConfiguration();
     }
-    
+
     /**
      * Construct a factory to use the passed Configuration
-     * @param config
      */
-    public BlazeChannelFactory(BlazeConfiguration config){
-        this.configuration=config;
+    public BlazeChannelFactory(BlazeConfiguration config) {
+        this.configuration = config;
     }
-    
+
     /**
      * Create a Channel
+     *
      * @return the Channel
-     * @throws Exception 
      */
     public BlazeChannel createChannel() throws Exception {
         BlazeChannelImpl result = new BlazeChannelImpl();

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=1504961&r1=1504960&r2=1504961&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 Fri Jul 19 18:44:21 2013
@@ -19,31 +19,21 @@ 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;
-import org.apache.activeblaze.impl.processor.CompressionProcessor;
 import org.apache.activeblaze.impl.processor.DefaultChainedProcessor;
-import org.apache.activeblaze.impl.processor.FragmentationProcessor;
-import org.apache.activeblaze.impl.processor.Packet;
 import org.apache.activeblaze.impl.reliable.ReliableFactory;
 import org.apache.activeblaze.util.IdGenerator;
 import org.apache.activeblaze.util.PropertyUtil;
-import org.apache.activeblaze.wire.DestinationData;
-import org.apache.activeblaze.wire.MessageType;
-import org.apache.activeblaze.wire.PacketData;
-import org.apache.activeblaze.wire.BlazeData.BlazeDataBuffer;
-import org.apache.activeblaze.wire.PacketData.PacketDataBean;
-import org.apache.activeblaze.wire.PacketData.PacketDataBuffer;
-import org.apache.activemq.protobuf.Buffer;
-import org.apache.activemq.protobuf.MessageBuffer;
-import org.apache.activemq.protobuf.UTF8Buffer;
+import org.apache.activeblaze.wire.Buffer;
+import org.apache.activeblaze.wire.Packet;
+
 /**
- * <P>
+ * <p/>
  * A <CODE>BlazeChannel</CODE> handles all client communication, either unicast,
  * broadcast or multicast with other peers in the Blaze network
- * 
- * 
  */
 public class BlazeChannelImpl extends DefaultChainedProcessor implements BlazeChannel, ExceptionListener {
     protected List<SubscriptionHolder> topicMessageListeners = new CopyOnWriteArrayList<SubscriptionHolder>();
@@ -51,14 +41,10 @@ public class BlazeChannelImpl extends De
     protected Buffer producerId;
     protected Processor broadcast;
     protected BlazeConfiguration configuration = new BlazeConfiguration();
-    protected BlazeMessageProcessor blazeMessageProcessor;
     private String id;
 
     /**
      * Constructor
-     * 
-     * @param prev
-     * @param next
      */
     protected BlazeChannelImpl() {
         this.id = this.idGenerator.generateId();
@@ -81,21 +67,15 @@ public class BlazeChannelImpl extends De
     }
 
     /**
-     * @param destination
-     * @param l
-     * @throws Exception
      * @see org.apache.activeblaze.BlazeChannel#addBlazeTopicMessageListener(java.lang.String,
      *      org.apache.activeblaze.BlazeMessageListener)
      */
     public void addBlazeTopicMessageListener(String destination, BlazeMessageListener l) throws Exception {
-        SubscriptionHolder key = new SubscriptionHolder(destination, l);
+        SubscriptionHolder key = new SubscriptionHolder(destination, true, l);
         this.topicMessageListeners.add(key);
     }
 
     /**
-     * @param subscription
-     * @param l
-     * @throws Exception
      * @see org.apache.activeblaze.BlazeChannel#addBlazeTopicMessageListener(java.lang.String,
      *      org.apache.activeblaze.BlazeMessageListener)
      */
@@ -105,23 +85,21 @@ public class BlazeChannelImpl extends De
     }
 
     /**
+     *
      * @param destination
-     * 
+     * @param l
      * @throws Exception
-     * @see org.apache.activeblaze.BlazeChannel#removeBlazeTopicMessageListener(String
-     *      destination)
      */
     public void removeBlazeTopicMessageListener(String destination, BlazeMessageListener l) throws Exception {
-        SubscriptionHolder key = new SubscriptionHolder(destination, l);
+        SubscriptionHolder key = new SubscriptionHolder(destination, true, l);
         this.topicMessageListeners.remove(key);
     }
 
     /**
+     *
      * @param subs
      * @param l
      * @throws Exception
-     * @see org.apache.activeblaze.BlazeChannel#removeBlazeTopicMessageListener(String
-     *      destination)
      */
     public void removeBlazeTopicMessageListener(Subscription subs, BlazeMessageListener l) throws Exception {
         SubscriptionHolder key = new SubscriptionHolder(subs, l);
@@ -144,16 +122,12 @@ public class BlazeChannelImpl extends De
         this.broadcast.init();
     }
 
-    protected final Processor configureProcess(ChainedProcessor transport) throws Exception {
+    protected final ChainedProcessor configureProcess(ChainedProcessor transport) throws Exception {
         int maxPacketSize = getConfiguration().getMaxPacketSize();
-        CompressionProcessor result = new CompressionProcessor();
+        ChainedProcessor result = transport;
         result.setPrev(this);
         result.setExceptionListener(this);
         result.setMaxPacketSize(maxPacketSize);
-        FragmentationProcessor fp = new FragmentationProcessor();
-        fp.setMaxPacketSize(maxPacketSize);
-        result.setEnd(fp);
-        result.setEnd(transport);
         return result;
     }
 
@@ -181,32 +155,30 @@ public class BlazeChannelImpl extends De
     }
 
     public void broadcast(String destination, BlazeMessage msg) throws Exception {
-        broadcast(new Destination(destination), msg);
+        broadcast(new Destination(destination, true), msg);
     }
 
-    public synchronized void broadcast(Destination destination, BlazeMessage msg) throws Exception {
-        Packet packet = buildPacket(destination, msg);
-        this.broadcast.downStream(packet);
+    public void broadcast(Destination destination, BlazeMessage msg) throws Exception {
+        msg.setDestination(destination);
+        preProcessMessage(destination, msg);
+        this.broadcast.downStream(msg);
     }
 
-    protected final synchronized PacketDataBean getPacketData(MessageType type, MessageBuffer message) {
-        PacketDataBean packetData = new PacketDataBean();
-        packetData.setMessageType(type);
-        packetData.setProducerId(this.producerId);
-        packetData.setPayload(message.toUnframedBuffer());
-        packetData.setMessageId(new Buffer(this.idGenerator.generateId()));
-        return packetData;
+    public void upStream(Packet packet) throws Exception {
+        processPacket(packet);
     }
 
-    public void upStream(Packet packet) throws Exception {
-        PacketDataBuffer data = packet.getPacketData();
-        processData(packet.getId(), data.getCorrelationId(), data);
+    protected void preProcessMessage(Destination destination, BlazeMessage message) {
+        message.setDestination(destination);
+        message.setProducerId(this.id);
+        if (message.getId() == null) {
+            message.setId(this.idGenerator.generateId());
+        }
     }
 
-    protected void processData(String id, Buffer correlationId, PacketDataBuffer data) throws Exception {
-        MessageType type = data.getMessageType();
-        if (type == MessageType.BLAZE_DATA) {
-            doProcessBlazeData(data);
+    protected void processPacket(Packet packet) throws Exception {
+        if (packet instanceof BlazeMessage) {
+            dispatch((BlazeMessage) packet);
         }
     }
 
@@ -216,114 +188,28 @@ public class BlazeChannelImpl extends De
 
     /**
      * Set the configuration
-     * 
-     * @param configuration
      */
     public void setConfiguration(BlazeConfiguration configuration) {
         this.configuration = configuration;
     }
 
     /**
-     * @return the blazeMessageProcessor
-     */
-    public BlazeMessageProcessor getBlazeMessageProcessor() {
-        return this.blazeMessageProcessor;
-    }
-
-    /**
-     * @param blazeMessageProcessor
-     *            the blazeMessageProcessor to set
-     */
-    public void setBlazeMessageProcessor(BlazeMessageProcessor blazeMessageProcessor) {
-        this.blazeMessageProcessor = blazeMessageProcessor;
-    }
-
-    /**
-     * @param ex
      * @see org.apache.activeblaze.ExceptionListener#onException(java.lang.Exception)
      */
     public void onException(Exception ex) {
         doFireException(ex);
     }
 
-    protected void doProcessBlazeData(PacketData data) throws Exception {
-        dispatch(data);
-    }
-
-    
-    
-    protected final void dispatch(PacketData data) throws Exception {
-        if (data != null) {
-            BlazeMessage message = null;
-            Buffer destination = data.getDestinationData().getName();
-            for (SubscriptionHolder entry : this.topicMessageListeners) {
-                if (entry.getSubscription().matches(destination)) {
-                    if (message == null) {
-                        message = buildBlazeMessage(data);
+    protected final void dispatch(BlazeMessage message) throws Exception {
+        if (message != null) {
+            if (message.getDestination() != null) {
+                Buffer destination = message.getDestination().getName();
+                for (SubscriptionHolder entry : this.topicMessageListeners) {
+                    if (entry.getSubscription().matches(destination)) {
+                        entry.getListener().onMessage(message);
                     }
-                    entry.getListener().onMessage(message);
-                }
-            }
-        }
-    }
-
-    protected final Packet buildPacket(Destination destination, BlazeMessage message) {
-        return buildPacket(destination, message, false,null);
-    }
-    
-    protected final Packet buildPacket(Destination destination, BlazeMessage message,String correlationId) {
-        return buildPacket(destination, message, false,correlationId);
-    }
-    
-    protected final Packet buildPacket(Destination destination, BlazeMessage message,boolean responseRequired) {
-        return buildPacket(destination, message, responseRequired,null);
-    }
-
-    protected final Packet buildPacket(Destination destination, BlazeMessage message, boolean responseRequired,String correlationId) {
-        message.setDestination(destination);
-        message.storeContent();
-        
-        BlazeDataBuffer blazeData = message.getContent().freeze();
-        PacketDataBean packetData = getPacketData(MessageType.BLAZE_DATA, blazeData);
-        packetData.setReliable(true);
-        packetData.setResponseRequired(responseRequired);
-        if (correlationId != null && correlationId.length() > 0){
-            packetData.setCorrelationId(new UTF8Buffer(correlationId));
-        }
-        packetData.setDestinationData(destination.getData());
-        packetData.setPayloadType(message.getType());
-        Packet packet = new Packet(packetData.freeze());
-        return packet;
-    }
-    
-    protected final BlazeMessage buildBlazeMessage(PacketData data) throws Exception {
-        BlazeMessage result = null;
-        if (this.blazeMessageProcessor != null) {
-            result = this.blazeMessageProcessor.processBlazeMessage(data);
-        } else {
-            if (data != null) {
-                DestinationData destination = data.getDestinationData();
-                Buffer payload = data.getPayload();
-                BlazeDataBuffer blazeData = BlazeDataBuffer.parseUnframed(payload);
-                String fromId = null;
-                if (data.hasProducerId()) {
-                    fromId = data.getProducerId().toStringUtf8();
                 }
-                result = new BlazeMessage();
-                result.setDestination(destination);
-                result.setFromId(fromId);
-                if (data.hasMessageId()) {
-                    result.setMessageId(data.getMessageId().toStringUtf8());
-                }
-                if (data.hasCorrelationId()) {
-                    result.setCorrelationId(data.getCorrelationId().toStringUtf8());
-                }
-                result.setTimeStamp(blazeData.getTimestamp());
-                result.setType(data.getPayloadType());
-                result.setContent(blazeData);
             }
         }
-        return result;
     }
-
 }

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=1504961&r1=1504960&r2=1504961&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 Fri Jul 19 18:44:21 2013
@@ -17,11 +17,11 @@
 package org.apache.activeblaze;
 
 import java.util.Map;
+
 import org.apache.activeblaze.util.PropertyUtil;
 
 /**
  * Basic Configuration for a BlazeChannel
- * 
  */
 public class BlazeConfiguration {
     /**
@@ -45,8 +45,7 @@ public class BlazeConfiguration {
     }
 
     /**
-     * @param unicastPort
-     *            the unicastPort to set
+     * @param unicastPort the unicastPort to set
      */
     public void setUnicastPort(int unicastPort) {
         this.unicastPort = unicastPort;
@@ -60,8 +59,7 @@ public class BlazeConfiguration {
     }
 
     /**
-     * @param broadcastURL
-     *            the broadcastURL to set
+     * @param broadcastURL the broadcastURL to set
      */
     public void setBroadcastURI(String broadcastURL) {
         this.broadcastURI = broadcastURL;
@@ -75,8 +73,7 @@ public class BlazeConfiguration {
     }
 
     /**
-     * @param maxDispatchQueueSize
-     *            the maxDispatchQueueSize to set
+     * @param maxDispatchQueueSize the maxDispatchQueueSize to set
      */
     public void setMaxDispatchQueueSize(int maxDispatchQueueSize) {
         this.maxDispatchQueueSize = maxDispatchQueueSize;
@@ -90,8 +87,7 @@ public class BlazeConfiguration {
     }
 
     /**
-     * @param managementURI
-     *            the managementURI to set
+     * @param managementURI the managementURI to set
      */
     public void setManagementURI(String managementURI) {
         this.managementURI = managementURI;
@@ -105,8 +101,7 @@ public class BlazeConfiguration {
     }
 
     /**
-     * @param maxPacketSize
-     *            the maxPacketSize to set
+     * @param maxPacketSize the maxPacketSize to set
      */
     public void setMaxPacketSize(int maxPacketSize) {
         this.maxPacketSize = maxPacketSize;
@@ -114,9 +109,8 @@ public class BlazeConfiguration {
 
     /**
      * Copy the configuration
-     * 
+     *
      * @return a deep copy of the configuration
-     * @throws Exception
      */
     public final BlazeConfiguration copy() throws Exception {
         Map<String, String> props = PropertyUtil.getProperties(this);
@@ -137,8 +131,7 @@ public class BlazeConfiguration {
     }
 
     /**
-     * @param reliable
-     *            the reliable to set
+     * @param reliable the reliable to set
      */
     public void setReliableBroadcast(String reliable) {
         this.reliableBroadcast = reliable;

Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeException.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeException.java?rev=1504961&r1=1504960&r2=1504961&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeException.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/BlazeException.java Fri Jul 19 18:44:21 2013
@@ -18,9 +18,8 @@ package org.apache.activeblaze;
 
 /**
  * Exception raised on internal error
- *
  */
-public class BlazeException extends Exception  {
+public class BlazeException extends Exception {
     private static final long serialVersionUID = 1064152356749288271L;
 
     /**
@@ -29,7 +28,7 @@ public class BlazeException extends Exce
      * call to {@link #initCause}.
      */
     public BlazeException() {
-    super();
+        super();
     }
 
     /**
@@ -37,11 +36,11 @@ public class BlazeException extends Exce
      * cause is not initialized, and may subsequently be initialized by
      * a call to {@link #initCause}.
      *
-     * @param   message   the detail message. The detail message is saved for 
-     *          later retrieval by the {@link #getMessage()} method.
+     * @param message the detail message. The detail message is saved for
+     *                later retrieval by the {@link #getMessage()} method.
      */
     public BlazeException(String message) {
-    super(message);
+        super(message);
     }
 
     /**
@@ -50,12 +49,12 @@ public class BlazeException extends Exce
      * <code>cause</code> is <i>not</i> automatically incorporated in
      * this exception's detail message.
      *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link #getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
+     * @param message the detail message (which is saved for later retrieval
+     *                by the {@link #getMessage()} method).
+     * @param cause   the cause (which is saved for later retrieval by the
+     *                {@link #getCause()} method).  (A <tt>null</tt> value is
+     *                permitted, and indicates that the cause is nonexistent or
+     *                unknown.)
      */
     public BlazeException(String message, Throwable cause) {
         super(message, cause);
@@ -69,14 +68,14 @@ public class BlazeException extends Exce
      * wrappers for other throwables (for example, {@link
      * java.security.PrivilegedActionException}).
      *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
+     * @param cause the cause (which is saved for later retrieval by the
+     *              {@link #getCause()} method).  (A <tt>null</tt> value is
+     *              permitted, and indicates that the cause is nonexistent or
+     *              unknown.)
      */
     public BlazeException(Throwable cause) {
         super(cause);
     }
 
-    
+
 }



Mime
View raw message