Author: rgreig
Date: Thu Oct 12 13:01:58 2006
New Revision: 463403
URL: http://svn.apache.org/viewvc?view=rev&rev=463403
Log:
QPID-18. Removed unused experimental code that had direct dependencies on
MINA-0.9.5 and upgraded to MINA-1.1.0 snapshot.
Added:
incubator/qpid/trunk/qpid/java/common/lib/backport-util-concurrent/
incubator/qpid/trunk/qpid/java/common/lib/backport-util-concurrent/backport-util-concurrent-2.2.jar
(with props)
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-core-1.1.0-SNAPSHOT.jar
(with props)
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-filter-ssl-1.1.0-SNAPSHOT.jar
(with props)
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-java5-1.1.0-SNAPSHOT.jar
(with props)
Removed:
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-core-0.9.5-SNAPSHOT.jar
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-filter-ssl-0.9.5-SNAPSHOT.jar
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/bio/Reader.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/bio/Sequence.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/bio/SimpleSocketChannel.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/bio/SocketAcceptor.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/bio/SocketConnector.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/bio/SocketFilterChain.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/bio/SocketSessionImpl.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/nio/SocketAcceptor.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/nio/SocketAcceptorDelegate.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/nio/SocketConnector.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/nio/SocketConnectorDelegate.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/nio/SocketFilterChain.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/nio/SocketIoProcessor.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/nio/SocketSessionImpl.java
Modified:
incubator/qpid/trunk/qpid/java/ (props changed)
incubator/qpid/trunk/qpid/java/broker/etc/config.xml
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/pool/ReadWriteThreadModel.java
Propchange: incubator/qpid/trunk/qpid/java/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct 12 13:01:58 2006
@@ -1,3 +1,4 @@
blaze.ipr
blaze.iws
build
+intellijclasses
Modified: incubator/qpid/trunk/qpid/java/broker/etc/config.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/etc/config.xml?view=diff&rev=463403&r1=463402&r2=463403
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/etc/config.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/etc/config.xml Thu Oct 12 13:01:58
2006
@@ -33,7 +33,7 @@
<enabled>true</enabled>
</management>
<advanced>
- <filterchain enableExecutorPool="true"/>
+ <filterchain enableExecutorPool="false"/>
<enablePooledAllocator>false</enablePooledAllocator>
<enableDirectBuffers>false</enableDirectBuffers>
<framesize>65535</framesize>
Modified:
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java?view=diff&rev=463403&r1=463402&r2=463403
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/transport/ConnectorConfiguration.java
Thu Oct 12 13:01:58 2006
@@ -19,6 +19,8 @@
import org.apache.qpid.configuration.Configured;
import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.filter.executor.ExecutorExecutor;
+import org.apache.mina.util.NewThreadExecutor;
public class ConnectorConfiguration
{
@@ -74,20 +76,8 @@
defaultValue = "true")
public boolean enableNonSSL;
- @Configured(path = "advanced.useBlockingIo",
- defaultValue = "false")
- public boolean useBlockingIo;
-
public IoAcceptor createAcceptor()
{
- if(useBlockingIo)
- {
- System.out.println("Using blocking io");
- return new org.apache.qpid.bio.SocketAcceptor();
- }
- else
- {
- return new
org.apache.mina.transport.socket.nio.SocketAcceptor(processors);
- }
+ return new
org.apache.mina.transport.socket.nio.SocketAcceptor(processors, new
NewThreadExecutor());
}
}
Modified:
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java?view=diff&rev=463403&r1=463402&r2=463403
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java
Thu Oct 12 13:01:58 2006
@@ -49,6 +49,11 @@
return null; //To change body of implemented methods use File |
Settings | File Templates.
}
+ public IoServiceConfig getServiceConfig()
+ {
+ return null;
+ }
+
public IoHandler getHandler()
{
return null; //To change body of implemented methods use File |
Settings | File Templates.
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java?view=diff&rev=463403&r1=463402&r2=463403
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/codec/BasicDeliverTest.java
Thu Oct 12 13:01:58 2006
@@ -156,6 +156,11 @@
return null; //To change body of implemented methods use File |
Settings | File Templates.
}
+ public IoServiceConfig getServiceConfig()
+ {
+ return null;
+ }
+
public IoHandler getHandler()
{
return null; //To change body of implemented methods use File |
Settings | File Templates.
Added:
incubator/qpid/trunk/qpid/java/common/lib/backport-util-concurrent/backport-util-concurrent-2.2.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/lib/backport-util-concurrent/backport-util-concurrent-2.2.jar?view=auto&rev=463403
==============================================================================
Binary file - no diff available.
Propchange:
incubator/qpid/trunk/qpid/java/common/lib/backport-util-concurrent/backport-util-concurrent-2.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-core-1.1.0-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/lib/mina/mina-core-1.1.0-SNAPSHOT.jar?view=auto&rev=463403
==============================================================================
Binary file - no diff available.
Propchange:
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-core-1.1.0-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-filter-ssl-1.1.0-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/lib/mina/mina-filter-ssl-1.1.0-SNAPSHOT.jar?view=auto&rev=463403
==============================================================================
Binary file - no diff available.
Propchange:
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-filter-ssl-1.1.0-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-java5-1.1.0-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/lib/mina/mina-java5-1.1.0-SNAPSHOT.jar?view=auto&rev=463403
==============================================================================
Binary file - no diff available.
Propchange:
incubator/qpid/trunk/qpid/java/common/lib/mina/mina-java5-1.1.0-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/pool/ReadWriteThreadModel.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/pool/ReadWriteThreadModel.java?view=diff&rev=463403&r1=463402&r2=463403
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/pool/ReadWriteThreadModel.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/org/apache/qpid/pool/ReadWriteThreadModel.java
Thu Oct 12 13:01:58 2006
@@ -18,7 +18,7 @@
package org.apache.qpid.pool;
import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.ReferenceCountingIoFilter;
+import org.apache.mina.filter.ReferenceCountingIoFilter;
import org.apache.mina.common.ThreadModel;
public class ReadWriteThreadModel implements ThreadModel
