Author: rhs
Date: Thu Oct 4 10:44:59 2007
New Revision: 581973
URL: http://svn.apache.org/viewvc?rev=581973&view=rev
Log:
moved codec --> transport.codec to avoid conflicts with qpid namespace
Added:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/
- copied from r581919,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/AbstractDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/AbstractEncoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/BBDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/BBEncoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Decoder.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Decoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encodable.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Encodable.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encoder.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Encoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/FragmentDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
- copied, changed from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/SizeEncoder.java
Removed:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/
Modified:
incubator/qpid/trunk/qpid/java/common/generate
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Struct.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
Modified: incubator/qpid/trunk/qpid/java/common/generate
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/generate?rev=581973&r1=581972&r2=581973&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/generate (original)
+++ incubator/qpid/trunk/qpid/java/common/generate Thu Oct 4 10:44:59 2007
@@ -25,9 +25,9 @@
self.line("import java.util.Map;")
self.line("import java.util.UUID;")
self.line()
- self.line("import org.apache.qpidity.codec.Decoder;")
- self.line("import org.apache.qpidity.codec.Encodable;")
- self.line("import org.apache.qpidity.codec.Encoder;")
+ self.line("import org.apache.qpidity.transport.codec.Decoder;")
+ self.line("import org.apache.qpidity.transport.codec.Encodable;")
+ self.line("import org.apache.qpidity.transport.codec.Encoder;")
self.line()
self.line("import org.apache.qpidity.transport.network.Frame;")
self.line()
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Struct.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Struct.java?rev=581973&r1=581972&r2=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Struct.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Struct.java
Thu Oct 4 10:44:59 2007
@@ -20,7 +20,7 @@
*/
package org.apache.qpidity.transport;
-import org.apache.qpidity.codec.Encodable;
+import org.apache.qpidity.transport.codec.Encodable;
/**
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/AbstractDecoder.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/AbstractDecoder.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/AbstractDecoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
import java.util.ArrayList;
import java.util.LinkedHashMap;
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/AbstractEncoder.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/AbstractEncoder.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/AbstractEncoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
import java.nio.ByteBuffer;
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/BBDecoder.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/BBDecoder.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/BBDecoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
import java.nio.ByteBuffer;
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/BBEncoder.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/BBEncoder.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/BBEncoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
import java.nio.ByteBuffer;
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Decoder.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Decoder.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Decoder.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Decoder.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Decoder.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Decoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Decoder.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
import java.util.List;
import java.util.Map;
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encodable.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Encodable.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encodable.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encodable.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Encodable.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Encodable.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encodable.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
/**
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encoder.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Encoder.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encoder.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encoder.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Encoder.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/Encoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/Encoder.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
import java.util.List;
import java.util.Map;
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/FragmentDecoder.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/FragmentDecoder.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/FragmentDecoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
Copied:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
(from r581972,
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/SizeEncoder.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/SizeEncoder.java&r1=581972&r2=581973&rev=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/codec/SizeEncoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
Thu Oct 4 10:44:59 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.codec;
+package org.apache.qpidity.transport.codec;
import java.nio.ByteBuffer;
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java?rev=581973&r1=581972&r2=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
Thu Oct 4 10:44:59 2007
@@ -27,7 +27,7 @@
import java.nio.ByteBuffer;
-import org.apache.qpidity.codec.FragmentDecoder;
+import org.apache.qpidity.transport.codec.FragmentDecoder;
import org.apache.qpidity.transport.ConnectionEvent;
import org.apache.qpidity.transport.Data;
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java?rev=581973&r1=581972&r2=581973&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
Thu Oct 4 10:44:59 2007
@@ -20,8 +20,8 @@
*/
package org.apache.qpidity.transport.network;
-import org.apache.qpidity.codec.BBEncoder;
-import org.apache.qpidity.codec.SizeEncoder;
+import org.apache.qpidity.transport.codec.BBEncoder;
+import org.apache.qpidity.transport.codec.SizeEncoder;
import org.apache.qpidity.transport.ConnectionEvent;
import org.apache.qpidity.transport.Data;
