Author: mwebb
Date: Sat Nov 8 17:32:38 2008
New Revision: 712460
URL: http://svn.apache.org/viewvc?rev=712460&view=rev
Log:
Removed all references to TrafficMask. This was causing compilation errors
Removed:
mina/sandbox/jvermillard/mina-cleaning/integration-beans/src/main/java/org/apache/mina/integration/beans/TrafficMaskEditor.java
Modified:
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
mina/sandbox/jvermillard/mina-cleaning/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java
Modified:
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java?rev=712460&r1=712459&r2=712460&view=diff
==============================================================================
---
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
(original)
+++
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
Sat Nov 8 17:32:38 2008
@@ -33,7 +33,6 @@
import org.apache.mina.core.session.AttributeKey;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
import org.apache.mina.core.write.WriteRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java?rev=712460&r1=712459&r2=712460&view=diff
==============================================================================
---
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
(original)
+++
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
Sat Nov 8 17:32:38 2008
@@ -22,7 +22,6 @@
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.filter.util.ReferenceCountingFilter;
Modified:
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java?rev=712460&r1=712459&r2=712460&view=diff
==============================================================================
---
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
(original)
+++
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
Sat Nov 8 17:32:38 2008
@@ -21,7 +21,6 @@
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
import org.apache.mina.core.write.WriteRequest;
/**
Modified:
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java?rev=712460&r1=712459&r2=712460&view=diff
==============================================================================
---
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
(original)
+++
mina/sandbox/jvermillard/mina-cleaning/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
Sat Nov 8 17:32:38 2008
@@ -25,7 +25,6 @@
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
import org.apache.mina.core.write.WriteRequest;
/**
Modified:
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java?rev=712460&r1=712459&r2=712460&view=diff
==============================================================================
---
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
(original)
+++
mina/sandbox/jvermillard/mina-cleaning/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
Sat Nov 8 17:32:38 2008
@@ -29,7 +29,6 @@
import org.apache.mina.core.session.DummySession;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
import org.apache.mina.core.write.WriteRequest;
/**
@@ -138,9 +137,6 @@
public void sessionCreated(IoSession session) {
}
-
- public void filterSetTrafficMask(IoSession session, TrafficMask
trafficMask) {
- }
}
public static void main(String[] args) {
Modified:
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?rev=712460&r1=712459&r2=712460&view=diff
==============================================================================
---
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
(original)
+++
mina/sandbox/jvermillard/mina-cleaning/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
Sat Nov 8 17:32:38 2008
@@ -24,7 +24,6 @@
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mina/sandbox/jvermillard/mina-cleaning/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/mina-cleaning/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java?rev=712460&r1=712459&r2=712460&view=diff
==============================================================================
---
mina/sandbox/jvermillard/mina-cleaning/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java
(original)
+++
mina/sandbox/jvermillard/mina-cleaning/integration-xbean/src/main/java/org/apache/mina/integration/xbean/MinaPropertyEditorRegistrar.java
Sat Nov 8 17:32:38 2008
@@ -25,11 +25,9 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import org.apache.mina.core.session.TrafficMask;
import org.apache.mina.integration.beans.BooleanEditor;
import org.apache.mina.integration.beans.InetAddressEditor;
import org.apache.mina.integration.beans.InetSocketAddressEditor;
-import org.apache.mina.integration.beans.TrafficMaskEditor;
import org.apache.mina.integration.beans.VmPipeAddressEditor;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
import org.springframework.beans.PropertyEditorRegistrar;
@@ -72,7 +70,6 @@
registry.registerCustomEditor( InetAddress.class, new
InetAddressEditor() );
registry.registerCustomEditor( InetSocketAddress.class, new
InetSocketAddressEditor() );
registry.registerCustomEditor( SocketAddress.class, new
InetSocketAddressEditor() );
- registry.registerCustomEditor( TrafficMask.class, new
TrafficMaskEditor() );
registry.registerCustomEditor( VmPipeAddress.class, new
VmPipeAddressEditor() );
// registry.registerCustomEditor( Boolean.class, new BooleanEditor() );
}