Modified: incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/TCPConnection.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/TCPConnection.java?view=diff&rev=542880&r1=542879&r2=542880 ============================================================================== --- incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/TCPConnection.java (original) +++ incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/TCPConnection.java Wed May 30 10:19:51 2007 @@ -13,7 +13,7 @@ import org.apache.qpid.nclient.core.Phase; import org.apache.qpid.nclient.core.PhaseContext; import org.apache.qpid.nclient.core.PhaseFactory; -import org.apache.qpid.nclient.core.QpidConstants; +import org.apache.qpid.nclient.core.AMQPConstants; import org.apache.qpid.pool.ReadWriteThreadModel; public class TCPConnection implements TransportConnection @@ -29,11 +29,11 @@ _brokerDetails = url.getBrokerDetails(0); _ctx = ctx; - ByteBuffer.setUseDirectBuffers(ClientConfiguration.get().getBoolean(QpidConstants.ENABLE_DIRECT_BUFFERS)); + ByteBuffer.setUseDirectBuffers(ClientConfiguration.get().getBoolean(AMQPConstants.ENABLE_DIRECT_BUFFERS)); // the MINA default is currently to use the pooled allocator although this may change in future // once more testing of the performance of the simple allocator has been done - if (ClientConfiguration.get().getBoolean(QpidConstants.ENABLE_POOLED_ALLOCATOR)) + if (ClientConfiguration.get().getBoolean(AMQPConstants.ENABLE_POOLED_ALLOCATOR)) { // Not sure what the original code wanted use :) } @@ -48,22 +48,22 @@ // if we do not use our own thread model we get the MINA default which is to use // its own leader-follower model - if (ClientConfiguration.get().getBoolean(QpidConstants.USE_SHARED_READ_WRITE_POOL)) + if (ClientConfiguration.get().getBoolean(AMQPConstants.USE_SHARED_READ_WRITE_POOL)) { cfg.setThreadModel(ReadWriteThreadModel.getInstance()); } SocketSessionConfig scfg = (SocketSessionConfig) cfg.getSessionConfig(); - scfg.setTcpNoDelay(ClientConfiguration.get().getBoolean(QpidConstants.TCP_NO_DELAY)); - scfg.setSendBufferSize(ClientConfiguration.get().getInt(QpidConstants.SEND_BUFFER_SIZE_IN_KB)*1024); - scfg.setReceiveBufferSize(ClientConfiguration.get().getInt(QpidConstants.RECEIVE_BUFFER_SIZE_IN_KB)*1024); + scfg.setTcpNoDelay(ClientConfiguration.get().getBoolean(AMQPConstants.TCP_NO_DELAY)); + scfg.setSendBufferSize(ClientConfiguration.get().getInt(AMQPConstants.SEND_BUFFER_SIZE_IN_KB)*1024); + scfg.setReceiveBufferSize(ClientConfiguration.get().getInt(AMQPConstants.RECEIVE_BUFFER_SIZE_IN_KB)*1024); } // Returns the phase pipe public Phase connect() throws AMQPException { - _ctx.setProperty(QpidConstants.AMQP_BROKER_DETAILS,_brokerDetails); - _ctx.setProperty(QpidConstants.MINA_IO_CONNECTOR,_ioConnector); + _ctx.setProperty(AMQPConstants.AMQP_BROKER_DETAILS,_brokerDetails); + _ctx.setProperty(AMQPConstants.MINA_IO_CONNECTOR,_ioConnector); _phase = PhaseFactory.createPhasePipe(_ctx); _phase.start();
Modified: incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/TransportPhase.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/TransportPhase.java?view=diff&rev=542880&r1=542879&r2=542880 ============================================================================== --- incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/TransportPhase.java (original) +++ incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/TransportPhase.java Wed May 30 10:19:51 2007 @@ -44,7 +44,7 @@ import org.apache.qpid.nclient.config.ClientConfiguration; import org.apache.qpid.nclient.core.AMQPException; import org.apache.qpid.nclient.core.AbstractPhase; -import org.apache.qpid.nclient.core.QpidConstants; +import org.apache.qpid.nclient.core.AMQPConstants; import org.apache.qpid.pool.ReadWriteThreadModel; import org.apache.qpid.ssl.BogusSSLContextFactory; @@ -72,8 +72,8 @@ public void start()throws AMQPException { - _brokerDetails = (BrokerDetails)_ctx.getProperty(QpidConstants.AMQP_BROKER_DETAILS); - IoConnector ioConnector = (IoConnector)_ctx.getProperty(QpidConstants.MINA_IO_CONNECTOR); + _brokerDetails = (BrokerDetails)_ctx.getProperty(AMQPConstants.AMQP_BROKER_DETAILS); + IoConnector ioConnector = (IoConnector)_ctx.getProperty(AMQPConstants.MINA_IO_CONNECTOR); final SocketAddress address; if (ioConnector instanceof VmPipeConnector) @@ -179,7 +179,7 @@ new AMQCodecFactory(false)); if (ClientConfiguration.get().getBoolean( - QpidConstants.USE_SHARED_READ_WRITE_POOL)) + AMQPConstants.USE_SHARED_READ_WRITE_POOL)) { session.getFilterChain().addBefore("AsynchronousWriteFilter", "protocolFilter", pcf); Modified: incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/VMConnection.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/VMConnection.java?view=diff&rev=542880&r1=542879&r2=542880 ============================================================================== --- incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/VMConnection.java (original) +++ incubator/qpid/branches/client_restructure/java/newclient/src/main/java/org/apache/qpid/nclient/transport/VMConnection.java Wed May 30 10:19:51 2007 @@ -15,7 +15,7 @@ import org.apache.qpid.nclient.core.Phase; import org.apache.qpid.nclient.core.PhaseContext; import org.apache.qpid.nclient.core.PhaseFactory; -import org.apache.qpid.nclient.core.QpidConstants; +import org.apache.qpid.nclient.core.AMQPConstants; import org.apache.qpid.pool.PoolingFilter; import org.apache.qpid.pool.ReadWriteThreadModel; import org.apache.qpid.pool.ReferenceCountingExecutorService; @@ -48,8 +48,8 @@ { createVMBroker(); - _ctx.setProperty(QpidConstants.AMQP_BROKER_DETAILS,_brokerDetails); - _ctx.setProperty(QpidConstants.MINA_IO_CONNECTOR,_ioConnector); + _ctx.setProperty(AMQPConstants.AMQP_BROKER_DETAILS,_brokerDetails); + _ctx.setProperty(AMQPConstants.MINA_IO_CONNECTOR,_ioConnector); _phase = PhaseFactory.createPhasePipe(_ctx); _phase.start(); @@ -86,7 +86,7 @@ private IoHandlerAdapter createBrokerInstance(int port) throws AMQPException { - String protocolProviderClass = ClientConfiguration.get().getString(QpidConstants.QPID_VM_BROKER_CLASS); + String protocolProviderClass = ClientConfiguration.get().getString(AMQPConstants.QPID_VM_BROKER_CLASS); _logger.info("Creating Qpid protocol provider: " + protocolProviderClass); // can't use introspection to get Provider as it is a server class.
