activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r470398 [5/5] - in /incubator/activemq/trunk/activemq-core/src: main/java/org/apache/activemq/openwire/ main/java/org/apache/activemq/openwire/v1/ main/java/org/apache/activemq/openwire/v2/ main/java/org/apache/activemq/transport/stomp/ mai...
Date Thu, 02 Nov 2006 15:50:11 GMT
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ReplayCommand info = (ReplayCommand)o;
@@ -91,7 +91,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ReplayCommand info = (ReplayCommand)o;
@@ -107,7 +107,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ReplayCommand info = (ReplayCommand)o;
@@ -120,7 +120,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         ReplayCommand info = (ReplayCommand)o;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         Response info = (Response)o;
@@ -90,7 +90,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         Response info = (Response)o;
@@ -105,7 +105,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         Response info = (Response)o;
@@ -117,7 +117,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         Response info = (Response)o;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         SessionId info = (SessionId)o;
@@ -93,7 +93,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         SessionId info = (SessionId)o;
@@ -109,7 +109,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         SessionId info = (SessionId)o;
@@ -122,7 +122,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         SessionId info = (SessionId)o;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         SessionInfo info = (SessionInfo)o;
@@ -91,7 +91,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         SessionInfo info = (SessionInfo)o;
@@ -106,7 +106,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         SessionInfo info = (SessionInfo)o;
@@ -118,7 +118,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         SessionInfo info = (SessionInfo)o;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
@@ -85,7 +85,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
     }
@@ -97,7 +97,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
     }
@@ -106,7 +106,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         super.looseMarshal(wireFormat, o, dataOut);
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         SubscriptionInfo info = (SubscriptionInfo)o;
@@ -97,7 +97,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         SubscriptionInfo info = (SubscriptionInfo)o;
@@ -115,7 +115,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         SubscriptionInfo info = (SubscriptionInfo)o;
@@ -130,7 +130,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         SubscriptionInfo info = (SubscriptionInfo)o;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -47,7 +47,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
@@ -70,7 +70,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
     }
@@ -82,7 +82,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
     }
@@ -91,7 +91,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         super.looseMarshal(wireFormat, o, dataOut);
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         TransactionInfo info = (TransactionInfo)o;
@@ -94,7 +94,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         TransactionInfo info = (TransactionInfo)o;
@@ -111,7 +111,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         TransactionInfo info = (TransactionInfo)o;
@@ -125,7 +125,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         TransactionInfo info = (TransactionInfo)o;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         WireFormatInfo info = (WireFormatInfo)o;
@@ -101,7 +101,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         WireFormatInfo info = (WireFormatInfo)o;
@@ -120,7 +120,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         WireFormatInfo info = (WireFormatInfo)o;
@@ -139,7 +139,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         WireFormatInfo info = (WireFormatInfo)o;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java
Thu Nov  2 07:49:58 2006
@@ -18,8 +18,8 @@
 
 package org.apache.activemq.openwire.v2;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.openwire.*;
@@ -62,7 +62,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn,
BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream
bs) throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         XATransactionId info = (XATransactionId)o;
@@ -94,7 +94,7 @@
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut,
BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream
bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         XATransactionId info = (XATransactionId)o;
@@ -111,7 +111,7 @@
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn)
throws IOException {
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws
IOException {
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         XATransactionId info = (XATransactionId)o;
@@ -125,7 +125,7 @@
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut)
throws IOException {
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws
IOException {
 
         XATransactionId info = (XATransactionId)o;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
Thu Nov  2 07:49:58 2006
@@ -17,7 +17,9 @@
  */
 package org.apache.activemq.transport.stomp;
 
+import java.io.DataInput;
 import java.io.DataInputStream;
+import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
@@ -58,7 +60,7 @@
         return unmarshal(dis);
     }
 
-    public void marshal(Object command, DataOutputStream os) throws IOException {
+    public void marshal(Object command, DataOutput os) throws IOException {
 		StompFrame stomp = (org.apache.activemq.transport.stomp.StompFrame) command;
 
 		StringBuffer buffer = new StringBuffer();
@@ -83,7 +85,7 @@
 	}
     
 
-    public Object unmarshal(DataInputStream in) throws IOException {
+    public Object unmarshal(DataInput in) throws IOException {
         	
         try {
 			String action = null;
@@ -179,7 +181,7 @@
 
     }
 
-    private String readLine(DataInputStream in, int maxLength, String errorMessage) throws
IOException {
+    private String readLine(DataInput in, int maxLength, String errorMessage) throws IOException
{
         byte b;
         ByteArrayOutputStream baos=new ByteArrayOutputStream(maxLength);
         while ((b = in.readByte()) != '\n') {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java
Thu Nov  2 07:49:58 2006
@@ -17,10 +17,14 @@
  */
 package org.apache.activemq.wireformat;
 
+import java.io.DataInput;
 import java.io.DataInputStream;
+import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectOutputStream;
+import java.io.OutputStream;
 
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.activemq.util.ByteArrayOutputStream;
@@ -46,16 +50,16 @@
         return unmarshal(new DataInputStream(new ByteArrayInputStream(packet)));
     }
 
-    public void marshal(Object command, DataOutputStream ds) throws IOException {
-        ObjectOutputStream out = new ObjectOutputStream(ds);
+    public void marshal(Object command, DataOutput ds) throws IOException {
+        ObjectOutputStream out = new ObjectOutputStream((OutputStream)ds);
         out.writeObject(command);
         out.flush();
         out.reset();
     }
 
-    public Object unmarshal(DataInputStream ds) throws IOException {
+    public Object unmarshal(DataInput ds) throws IOException {
         try {
-            ClassLoadingAwareObjectInputStream in = new ClassLoadingAwareObjectInputStream(ds);
+            ClassLoadingAwareObjectInputStream in = new ClassLoadingAwareObjectInputStream((InputStream)ds);
             Object command;
             command = in.readObject();
             in.close();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java
Thu Nov  2 07:49:58 2006
@@ -17,8 +17,8 @@
  */
 package org.apache.activemq.wireformat;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.activemq.util.ByteSequence;
@@ -45,12 +45,12 @@
     /**
      * Stream based marshaling 
      */
-    void marshal(Object command, DataOutputStream out) throws IOException;
+    void marshal(Object command, DataOutput out) throws IOException;
     
     /**
      * Packet based un-marshaling 
      */
-    Object unmarshal(DataInputStream in) throws IOException;
+    Object unmarshal(DataInput in) throws IOException;
     
     /**
      * @param the version of the wire format

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java?view=diff&rev=470398&r1=470397&r2=470398
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java
Thu Nov  2 07:49:58 2006
@@ -58,7 +58,7 @@
         info.setMaximumPendingMessageLimit(2);
         info.setDispatchAsync(false);
         info.setSelector("Selector:3");
-        info.setSubscriptionName("SubcriptionName:4");
+        info.setSubscriptionName("SubscriptionName:4");
         info.setNoLocal(true);
         info.setExclusive(false);
         info.setRetroactive(true);



Mime
View raw message