Author: jvermillard
Date: Thu Sep 6 09:57:29 2007
New Revision: 573323
URL: http://svn.apache.org/viewvc?rev=573323&view=rev
Log:
following last API changes
Removed:
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRTransportType.java
Modified:
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java
Modified:
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java?rev=573323&r1=573322&r2=573323&view=diff
==============================================================================
---
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java
(original)
+++
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRConnector.java
Thu Sep 6 09:57:29 2007
@@ -10,7 +10,7 @@
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.IoServiceListenerSupport;
-import org.apache.mina.common.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.util.NewThreadExecutor;
import org.apache.tomcat.jni.Address;
import org.apache.tomcat.jni.Pool;
@@ -124,9 +124,6 @@
}
}
- public IoServiceMetadata getMetadata() {
- return APRTransportType.APR_SOCKET;
- }
@Override
protected IoServiceListenerSupport getListeners() {
@@ -145,5 +142,9 @@
protected void finalize() throws Throwable {
// TODO : necessary I think, need to check APR doc
Pool.clear(pool);
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return APRSessionImpl.METADATA;
}
}
Modified:
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java?rev=573323&r1=573322&r2=573323&view=diff
==============================================================================
---
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java
(original)
+++
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRIoProcessor.java
Thu Sep 6 09:57:29 2007
@@ -264,20 +264,20 @@
}
private void notifyIdleness(APRSessionImpl session, long currentTime) {
- notifyIdleness0(session, currentTime, session
+ notifyIdleness0(session, currentTime, session.getConfig()
.getIdleTimeInMillis(IdleStatus.BOTH_IDLE),
IdleStatus.BOTH_IDLE,
Math.max(session.getLastIoTime(), session
.getLastIdleTime(IdleStatus.BOTH_IDLE)));
- notifyIdleness0(session, currentTime, session
+ notifyIdleness0(session, currentTime, session.getConfig()
.getIdleTimeInMillis(IdleStatus.READER_IDLE),
IdleStatus.READER_IDLE,
Math.max(session.getLastReadTime(),
session.getLastIdleTime(IdleStatus.READER_IDLE)));
- notifyIdleness0(session, currentTime, session
+ notifyIdleness0(session, currentTime, session.getConfig()
.getIdleTimeInMillis(IdleStatus.WRITER_IDLE),
IdleStatus.WRITER_IDLE,
Math.max(session.getLastWriteTime(),
session.getLastIdleTime(IdleStatus.WRITER_IDLE)));
- notifyWriteTimeout(session, currentTime, session
+ notifyWriteTimeout(session, currentTime, session.getConfig()
.getWriteTimeoutInMillis(),
session.getLastWriteTime());
}
Modified:
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java?rev=573323&r1=573322&r2=573323&view=diff
==============================================================================
---
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java
(original)
+++
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRSessionImpl.java
Thu Sep 6 09:57:29 2007
@@ -6,9 +6,11 @@
import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.DefaultTransportMetadata;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteRequest;
public class APRSessionImpl extends AbstractIoSession implements APRSession {
@@ -31,6 +33,8 @@
private final InetSocketAddress remoteAddress;
private final InetSocketAddress localAddress;
+
+ static final TransportMetadata METADATA = new
DefaultTransportMetadata("Apache Portable Runtime socket",
false,true,InetSocketAddress.class, APRSessionConfig.class, ByteBuffer.class);
/**
* Creates a new instance.
@@ -91,7 +95,7 @@
}
}
- public int getScheduledWriteBytes() {
+ public long getScheduledWriteBytes() {
int size = 0;
synchronized (writeRequestQueue) {
for (Object o : writeRequestQueue) {
@@ -115,5 +119,9 @@
@Override
public InetSocketAddress getServiceAddress() {
return (InetSocketAddress) super.getServiceAddress();
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return METADATA;
}
}
Modified:
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java?rev=573323&r1=573322&r2=573323&view=diff
==============================================================================
---
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java
(original)
+++
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/DefaultAPRSessionConfig.java
Thu Sep 6 09:57:29 2007
@@ -1,6 +1,7 @@
package org.apache.mina.transport.apr;
import org.apache.mina.common.AbstractIoSessionConfig;
+import org.apache.mina.common.IoSessionConfig;
public class DefaultAPRSessionConfig extends AbstractIoSessionConfig
implements APRSessionConfig {
@@ -80,6 +81,12 @@
}
public void setTrafficClass(int trafficClass) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void doSetAll(IoSessionConfig config) {
// TODO Auto-generated method stub
}
