You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2008/07/29 21:03:40 UTC
svn commit: r680803 [2/3] - in /incubator/qpid/trunk/qpid/java: ./ client/
client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/
client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/
client/example/src/main/java/or...
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java Tue Jul 29 12:03:34 2008
@@ -1,18 +1,18 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
import java.io.FileInputStream;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.FileMessage;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.FileMessage;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
import java.util.UUID;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java Tue Jul 29 12:03:34 2008
@@ -1,24 +1,24 @@
-package org.apache.qpidity.nclient.interop;
+package org.apache.qpid.nclient.interop;
import java.util.HashMap;
import java.util.Map;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.MessageFlowMode;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.RangeSet;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageFlowMode;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.RangeSet;
public class BasicInteropTest implements ClosedListener
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java Tue Jul 29 12:03:34 2008
@@ -1,14 +1,14 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
/**
* <p>A Simple implementation of the message interface
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
import java.io.EOFException;
import java.io.FileInputStream;
@@ -7,10 +7,10 @@
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
/**
* FileMessage provides pull style semantics for
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java Tue Jul 29 12:03:34 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.api.Message;
/**
*A message listener
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java Tue Jul 29 12:03:34 2008
@@ -1,12 +1,12 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.nclient.MessagePartListener;
/**
* This is a simple message assembler.
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java Tue Jul 29 12:03:34 2008
@@ -1,10 +1,10 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.api.Message;
public abstract class ReadOnlyMessage implements Message
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java Tue Jul 29 12:03:34 2008
@@ -1,14 +1,14 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
public class StreamingMessage extends ReadOnlyMessage implements Message
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java Tue Jul 29 12:03:34 2008
@@ -15,9 +15,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.njms;
+package org.apache.qpid.njms;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import javax.jms.JMSException;
import javax.transaction.xa.XAException;
Modified: incubator/qpid/trunk/qpid/java/common/Composite.tpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/Composite.tpl?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/Composite.tpl (original)
+++ incubator/qpid/trunk/qpid/java/common/Composite.tpl Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -6,12 +6,12 @@
import java.util.Map;
import java.util.UUID;
-import org.apache.qpidity.transport.codec.Decoder;
-import org.apache.qpidity.transport.codec.Encodable;
-import org.apache.qpidity.transport.codec.Encoder;
-import org.apache.qpidity.transport.codec.Validator;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encodable;
+import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.transport.codec.Validator;
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
${
from genutil import *
Modified: incubator/qpid/trunk/qpid/java/common/Constant.tpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/Constant.tpl?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/Constant.tpl (original)
+++ incubator/qpid/trunk/qpid/java/common/Constant.tpl Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
${from genutil import *}
Modified: incubator/qpid/trunk/qpid/java/common/Enum.tpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/Enum.tpl?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/Enum.tpl (original)
+++ incubator/qpid/trunk/qpid/java/common/Enum.tpl Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
public enum $name {
${
Modified: incubator/qpid/trunk/qpid/java/common/Invoker.tpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/Invoker.tpl?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/Invoker.tpl (original)
+++ incubator/qpid/trunk/qpid/java/common/Invoker.tpl Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.util.List;
import java.util.Map;
Modified: incubator/qpid/trunk/qpid/java/common/MethodDelegate.tpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/MethodDelegate.tpl?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/MethodDelegate.tpl (original)
+++ incubator/qpid/trunk/qpid/java/common/MethodDelegate.tpl Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
public abstract class MethodDelegate<C> {
Modified: incubator/qpid/trunk/qpid/java/common/Option.tpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/Option.tpl?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/Option.tpl (original)
+++ incubator/qpid/trunk/qpid/java/common/Option.tpl Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
public enum Option {
Modified: incubator/qpid/trunk/qpid/java/common/StructFactory.tpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/StructFactory.tpl?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/StructFactory.tpl (original)
+++ incubator/qpid/trunk/qpid/java/common/StructFactory.tpl Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
class StructFactory {
Modified: incubator/qpid/trunk/qpid/java/common/Type.tpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/Type.tpl?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/Type.tpl (original)
+++ incubator/qpid/trunk/qpid/java/common/Type.tpl Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
${from genutil import *}
Modified: incubator/qpid/trunk/qpid/java/common/codegen
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/codegen?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/codegen (original)
+++ incubator/qpid/trunk/qpid/java/common/codegen Tue Jul 29 12:03:34 2008
@@ -7,7 +7,7 @@
out_dir = sys.argv[1]
spec_file = sys.argv[2]
tpl_dir = sys.argv[3]
-pkg_dir = os.path.join(out_dir, "org/apache/qpidity/transport")
+pkg_dir = os.path.join(out_dir, "org/apache/qpid/transport")
if not os.path.exists(pkg_dir):
os.makedirs(pkg_dir)
Modified: incubator/qpid/trunk/qpid/java/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/pom.xml?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/pom.xml Tue Jul 29 12:03:34 2008
@@ -61,7 +61,7 @@
<!-- <exec executable="python">
<arg line="generate"/>
<arg line="${generated.path}"/>
- <arg line="org.apache.qpidity"/>
+ <arg line="org.apache.qpid"/>
<arg line="${specs.dir}/amqp-transitional.0-10.xml"/>
</exec> -->
</tasks>
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties Tue Jul 29 12:03:34 2008
@@ -23,8 +23,6 @@
log4j.additivity.qpid.protocol=false
log4j.logger.org.apache.qpid=${amqj.logging.level}, console
log4j.additivity.org.apache.qpid=false
-log4j.logger.org.apache.qpidity=${amqj.logging.level}, console
-log4j.additivity.org.apache.qpidity=false
log4j.appender.console=org.apache.log4j.ConsoleAppender
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetails.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetails.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetails.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetails.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetails.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetails.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetails.java Tue Jul 29 12:03:34 2008
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity;
+package org.apache.qpid;
import java.util.Map;
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetailsImpl.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetailsImpl.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/BrokerDetailsImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java Tue Jul 29 12:03:34 2008
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity;
+package org.apache.qpid;
import java.util.HashMap;
import java.util.Map;
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ConsoleOutput.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ConsoleOutput.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ConsoleOutput.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java Tue Jul 29 12:03:34 2008
@@ -18,13 +18,13 @@
* under the License.
*
*/
-package org.apache.qpidity;
+package org.apache.qpid;
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.Sender;
+import org.apache.qpid.transport.Sender;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
/**
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ErrorCode.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ErrorCode.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ErrorCode.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ErrorCode.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ErrorCode.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ErrorCode.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ErrorCode.java Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity;
+package org.apache.qpid;
public enum ErrorCode
{
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidConfig.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidConfig.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidConfig.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity;
+package org.apache.qpid;
/**
* API to configure the Security parameters of the client.
@@ -11,11 +11,11 @@
private static QpidConfig _instance = new QpidConfig();
private SecurityMechanism[] securityMechanisms =
- new SecurityMechanism[]{new SecurityMechanism("PLAIN","org.apache.qpidity.security.UsernamePasswordCallbackHandler"),
- new SecurityMechanism("CRAM_MD5","org.apache.qpidity.security.UsernamePasswordCallbackHandler")};
+ new SecurityMechanism[]{new SecurityMechanism("PLAIN","org.apache.qpid.security.UsernamePasswordCallbackHandler"),
+ new SecurityMechanism("CRAM_MD5","org.apache.qpid.security.UsernamePasswordCallbackHandler")};
private SaslClientFactory[] saslClientFactories =
- new SaslClientFactory[]{new SaslClientFactory("AMQPLAIN","org.apache.qpidity.security.amqplain.AmqPlainSaslClientFactory")};
+ new SaslClientFactory[]{new SaslClientFactory("AMQPLAIN","org.apache.qpid.security.amqplain.AmqPlainSaslClientFactory")};
private QpidConfig(){}
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidException.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidException.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidException.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidException.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidException.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/QpidException.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/QpidException.java Tue Jul 29 12:03:34 2008
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity;
+package org.apache.qpid;
public class QpidException extends Exception
{
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/SecurityHelper.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/SecurityHelper.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/SecurityHelper.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/SecurityHelper.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/SecurityHelper.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/SecurityHelper.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/SecurityHelper.java Tue Jul 29 12:03:34 2008
@@ -18,15 +18,15 @@
* under the License.
*
*/
-package org.apache.qpidity;
+package org.apache.qpid;
import java.io.UnsupportedEncodingException;
import java.util.HashSet;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.qpidity.security.AMQPCallbackHandler;
-import org.apache.qpidity.security.CallbackHandlerRegistry;
+import org.apache.qpid.security.AMQPCallbackHandler;
+import org.apache.qpid.security.CallbackHandlerRegistry;
public class SecurityHelper
{
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java Tue Jul 29 12:03:34 2008
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpidity;
+package org.apache.qpid;
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.network.mina.MinaHandler;
-import static org.apache.qpidity.transport.util.Functions.str;
+import static org.apache.qpid.transport.util.Functions.str;
import java.io.IOException;
import java.nio.ByteBuffer;
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java Tue Jul 29 12:03:34 2008
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpidity;
+package org.apache.qpid;
import java.util.*;
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.network.mina.MinaHandler;
/**
Copied: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.java (from r680787, incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyExchange.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.java?p2=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.java&p1=incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyExchange.java&r1=680787&r2=680803&rev=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyExchange.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.java Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity;
+package org.apache.qpid;
import java.util.ArrayList;
import java.util.HashMap;
@@ -9,7 +9,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.qpidity.ToyBroker.Message;
+import org.apache.qpid.ToyBroker.Message;
public class ToyExchange
{
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/api/Message.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/api/Message.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/api/Message.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/api/Message.java Tue Jul 29 12:03:34 2008
@@ -1,11 +1,11 @@
-package org.apache.qpidity.api;
+package org.apache.qpid.api;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.Header;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.Header;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java Tue Jul 29 12:03:34 2008
@@ -15,11 +15,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.dtx;
+package org.apache.qpid.dtx;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
import javax.transaction.xa.Xid;
@@ -241,9 +241,9 @@
* @return The String representation of this Xid
* @throws QpidException In case of problem when converting this Xid into a string.
*/
- public static org.apache.qpidity.transport.Xid convert(Xid xid) throws QpidException
+ public static org.apache.qpid.transport.Xid convert(Xid xid) throws QpidException
{
- return new org.apache.qpidity.transport.Xid(xid.getFormatId(),
+ return new org.apache.qpid.transport.Xid(xid.getFormatId(),
xid.getGlobalTransactionId(),
xid.getBranchQualifier());
}
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
import javax.security.auth.callback.CallbackHandler;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java Tue Jul 29 12:03:34 2008
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
import java.util.HashMap;
import java.util.Map;
-import org.apache.qpidity.QpidConfig;
+import org.apache.qpid.QpidConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
import java.security.Security;
import java.util.Map;
@@ -26,7 +26,7 @@
import javax.security.sasl.SaslClientFactory;
-import org.apache.qpidity.QpidConfig;
+import org.apache.qpid.QpidConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
import java.security.Provider;
import java.security.Security;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
import java.io.IOException;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.security.amqplain;
+package org.apache.qpid.security.amqplain;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.FieldTableFactory;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.security.amqplain;
+package org.apache.qpid.security.amqplain;
import javax.security.sasl.SaslClientFactory;
import javax.security.sasl.SaslClient;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Channel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Channel.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Channel.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Channel.java Tue Jul 29 12:03:34 2008
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.network.Frame;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.transport.util.Logger;
import java.nio.ByteBuffer;
@@ -30,8 +30,8 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import static org.apache.qpidity.transport.network.Frame.*;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.network.Frame.*;
+import static org.apache.qpid.transport.util.Functions.*;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ChannelDelegate.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ChannelDelegate.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ChannelDelegate.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ChannelDelegate.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.util.UUID;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java Tue Jul 29 12:03:34 2008
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
import java.util.ArrayList;
import java.util.HashMap;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java Tue Jul 29 12:03:34 2008
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
-import org.apache.qpidity.SecurityHelper;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.SecurityHelper;
+import org.apache.qpid.QpidException;
import java.io.UnsupportedEncodingException;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Data.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Data.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Data.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Data.java Tue Jul 29 12:03:34 2008
@@ -18,15 +18,15 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
import java.nio.ByteBuffer;
import java.util.Collections;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Echo.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Echo.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Echo.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Echo.java Tue Jul 29 12:03:34 2008
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.network.mina.MinaHandler;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java Tue Jul 29 12:03:34 2008
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.codec.Decoder;
-import org.apache.qpidity.transport.codec.Encoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java Tue Jul 29 12:03:34 2008
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
import java.util.List;
import java.nio.ByteBuffer;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java Tue Jul 29 12:03:34 2008
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
/**
* Method
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java Tue Jul 29 12:03:34 2008
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.network.NetworkDelegate;
-import org.apache.qpidity.transport.network.NetworkEvent;
+import org.apache.qpid.transport.network.NetworkDelegate;
+import org.apache.qpid.transport.network.NetworkEvent;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java Tue Jul 29 12:03:34 2008
@@ -18,13 +18,13 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.network.NetworkDelegate;
-import org.apache.qpidity.transport.network.NetworkEvent;
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.NetworkDelegate;
+import org.apache.qpid.transport.network.NetworkEvent;
+import org.apache.qpid.transport.network.Frame;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.util.Iterator;
import java.util.ListIterator;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Result.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Result.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Result.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Result.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java Tue Jul 29 12:03:34 2008
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -33,8 +33,8 @@
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import static org.apache.qpidity.transport.Option.*;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.Option.*;
+import static org.apache.qpid.transport.util.Functions.*;
import static org.apache.qpid.util.Serial.*;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java Tue Jul 29 12:03:34 2008
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.util.List;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java Tue Jul 29 12:03:34 2008
@@ -18,14 +18,14 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
import java.util.List;
import java.util.Map;
-import org.apache.qpidity.transport.codec.Decoder;
-import org.apache.qpidity.transport.codec.Encodable;
-import org.apache.qpidity.transport.codec.Encoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encodable;
+import org.apache.qpid.transport.codec.Encoder;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
import java.io.UnsupportedEncodingException;
@@ -29,12 +29,12 @@
import java.util.Map;
import java.util.UUID;
-import org.apache.qpidity.transport.Binary;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.Type;
+import org.apache.qpid.transport.Binary;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.Type;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
import java.io.UnsupportedEncodingException;
@@ -31,12 +31,12 @@
import java.util.Map;
import java.util.UUID;
-import org.apache.qpidity.transport.Range;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.Type;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.Type;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java Tue Jul 29 12:03:34 2008
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.qpidity.transport.Binary;
+import org.apache.qpid.transport.Binary;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java Tue Jul 29 12:03:34 2008
@@ -18,14 +18,14 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java Tue Jul 29 12:03:34 2008
@@ -18,14 +18,14 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Validator.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Validator.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Validator.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Validator.java Tue Jul 29 12:03:34 2008
@@ -18,14 +18,14 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
import java.util.ArrayList;
import java.util.HashMap;
@@ -27,18 +27,18 @@
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.codec.BBDecoder;
-import org.apache.qpidity.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.BBDecoder;
+import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpidity.transport.Data;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.transport.Method;
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolEvent;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.SegmentType;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.Data;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.Method;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolEvent;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.transport.Struct;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java Tue Jul 29 12:03:34 2008
@@ -18,25 +18,25 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
-import org.apache.qpidity.transport.codec.BBEncoder;
+import org.apache.qpid.transport.codec.BBEncoder;
-import org.apache.qpidity.transport.Data;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.transport.Method;
-import org.apache.qpidity.transport.ProtocolDelegate;
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolEvent;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.SegmentType;
-import org.apache.qpidity.transport.Sender;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.Data;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.Method;
+import org.apache.qpid.transport.ProtocolDelegate;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolEvent;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.Struct;
import java.nio.ByteBuffer;
import java.util.Iterator;
-import static org.apache.qpidity.transport.network.Frame.*;
+import static org.apache.qpid.transport.network.Frame.*;
import static java.lang.Math.*;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java Tue Jul 29 12:03:34 2008
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
-import org.apache.qpidity.transport.SegmentType;
-import org.apache.qpidity.transport.util.SliceIterator;
+import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.transport.util.SliceIterator;
import java.nio.ByteBuffer;
@@ -29,7 +29,7 @@
import java.util.List;
import java.util.Iterator;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java Tue Jul 29 12:03:34 2008
@@ -18,19 +18,19 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.SegmentType;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.SegmentType;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
-import static org.apache.qpidity.transport.network.InputHandler.State.*;
+import static org.apache.qpid.transport.network.InputHandler.State.*;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java Tue Jul 29 12:03:34 2008
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolHeader;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolHeader;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/OutputHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/OutputHandler.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/OutputHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/OutputHandler.java Tue Jul 29 12:03:34 2008
@@ -18,19 +18,19 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.qpidity.transport.Constant;
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.Sender;
+import org.apache.qpid.transport.Constant;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.Sender;
-import static org.apache.qpidity.transport.network.Frame.*;
+import static org.apache.qpid.transport.network.Frame.*;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java Tue Jul 29 12:03:34 2008
@@ -18,11 +18,11 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network.io;
+package org.apache.qpid.transport.network.io;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.TransportException;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.transport.util.Logger;
import java.io.InputStream;
import java.io.IOException;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java Tue Jul 29 12:03:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.transport.network.io;
+package org.apache.qpid.transport.network.io;
import java.io.IOException;
import java.io.OutputStream;
@@ -26,11 +26,11 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.qpidity.transport.Sender;
-import org.apache.qpidity.transport.TransportException;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.transport.util.Logger;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
final class IoSender extends Thread implements Sender<ByteBuffer>
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java Tue Jul 29 12:03:34 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.qpidity.transport.network.io;
+package org.apache.qpid.transport.network.io;
import java.io.IOException;
import java.net.InetAddress;
@@ -26,15 +26,15 @@
import java.net.SocketException;
import java.nio.ByteBuffer;
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionDelegate;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.TransportException;
-import org.apache.qpidity.transport.network.Assembler;
-import org.apache.qpidity.transport.network.Disassembler;
-import org.apache.qpidity.transport.network.InputHandler;
-import org.apache.qpidity.transport.network.OutputHandler;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.ConnectionDelegate;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.transport.network.Assembler;
+import org.apache.qpid.transport.network.Disassembler;
+import org.apache.qpid.transport.network.InputHandler;
+import org.apache.qpid.transport.network.OutputHandler;
+import org.apache.qpid.transport.util.Logger;
/**
* This class provides a socket based transport using the java.io
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network.mina;
+package org.apache.qpid.transport.network.mina;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -33,20 +33,20 @@
import org.apache.mina.filter.WriteBufferLimitFilterBuilder;
import org.apache.mina.filter.executor.ExecutorFilter;
-import org.apache.qpidity.transport.Binding;
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionDelegate;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.Sender;
-
-import org.apache.qpidity.transport.util.Logger;
-
-import org.apache.qpidity.transport.network.Assembler;
-import org.apache.qpidity.transport.network.Disassembler;
-import org.apache.qpidity.transport.network.InputHandler;
-import org.apache.qpidity.transport.network.OutputHandler;
+import org.apache.qpid.transport.Binding;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.ConnectionDelegate;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.Sender;
+
+import org.apache.qpid.transport.util.Logger;
+
+import org.apache.qpid.transport.network.Assembler;
+import org.apache.qpid.transport.network.Disassembler;
+import org.apache.qpid.transport.network.InputHandler;
+import org.apache.qpid.transport.network.OutputHandler;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
/**
* MinaHandler