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 [3/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/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java Tue Jul 29 12:03:34 2008
@@ -18,15 +18,15 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.network.mina;
+package org.apache.qpid.transport.network.mina;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteFuture;
-import org.apache.qpidity.transport.Sender;
-import org.apache.qpidity.transport.TransportException;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.TransportException;
/**
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java Tue Jul 29 12:03:34 2008
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport.network.nio;
+package org.apache.qpid.transport.network.nio;
import java.io.EOFException;
import java.io.IOException;
@@ -11,13 +11,13 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionDelegate;
-import org.apache.qpidity.transport.Receiver;
-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.Connection;
+import org.apache.qpid.transport.ConnectionDelegate;
+import org.apache.qpid.transport.Receiver;
+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;
public class NioHandler implements Runnable
{
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java Tue Jul 29 12:03:34 2008
@@ -1,9 +1,9 @@
-package org.apache.qpidity.transport.network.nio;
+package org.apache.qpid.transport.network.nio;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
-import org.apache.qpidity.transport.Sender;
+import org.apache.qpid.transport.Sender;
public class NioSender implements Sender<java.nio.ByteBuffer>
{
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.util;
+package org.apache.qpid.transport.util;
import java.nio.ByteBuffer;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.util;
+package org.apache.qpid.transport.util;
import org.slf4j.LoggerFactory;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java Tue Jul 29 12:03:34 2008
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.transport.util;
+package org.apache.qpid.transport.util;
import java.nio.ByteBuffer;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java Tue Jul 29 12:03:34 2008
@@ -17,7 +17,7 @@
*/
package org.apache.qpid.url;
-import org.apache.qpidity.exchange.ExchangeDefaults;
+import org.apache.qpid.exchange.ExchangeDefaults;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURL.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURL.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURL.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURL.java Tue Jul 29 12:03:34 2008
@@ -17,7 +17,7 @@
*/
package org.apache.qpid.url;
-import org.apache.qpidity.BrokerDetails;
+import org.apache.qpid.BrokerDetails;
import java.util.List;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java Tue Jul 29 12:03:34 2008
@@ -17,8 +17,8 @@
*/
package org.apache.qpid.url;
-import org.apache.qpidity.BrokerDetails;
-import org.apache.qpidity.BrokerDetailsImpl;
+import org.apache.qpid.BrokerDetails;
+import org.apache.qpid.BrokerDetailsImpl;
import java.net.MalformedURLException;
import java.util.ArrayList;
Modified: incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.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.mina.util.AvailablePortFinder;
import org.apache.qpid.util.concurrent.Condition;
-import org.apache.qpidity.transport.network.io.IoTransport;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.network.io.IoTransport;
+import org.apache.qpid.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.util.Logger;
import junit.framework.TestCase;
Modified: incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java?rev=680803&r1=680787&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.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.Collections;
Modified: incubator/qpid/trunk/qpid/java/log4j-test.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/log4j-test.xml?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/log4j-test.xml (original)
+++ incubator/qpid/trunk/qpid/java/log4j-test.xml Tue Jul 29 12:03:34 2008
@@ -38,10 +38,6 @@
<level value="${amqj.logging.level}"/>
</logger>
- <logger name="org.apache.qpidity">
- <level value="${amqj.logging.level}"/>
- </logger>
-
<logger name="qpid.protocol">
<level value="${amqj.protocol.logging.level}"/>
</logger>
Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java Tue Jul 29 12:03:34 2008
@@ -21,7 +21,7 @@
package org.apache.qpid.test.unit.client.connection;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java Tue Jul 29 12:03:34 2008
@@ -17,7 +17,7 @@
*/
package org.apache.qpid.test.unit.xa;
-import org.apache.qpidity.dtx.XidImpl;
+import org.apache.qpid.dtx.XidImpl;
import org.apache.qpid.test.utils.QpidTestCase;
import javax.transaction.xa.Xid;
Modified: incubator/qpid/trunk/qpid/java/testkit/etc/test.log4j
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/testkit/etc/test.log4j?rev=680803&r1=680802&r2=680803&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/testkit/etc/test.log4j (original)
+++ incubator/qpid/trunk/qpid/java/testkit/etc/test.log4j Tue Jul 29 12:03:34 2008
@@ -21,9 +21,6 @@
log4j.logger.org.apache.qpid=ERROR, console
log4j.additivity.org.apache.qpid=false
-log4j.logger.org.apache.qpidity=TRACE, console
-log4j.additivity.org.apache.qpidity=false
-
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.Threshold=all
log4j.appender.console.layout=org.apache.log4j.PatternLayout