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 2009/02/27 21:12:13 UTC
svn commit: r748679 - in /activemq/activemq-blaze/trunk/src:
main/java/org/apache/activeblaze/impl/reliable/simple/
main/java/org/apache/activeblaze/jms/message/
test/java/org/apache/activeblaze/jms/perf/
Author: rajdavies
Date: Fri Feb 27 20:12:12 2009
New Revision: 748679
URL: http://svn.apache.org/viewvc?rev=748679&view=rev
Log:
Use a re-sizing BufferOutputStream
Modified:
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/jms/message/BlazeJmsBytesMessage.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/test/java/org/apache/activeblaze/jms/perf/SimpleTopicTest.java
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/simple/SimpleReliableProcessor.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/simple/SimpleReliableProcessor.java?rev=748679&r1=748678&r2=748679&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/simple/SimpleReliableProcessor.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/impl/reliable/simple/SimpleReliableProcessor.java Fri Feb 27 20:12:12 2009
@@ -31,7 +31,7 @@
*/
public SimpleReliableProcessor() {
this.simpleFlow=new SimpleFlow();
- setEnd(this.simpleFlow);
+ //setEnd(this.simpleFlow);
}
}
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsBytesMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsBytesMessage.java?rev=748679&r1=748678&r2=748679&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsBytesMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsBytesMessage.java Fri Feb 27 20:12:12 2009
@@ -16,6 +16,15 @@
*/
package org.apache.activeblaze.jms.message;
+import org.apache.activeblaze.BlazeException;
+import org.apache.activeblaze.BlazeRuntimeException;
+import org.apache.activeblaze.jms.BlazeJmsExceptionSupport;
+import org.apache.activeblaze.util.BufferOutputStream;
+import org.apache.activeblaze.wire.BlazeData;
+import org.apache.activeblaze.wire.BlazeData.BlazeDataBean;
+import org.apache.activemq.protobuf.Buffer;
+import org.apache.activemq.protobuf.BufferInputStream;
+
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
@@ -26,15 +35,6 @@
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;
-import org.apache.activeblaze.jms.message.BlazeJmsMessage.JmsMessageType;
-import org.apache.activeblaze.wire.BlazeData;
-import org.apache.activeblaze.wire.BlazeData.BlazeDataBean;
-import org.apache.activemq.protobuf.Buffer;
-import org.apache.activemq.protobuf.BufferInputStream;
-import org.apache.activemq.protobuf.BufferOutputStream;
/**
* A <CODE>BytesMessage</CODE> object is used to send a message containing a stream of uninterpreted bytes. It
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsObjectMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsObjectMessage.java?rev=748679&r1=748678&r2=748679&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsObjectMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsObjectMessage.java Fri Feb 27 20:12:12 2009
@@ -29,11 +29,12 @@
import org.apache.activeblaze.BlazeException;
import org.apache.activeblaze.BlazeRuntimeException;
import org.apache.activeblaze.jms.BlazeJmsExceptionSupport;
+import org.apache.activeblaze.util.BufferOutputStream;
import org.apache.activeblaze.util.ClassLoadingAwareObjectInputStream;
import org.apache.activeblaze.wire.BlazeData.BlazeDataBean;
import org.apache.activemq.protobuf.Buffer;
import org.apache.activemq.protobuf.BufferInputStream;
-import org.apache.activemq.protobuf.BufferOutputStream;
+
/**
* An <CODE>ObjectMessage</CODE> object is used to send a message that contains a serializable object in the Java
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsStreamMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsStreamMessage.java?rev=748679&r1=748678&r2=748679&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsStreamMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsStreamMessage.java Fri Feb 27 20:12:12 2009
@@ -16,6 +16,13 @@
*/
package org.apache.activeblaze.jms.message;
+import org.apache.activeblaze.BlazeException;
+import org.apache.activeblaze.BlazeRuntimeException;
+import org.apache.activeblaze.jms.BlazeJmsExceptionSupport;
+import org.apache.activeblaze.wire.BlazeData;
+import org.apache.activeblaze.wire.BlazeData.BlazeDataBean;
+import org.apache.activemq.protobuf.Buffer;
+import org.apache.activemq.protobuf.BufferInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -27,14 +34,6 @@
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;
-import org.apache.activeblaze.jms.message.BlazeJmsMessage.JmsMessageType;
-import org.apache.activeblaze.wire.BlazeData;
-import org.apache.activeblaze.wire.BlazeData.BlazeDataBean;
-import org.apache.activemq.protobuf.Buffer;
-import org.apache.activemq.protobuf.BufferInputStream;
/**
* A <CODE>StreamMessage</CODE> object is used to send a stream of primitive types in the Java programming language.
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsTextMessage.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsTextMessage.java?rev=748679&r1=748678&r2=748679&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsTextMessage.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/BlazeJmsTextMessage.java Fri Feb 27 20:12:12 2009
@@ -16,18 +16,18 @@
*/
package org.apache.activeblaze.jms.message;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
import org.apache.activeblaze.BlazeException;
import org.apache.activeblaze.BlazeRuntimeException;
-import org.apache.activeblaze.jms.message.BlazeJmsMessage.JmsMessageType;
+import org.apache.activeblaze.util.BufferOutputStream;
import org.apache.activeblaze.wire.BlazeData.BlazeDataBean;
import org.apache.activemq.protobuf.Buffer;
import org.apache.activemq.protobuf.BufferInputStream;
-import org.apache.activemq.protobuf.BufferOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+
/**
*
Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/MarshallingSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/MarshallingSupport.java?rev=748679&r1=748678&r2=748679&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/MarshallingSupport.java (original)
+++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/message/MarshallingSupport.java Fri Feb 27 20:12:12 2009
@@ -27,7 +27,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
/**
* The fixed version of the UTF8 encoding function. Some older JVM's UTF8
Modified: activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/jms/perf/SimpleTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/jms/perf/SimpleTopicTest.java?rev=748679&r1=748678&r2=748679&view=diff
==============================================================================
--- activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/jms/perf/SimpleTopicTest.java (original)
+++ activemq/activemq-blaze/trunk/src/test/java/org/apache/activeblaze/jms/perf/SimpleTopicTest.java Fri Feb 27 20:12:12 2009
@@ -40,11 +40,11 @@
protected int sampleCount = 20;
protected long sampleInternal = 10000;
protected int numberOfDestinations=1;
- protected int numberOfConsumers = 1;
+ protected int numberOfConsumers = 20;
protected int numberofProducers = 1;
protected int totalNumberOfProducers;
protected int totalNumberOfConsumers;
- protected int playloadSize = 12;
+ protected int playloadSize = 1024;
protected byte[] array;
protected ConnectionFactory factory;
@@ -131,9 +131,9 @@
}
uri += ")";
BlazeJmsConnectionFactory result = new BlazeJmsConnectionFactory();
- result.getConfiguration().setReliableBroadcast("swp");
- result.getConfiguration().setManagementURI("");
- result.getConfiguration().setBroadcastURI(uri);
+ //result.getConfiguration().setReliableBroadcast("swp");
+ //result.getConfiguration().setManagementURI("");
+ //result.getConfiguration().setBroadcastURI(uri);
return result;
}