You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/09/27 11:59:12 UTC
svn commit: r579964 -
/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/
Author: trustin
Date: Thu Sep 27 02:59:10 2007
New Revision: 579964
URL: http://svn.apache.org/viewvc?rev=579964&view=rev
Log:
Replaced APR with Apr
Added:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAprSessionConfig.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprConnector.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprProtocol.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionConfig.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAprSessionConfig.java
- copied, changed from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java
Removed:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAprSessionConfig.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAprSessionConfig.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAprSessionConfig.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAPRSessionConfig.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AbstractAprSessionConfig.java Thu Sep 27 02:59:10 2007
@@ -23,22 +23,22 @@
import org.apache.mina.common.IoSessionConfig;
/**
- * An abstract APRSessionConfig {@link APRSessionConfig}.
+ * An abstract APRSessionConfig {@link AprSessionConfig}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: $, $Date: $
*/
-abstract class AbstractAPRSessionConfig extends AbstractIoSessionConfig
- implements APRSessionConfig {
+abstract class AbstractAprSessionConfig extends AbstractIoSessionConfig
+ implements AprSessionConfig {
- public AbstractAPRSessionConfig() {
+ public AbstractAprSessionConfig() {
super();
}
@Override
protected final void doSetAll(IoSessionConfig config) {
- if (config instanceof APRSessionConfig) {
- APRSessionConfig cfg = (APRSessionConfig) config;
+ if (config instanceof AprSessionConfig) {
+ AprSessionConfig cfg = (AprSessionConfig) config;
setKeepAlive(cfg.isKeepAlive());
setOobInline(cfg.isOobInline());
setReceiveBufferSize(cfg.getReceiveBufferSize());
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprConnector.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprConnector.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprConnector.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRConnector.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprConnector.java Thu Sep 27 02:59:10 2007
@@ -40,13 +40,13 @@
* An {@link IoConnector} implementation using the Apache Portable Runtime
* (APR : http://apr.apache.org) for providing socket.
* It's supporting different transport protocol, so you need to give the
- * wanted {@link APRProtocol} as parameter to the constructor.
- * @see APRSession
- * @see APRProtocol
+ * wanted {@link AprProtocol} as parameter to the constructor.
+ * @see AprSession
+ * @see AprProtocol
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class APRConnector extends AbstractIoConnector {
+public class AprConnector extends AbstractIoConnector {
/**
* @noinspection StaticNonFinalField
@@ -60,11 +60,11 @@
private final Executor executor;
- private final APRIoProcessor[] ioProcessors;
+ private final AprIoProcessor[] ioProcessors;
private int processorDistributor = 0;
- private APRProtocol protocol;
+ private AprProtocol protocol;
/**
* Create a connector with a single processing thread using a
@@ -72,7 +72,7 @@
* @param protocol
* The needed socket protocol (TCP,UDP,...)
*/
- public APRConnector(APRProtocol protocol) {
+ public AprConnector(AprProtocol protocol) {
this(protocol, 1, new NewThreadExecutor());
}
@@ -86,15 +86,15 @@
* @param executor
* Executor to use for launching threads
*/
- public APRConnector(APRProtocol protocol, int processorCount,
+ public AprConnector(AprProtocol protocol, int processorCount,
Executor executor) {
- super(new DefaultAPRSessionConfig());
+ super(new DefaultAprSessionConfig());
this.protocol = protocol;
// load the APR library
- APRLibrary.initialize();
+ AprLibrary.initialize();
if (processorCount < 1) {
throw new IllegalArgumentException(
@@ -103,10 +103,10 @@
this.executor = executor;
this.processorCount = processorCount;
- ioProcessors = new APRIoProcessor[processorCount];
+ ioProcessors = new AprIoProcessor[processorCount];
for (int i = 0; i < processorCount; i++) {
- ioProcessors[i] = new APRIoProcessor("APRConnectorIoProcessor-"
+ ioProcessors[i] = new AprIoProcessor("APRConnectorIoProcessor-"
+ id + "." + i, executor);
}
}
@@ -120,11 +120,11 @@
//pool = Pool.create(pool);
long inetAddr = 0;
inetAddr = Address.info(sockAddr.getHostName(), Socket.APR_INET,
- sockAddr.getPort(), 0, APRLibrary.getLibrary().getPool());
+ sockAddr.getPort(), 0, AprLibrary.getLibrary().getPool());
// TODO : type of socket need to be configurable
long clientSock = Socket.create(Socket.APR_INET,
- protocol.socketType, protocol.codeProto, APRLibrary
+ protocol.socketType, protocol.codeProto, AprLibrary
.getLibrary().getPool());
@@ -143,9 +143,9 @@
}
ConnectFuture future = new DefaultConnectFuture();
- APRIoProcessor proc=nextProcessor();
+ AprIoProcessor proc=nextProcessor();
System.err.println("proc : "+proc);
- APRSessionImpl session = new APRSessionImpl(this,proc ,
+ AprSessionImpl session = new AprSessionImpl(this,proc ,
clientSock, sockAddr, (InetSocketAddress) localAddress);
try {
@@ -176,7 +176,7 @@
return super.getListeners();
}
- private APRIoProcessor nextProcessor() {
+ private AprIoProcessor nextProcessor() {
if (this.processorDistributor == Integer.MAX_VALUE) {
this.processorDistributor = Integer.MAX_VALUE % this.processorCount;
}
@@ -184,6 +184,6 @@
}
public TransportMetadata getTransportMetadata() {
- return APRSessionImpl.METADATA;
+ return AprSessionImpl.METADATA;
}
}
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRIoProcessor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java Thu Sep 27 02:59:10 2007
@@ -39,17 +39,17 @@
import org.slf4j.LoggerFactory;
/**
- * The class in charge of processing socket level IO events for the {@link APRConnector}
+ * The class in charge of processing socket level IO events for the {@link AprConnector}
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class APRIoProcessor extends AbstractIoProcessor {
+class AprIoProcessor extends AbstractIoProcessor {
protected static class IoSessionIterator implements Iterator<AbstractIoSession> {
- private final Iterator<APRSessionImpl> i;
- private IoSessionIterator(Collection<APRSessionImpl> sessions) {
+ private final Iterator<AprSessionImpl> i;
+ private IoSessionIterator(Collection<AprSessionImpl> sessions) {
i = sessions.iterator();
}
public boolean hasNext() {
@@ -57,7 +57,7 @@
}
public AbstractIoSession next() {
- APRSessionImpl sess = i.next();
+ AprSessionImpl sess = i.next();
return (AbstractIoSession) sess;
}
@@ -81,7 +81,7 @@
public AbstractIoSession next() {
AbstractIoSession sess=managedSessions.get(pollResult[index*2+1]);
index++;
- System.err.println("sess : "+((APRSessionImpl)sess).getAPRSocket());
+ System.err.println("sess : "+((AprSessionImpl)sess).getAPRSocket());
return sess;
}
@@ -96,16 +96,16 @@
private long pollset = 0; // socket poller
- private final Map<Long, APRSessionImpl> managedSessions = new HashMap<Long, APRSessionImpl>();
+ private final Map<Long, AprSessionImpl> managedSessions = new HashMap<Long, AprSessionImpl>();
private long[] pollResult;
- APRIoProcessor(String threadName, Executor executor) {
+ AprIoProcessor(String threadName, Executor executor) {
super(threadName,executor);
// initialize a memory pool for APR functions
- pool = Pool.create(APRLibrary.getLibrary().getPool());
+ pool = Pool.create(AprLibrary.getLibrary().getPool());
try {
// TODO : optimize/parameterize those values
@@ -132,7 +132,7 @@
@Override
protected void doAdd(IoSession sess) throws Exception {
logger.debug("doAdd");
- APRSessionImpl session = (APRSessionImpl) sess;
+ AprSessionImpl session = (AprSessionImpl) sess;
int rv;
rv = Poll.add(pollset, session.getAPRSocket(), Poll.APR_POLLIN);
if (rv == Status.APR_SUCCESS) {
@@ -146,11 +146,11 @@
@Override
protected void doRemove(IoSession session) throws Exception {
logger.debug("doRemove");
- int ret=Poll.remove(pollset, ((APRSessionImpl)session).getAPRSocket());
+ int ret=Poll.remove(pollset, ((AprSessionImpl)session).getAPRSocket());
if(ret!=Status.APR_SUCCESS) {
logger.error("removing of pollset error");
}
- ret=Socket.close(((APRSessionImpl)session).getAPRSocket());
+ ret=Socket.close(((AprSessionImpl)session).getAPRSocket());
if(ret!=Status.APR_SUCCESS) {
logger.error("closing socket error");
}
@@ -167,7 +167,7 @@
@Override
protected boolean isOpRead(IoSession sess) throws Exception {
logger.debug("isOpRead?");
- APRSessionImpl session=(APRSessionImpl)sess;
+ AprSessionImpl session=(AprSessionImpl)sess;
logger.debug("isOpRead : "+session.isOpRead());
return session.isOpRead();
}
@@ -175,7 +175,7 @@
@Override
protected boolean isOpWrite(IoSession sess) throws Exception {
logger.debug("isOpWrite?");
- APRSessionImpl session=(APRSessionImpl)sess;
+ AprSessionImpl session=(AprSessionImpl)sess;
logger.debug("isOpWrite : "+session.isOpWrite());
return session.isOpWrite();
}
@@ -183,7 +183,7 @@
@Override
protected boolean isReadable(IoSession session) throws Exception {
logger.debug("isReadable?");
- long socket=((APRSessionImpl)session).getAPRSocket();
+ long socket=((AprSessionImpl)session).getAPRSocket();
for(int i=0;i<pollResult.length/2;i++) {
if(pollResult[i*2+1]==socket) {
if( (pollResult[i*2]&Poll.APR_POLLIN) >0 ) {
@@ -202,7 +202,7 @@
@Override
protected boolean isWritable(IoSession session) throws Exception {
logger.debug("isWritable?");
- long socket=((APRSessionImpl)session).getAPRSocket();
+ long socket=((AprSessionImpl)session).getAPRSocket();
for(int i=0;i<pollResult.length/2;i++) {
if(pollResult[i*2+1]==socket) {
if( (pollResult[i*2]&Poll.APR_POLLOUT) >0 ) {
@@ -221,7 +221,7 @@
@Override
protected int read(IoSession sess, ByteBuffer buffer) throws Exception {
logger.debug("read");
- APRSessionImpl session=(APRSessionImpl)sess;
+ AprSessionImpl session=(AprSessionImpl)sess;
byte[] buf = session.getReadBuffer();
// FIXME : hardcoded read value for testing
@@ -262,7 +262,7 @@
@Override
protected void setOpRead(IoSession sess, boolean value) throws Exception {
logger.debug("setOpRead : "+value);
- APRSessionImpl session=(APRSessionImpl)sess;
+ AprSessionImpl session=(AprSessionImpl)sess;
int rv = Poll.remove(pollset, session.getAPRSocket());
if (rv != Status.APR_SUCCESS) {
System.err.println("poll.remove Error : " + Error.strerror(rv));
@@ -284,7 +284,7 @@
protected void setOpWrite(IoSession sess, boolean value)
throws Exception {
logger.debug("setOpWrite : "+value);
- APRSessionImpl session=(APRSessionImpl)sess;
+ AprSessionImpl session=(AprSessionImpl)sess;
int rv = Poll.remove(pollset, session.getAPRSocket());
if (rv != Status.APR_SUCCESS) {
System.err.println("poll.remove Error : " + Error.strerror(rv));
@@ -305,7 +305,7 @@
@Override
protected SessionState state(IoSession session) {
logger.debug("state?");
- long socket=((APRSessionImpl)session).getAPRSocket();
+ long socket=((AprSessionImpl)session).getAPRSocket();
if(socket>0)
return SessionState.OPEN;
else if(managedSessions.get(socket)!=null)
@@ -336,10 +336,10 @@
int writtenBytes;
// APR accept ByteBuffer, only if they are Direct ones, due to native code
if (buf.isDirect()) {
- writtenBytes = Socket.sendb( ((APRSessionImpl)session).getAPRSocket(), buf.buf(),
+ writtenBytes = Socket.sendb( ((AprSessionImpl)session).getAPRSocket(), buf.buf(),
0, toWrite);
} else {
- writtenBytes = Socket.send( ((APRSessionImpl)session).getAPRSocket(), buf.array(),
+ writtenBytes = Socket.send( ((AprSessionImpl)session).getAPRSocket(), buf.array(),
0, toWrite);
// FIXME : kludgy ?
buf.position(buf.position() + writtenBytes);
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRLibrary.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java Thu Sep 27 02:59:10 2007
@@ -29,12 +29,12 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class APRLibrary {
+class AprLibrary {
// is APR library was initialized (load of native libraries)
- private static APRLibrary library = null;
+ private static AprLibrary library = null;
- static synchronized APRLibrary getLibrary() {
+ static synchronized AprLibrary getLibrary() {
if (!isInitialized())
initialize();
return library;
@@ -42,7 +42,7 @@
static synchronized void initialize() {
if (library == null)
- library = new APRLibrary();
+ library = new AprLibrary();
}
static synchronized boolean isInitialized() {
@@ -52,7 +52,7 @@
// APR memory pool (package wide mother pool)
private long pool = -1;
- private APRLibrary() {
+ private AprLibrary() {
try {
Library.initialize(null);
} catch (Exception e) {
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprProtocol.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprProtocol.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprProtocol.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRProtocol.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprProtocol.java Thu Sep 27 02:59:10 2007
@@ -22,12 +22,12 @@
import org.apache.tomcat.jni.Socket;
/**
- * Protocol usable with the {@link APRConnector}.
+ * Protocol usable with the {@link AprConnector}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public enum APRProtocol {
+enum AprProtocol {
TCP(Socket.APR_PROTO_TCP,Socket.SOCK_STREAM),
UDP(Socket.APR_PROTO_UDP,Socket.SOCK_DGRAM),
SCTP(Socket.APR_PROTO_SCTP,Socket.SOCK_STREAM);
@@ -35,7 +35,7 @@
int socketType;
int codeProto;
- private APRProtocol(int codeProto,int socketType) {
+ private AprProtocol(int codeProto,int socketType) {
this.codeProto = codeProto;
this.socketType = socketType;
}
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSession.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java Thu Sep 27 02:59:10 2007
@@ -24,13 +24,17 @@
import org.apache.mina.common.IoSession;
/**
- * {@link IoSession} for the {@link APRConnector}
+ * {@link IoSession} for the {@link AprConnector}
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public interface APRSession extends IoSession {
- APRSessionConfig getConfig();
-
+public interface AprSession extends IoSession {
+ AprSessionConfig getConfig();
+
+ InetSocketAddress getRemoteAddress();
+
+ InetSocketAddress getLocalAddress();
+
InetSocketAddress getServiceAddress();
}
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionConfig.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionConfig.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionConfig.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionConfig.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionConfig.java Thu Sep 27 02:59:10 2007
@@ -24,12 +24,12 @@
import org.apache.mina.common.IoSessionConfig;
/**
- * {@link IoSessionConfig} for configuring {@link APRSession} options.
+ * {@link IoSessionConfig} for configuring {@link AprSession} options.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public interface APRSessionConfig extends IoSessionConfig {
+public interface AprSessionConfig extends IoSessionConfig {
/**
* @see Socket#getReuseAddress()
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/APRSessionImpl.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSessionImpl.java Thu Sep 27 02:59:10 2007
@@ -33,19 +33,19 @@
import org.apache.tomcat.jni.Socket;
/**
- * Implementation for {@link APRSession}
+ * Implementation for {@link AprSession}
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class APRSessionImpl extends AbstractIoSession implements APRSession {
+class AprSessionImpl extends AbstractIoSession implements AprSession {
private long socket;
private final IoService service;
- private final APRSessionConfig config = new APRSessionConfigImpl();
+ private final AprSessionConfig config = new APRSessionConfigImpl();
- private final APRIoProcessor ioProcessor;
+ private final AprIoProcessor ioProcessor;
private final IoFilterChain filterChain = new DefaultIoFilterChain(this);
@@ -59,7 +59,7 @@
static final TransportMetadata METADATA = new DefaultTransportMetadata(
"Apache Portable Runtime socket", false, true,
- InetSocketAddress.class, APRSessionConfig.class, ByteBuffer.class);
+ InetSocketAddress.class, AprSessionConfig.class, ByteBuffer.class);
private boolean isOpRead=false;
@@ -67,7 +67,7 @@
/**
* Creates a new instance.
*/
- APRSessionImpl(IoService service, APRIoProcessor ioProcessor, long socket,
+ AprSessionImpl(IoService service, AprIoProcessor ioProcessor, long socket,
InetSocketAddress remoteAddress, InetSocketAddress localAddress) {
this.service = service;
this.ioProcessor = ioProcessor;
@@ -81,7 +81,7 @@
return socket;
}
- public APRSessionConfig getConfig() {
+ public AprSessionConfig getConfig() {
return config;
}
@@ -111,7 +111,7 @@
return service;
}
- APRIoProcessor getIoProcessor() {
+ AprIoProcessor getIoProcessor() {
return ioProcessor;
}
@@ -124,8 +124,8 @@
return (InetSocketAddress) super.getServiceAddress();
}
- private class APRSessionConfigImpl extends AbstractAPRSessionConfig
- implements APRSessionConfig {
+ private class APRSessionConfigImpl extends AbstractAprSessionConfig
+ implements AprSessionConfig {
public boolean isKeepAlive() {
try {
Copied: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAprSessionConfig.java (from r579962, mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java)
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAprSessionConfig.java?p2=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAprSessionConfig.java&p1=mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java&r1=579962&r2=579964&rev=579964&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAPRSessionConfig.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/DefaultAprSessionConfig.java Thu Sep 27 02:59:10 2007
@@ -21,13 +21,13 @@
/**
- * Default configuration for {@link APRSession}
+ * Default configuration for {@link AprSession}
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class DefaultAPRSessionConfig extends AbstractAPRSessionConfig implements
- APRSessionConfig {
+class DefaultAprSessionConfig extends AbstractAprSessionConfig implements
+ AprSessionConfig {
private static boolean SET_RECEIVE_BUFFER_SIZE_AVAILABLE = false;
@@ -72,7 +72,7 @@
/**
* Creates a new instance.
*/
- DefaultAPRSessionConfig() {
+ DefaultAprSessionConfig() {
}
public boolean isReuseAddress() {