Author: jvermillard
Date: Tue Aug 14 07:59:01 2007
New Revision: 565789
URL: http://svn.apache.org/viewvc?view=rev&rev=565789
Log:
fixed code for compiling with the new API changes
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/APRFilterChain.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/APRTransportType.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?view=diff&rev=565789&r1=565788&r2=565789
==============================================================================
---
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
Tue Aug 14 07:59:01 2007
@@ -5,18 +5,18 @@
import java.net.SocketAddress;
import java.util.concurrent.Executor;
+import org.apache.mina.common.AbstractIoConnector;
+import org.apache.mina.common.AbstractIoFilterChain;
import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.TransportType;
-import org.apache.mina.common.support.AbstractIoFilterChain;
-import org.apache.mina.common.support.BaseIoConnector;
-import org.apache.mina.common.support.DefaultConnectFuture;
-import org.apache.mina.common.support.IoServiceListenerSupport;
+import org.apache.mina.common.DefaultConnectFuture;
+import org.apache.mina.common.IoServiceListenerSupport;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.util.NewThreadExecutor;
import org.apache.tomcat.jni.Address;
import org.apache.tomcat.jni.Pool;
import org.apache.tomcat.jni.Socket;
-public class APRConnector extends BaseIoConnector {
+public class APRConnector extends AbstractIoConnector {
/**
* @noinspection StaticNonFinalField
@@ -124,7 +124,7 @@
}
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getMetadata() {
return APRTransportType.APR_SOCKET;
}
Modified:
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRFilterChain.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRFilterChain.java?view=diff&rev=565789&r1=565788&r2=565789
==============================================================================
---
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRFilterChain.java
(original)
+++
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRFilterChain.java
Tue Aug 14 07:59:01 2007
@@ -3,10 +3,10 @@
import java.io.IOException;
import java.util.Queue;
+import org.apache.mina.common.AbstractIoFilterChain;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.AbstractIoFilterChain;
public class APRFilterChain extends AbstractIoFilterChain {
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?view=diff&rev=565789&r1=565788&r2=565789
==============================================================================
---
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
Tue Aug 14 07:59:01 2007
@@ -12,7 +12,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.IoServiceListenerSupport;
+import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.tomcat.jni.Error;
import org.apache.tomcat.jni.Poll;
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?view=diff&rev=565789&r1=565788&r2=565789
==============================================================================
---
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
Tue Aug 14 07:59:01 2007
@@ -4,15 +4,14 @@
import java.util.LinkedList;
import java.util.Queue;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
-import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.BaseIoSession;
-public class APRSessionImpl extends BaseIoSession implements APRSession {
+public class APRSessionImpl extends AbstractIoSession implements APRSession {
private long socket;
private final IoService service;
@@ -108,11 +107,7 @@
public IoService getService() {
return service;
}
-
- public TransportType getTransportType() {
- return APRTransportType.APR_SOCKET;
- }
-
+
APRIoProcessor getIoProcessor() {
return ioProcessor;
}
Modified:
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRTransportType.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRTransportType.java?view=diff&rev=565789&r1=565788&r2=565789
==============================================================================
---
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRTransportType.java
(original)
+++
mina/sandbox/jvermillard/apr/src/main/java/org/apache/mina/transport/apr/APRTransportType.java
Tue Aug 14 07:59:01 2007
@@ -3,14 +3,14 @@
import java.net.InetSocketAddress;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.support.DefaultTransportType;
+import org.apache.mina.common.DefaultIoServiceMetadata;
-public class APRTransportType extends DefaultTransportType {
+public class APRTransportType extends DefaultIoServiceMetadata {
public static final APRTransportType APR_SOCKET=new APRTransportType();
private APRTransportType() {
- super("Apache Portable Runtime socket",
false,InetSocketAddress.class, ByteBuffer.class,APRSessionConfig.class);
+ super("Apache Portable Runtime socket",
false,true,InetSocketAddress.class, ByteBuffer.class,APRSessionConfig.class);
}
}
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?view=diff&rev=565789&r1=565788&r2=565789
==============================================================================
---
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
Tue Aug 14 07:59:01 2007
@@ -1,8 +1,8 @@
package org.apache.mina.transport.apr;
-import org.apache.mina.common.support.BaseIoSessionConfig;
+import org.apache.mina.common.AbstractIoSessionConfig;
-public class DefaultAPRSessionConfig extends BaseIoSessionConfig implements
APRSessionConfig {
+public class DefaultAPRSessionConfig extends AbstractIoSessionConfig
implements APRSessionConfig {
public int getReceiveBufferSize() {
// TODO Auto-generated method stub
