activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r380778 [2/2] - in /incubator/activemq/trunk/activemq-core: ./ src/main/java/org/apache/activemq/command/ src/main/java/org/apache/activemq/openwire/v1/ src/test/java/org/apache/activemq/openwire/v1/
Date Fri, 24 Feb 2006 18:45:04 GMT
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for SubscriptionInfo
+ * Marshalling code for Open Wire Format for SubscriptionInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -65,7 +65,7 @@
 
         SubscriptionInfo info = (SubscriptionInfo)o;
         info.setClientId(readString(dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat,
dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn,
bs));
         info.setSelector(readString(dataIn, bs));
         info.setSubcriptionName(readString(dataIn, bs));
 
@@ -85,7 +85,7 @@
         rc += writeString(info.getSelector(), bs);
         rc += writeString(info.getSubcriptionName(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for TransactionId
+ * Marshalling code for Open Wire Format for TransactionIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -58,7 +58,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for TransactionInfo
+ * Marshalling code for Open Wire Format for TransactionInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,8 +64,8 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat,
dataIn, bs));
-        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat,
dataIn, bs));
+        info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setType(dataIn.readByte());
 
     }
@@ -82,8 +82,7 @@
         rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs);
         rc += marshal1CachedObject(wireFormat, info.getTransactionId(), bs);
         
-
-        return rc+1;
+        return rc + 1;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for WireFormatInfo
+ * Marshalling code for Open Wire Format for WireFormatInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -65,13 +65,15 @@
 
         WireFormatInfo info = (WireFormatInfo)o;
         {
-        		byte data[] = new byte[8];
-        		dataIn.readFully(data);
-        		info.setMagic(data);
-    		}
-    		
+            byte data[] = new byte[8];
+            dataIn.readFully(data);
+            info.setMagic(data);
+        }
         info.setVersion(dataIn.readInt());
-        info.setOptions(dataIn.readInt());
+        info.setCacheEnabled(bs.readBoolean());
+        info.setCompressionEnabled(bs.readBoolean());
+        info.setStackTraceEnabled(bs.readBoolean());
+        info.setTcpNoDelayEnabled(bs.readBoolean());
 
     }
 
@@ -84,11 +86,12 @@
         WireFormatInfo info = (WireFormatInfo)o;
 
         int rc = super.marshal1(wireFormat, o, bs);
-        
-        
-        
+                        bs.writeBoolean(info.isCacheEnabled());
+        bs.writeBoolean(info.isCompressionEnabled());
+        bs.writeBoolean(info.isStackTraceEnabled());
+        bs.writeBoolean(info.isTcpNoDelayEnabled());
 
-        return rc+16;
+        return rc + 9;
     }
 
     /**
@@ -104,7 +107,10 @@
         WireFormatInfo info = (WireFormatInfo)o;
         dataOut.write(info.getMagic(), 0, 8);
         dataOut.writeInt(info.getVersion());
-        dataOut.writeInt(info.getOptions());
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for XATransactionId
+ * Marshalling code for Open Wire Format for XATransactionIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -65,28 +65,22 @@
 
         XATransactionId info = (XATransactionId)o;
         info.setFormatId(dataIn.readInt());
-        {
-        		if( bs.readBoolean() ) {
-	        		int size = dataIn.readInt();
-	        		byte data[] = new byte[size];
-	        		dataIn.readFully(data);
-	        		info.setGlobalTransactionId(data);
-        		} else {
-	        		info.setGlobalTransactionId(null);
-        		}
+        if( bs.readBoolean() ) {
+            int size = dataIn.readInt();
+            byte data[] = new byte[size];
+            dataIn.readFully(data);
+            info.setGlobalTransactionId(data);
+            } else {
+            info.setGlobalTransactionId(null);
         }
-    		
-        {
-        		if( bs.readBoolean() ) {
-	        		int size = dataIn.readInt();
-	        		byte data[] = new byte[size];
-	        		dataIn.readFully(data);
-	        		info.setBranchQualifier(data);
-        		} else {
-	        		info.setBranchQualifier(null);
-        		}
+        if( bs.readBoolean() ) {
+            int size = dataIn.readInt();
+            byte data[] = new byte[size];
+            dataIn.readFully(data);
+            info.setBranchQualifier(data);
+            } else {
+            info.setBranchQualifier(null);
         }
-    		
 
     }
 
@@ -99,17 +93,12 @@
         XATransactionId info = (XATransactionId)o;
 
         int rc = super.marshal1(wireFormat, o, bs);
-        
-        
-		bs.writeBoolean(info.getGlobalTransactionId()!=null);
-		rc += info.getGlobalTransactionId()==null ? 0 : info.getGlobalTransactionId().length+4;
-		
-        
-		bs.writeBoolean(info.getBranchQualifier()!=null);
-		rc += info.getBranchQualifier()==null ? 0 : info.getBranchQualifier().length+4;
-		
+                bs.writeBoolean(info.getGlobalTransactionId()!=null);
+        rc += info.getGlobalTransactionId()==null ? 0 : info.getGlobalTransactionId().length+4;
+        bs.writeBoolean(info.getBranchQualifier()!=null);
+        rc += info.getBranchQualifier()==null ? 0 : info.getBranchQualifier().length+4;
 
-        return rc+4;
+        return rc + 1;
     }
 
     /**
@@ -124,18 +113,14 @@
 
         XATransactionId info = (XATransactionId)o;
         dataOut.writeInt(info.getFormatId());
-        
-		if(bs.readBoolean()) { 
-			dataOut.writeInt(info.getGlobalTransactionId().length);
-			dataOut.write(info.getGlobalTransactionId());
-		}
-		
-        
-		if(bs.readBoolean()) { 
-			dataOut.writeInt(info.getBranchQualifier().length);
-			dataOut.write(info.getBranchQualifier());
-		}
-		
+        if(bs.readBoolean()) {
+           dataOut.writeInt(info.getGlobalTransactionId().length);
+           dataOut.write(info.getGlobalTransactionId());
+        }
+        if(bs.readBoolean()) {
+           dataOut.writeInt(info.getBranchQualifier().length);
+           dataOut.write(info.getBranchQualifier());
+        }
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
Fri Feb 24 10:45:01 2006
@@ -51,7 +51,10 @@
     		super.populateObject(object);
     		WireFormatInfo info = (WireFormatInfo) object;
         info.setVersion(1);
-        info.setOptions(2);
+        info.setCacheEnabled(true);
+        info.setCompressionEnabled(false);
+        info.setStackTraceEnabled(true);
+        info.setTcpNoDelayEnabled(false);
 
             }
         }



Mime
View raw message