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 2006/11/20 07:35:00 UTC
svn commit: r477070 [2/2] - in /mina/trunk: ./
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/common/support/
core/src/main/java/org/apache/mina/filter/
core/src/main/java/org/apache/mina/filter/codec/demux/ core/src/main...
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java Sun Nov 19 22:34:55 2006
@@ -25,6 +25,8 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.security.MessageDigest;
+import java.util.LinkedList;
+import java.util.Queue;
import java.util.Random;
import junit.framework.TestCase;
@@ -41,7 +43,6 @@
import org.apache.mina.transport.socket.nio.SocketAcceptor;
import org.apache.mina.transport.socket.nio.SocketConnector;
import org.apache.mina.util.AvailablePortFinder;
-import org.apache.mina.util.Queue;
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
@@ -255,7 +256,7 @@
{
StreamWriteFilter filter = new StreamWriteFilter();
- Queue queue = new Queue();
+ Queue queue = new LinkedList();
InputStream stream = new ByteArrayInputStream( new byte[ 5 ] );
/*
@@ -276,7 +277,7 @@
WriteRequest wr = new WriteRequest( new Object(), new DummyWriteFuture() );
filter.filterWrite( nextFilter, session, wr );
assertEquals( 1, queue.size() );
- assertSame( wr, queue.pop() );
+ assertSame( wr, queue.poll() );
/*
* Verify.
@@ -294,10 +295,10 @@
new WriteRequest( new Object(), new DummyWriteFuture() ),
new WriteRequest( new Object(), new DummyWriteFuture() )
};
- Queue queue = new Queue();
- queue.push( wrs[ 0 ] );
- queue.push( wrs[ 1 ] );
- queue.push( wrs[ 2 ] );
+ Queue<WriteRequest> queue = new LinkedList<WriteRequest>();
+ queue.offer( wrs[ 0 ] );
+ queue.offer( wrs[ 1 ] );
+ queue.offer( wrs[ 2 ] );
InputStream stream = new ByteArrayInputStream( new byte[ 0 ] );
/*
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java Sun Nov 19 22:34:55 2006
@@ -99,7 +99,7 @@
Assert.assertEquals( 4, output.getValues().size() );
Assert.assertEquals( buf.limit(), buf.position() );
- List expected = new ArrayList();
+ List<Object> expected = new ArrayList<Object>();
for( int i = 0; i < 4; i ++ )
{
expected.add( new Integer( i ) );
@@ -141,7 +141,7 @@
private static class IntegerDecoderOutput implements ProtocolDecoderOutput
{
- private List values = new ArrayList();
+ private List<Object> values = new ArrayList<Object>();
public void write( Object message )
{
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java Sun Nov 19 22:34:55 2006
@@ -22,6 +22,8 @@
import java.net.SocketAddress;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
+import java.util.LinkedList;
+import java.util.Queue;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -35,7 +37,6 @@
import org.apache.mina.common.TransportType;
import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.apache.mina.util.Queue;
/**
* Tests {@link TextLineDecoder}.
@@ -66,7 +67,7 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 1, out.getMessageQueue().size() );
- Assert.assertEquals( "ABC", out.getMessageQueue().pop() );
+ Assert.assertEquals( "ABC", out.getMessageQueue().poll() );
// Test two decode and one output
in.clear();
@@ -79,7 +80,7 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 1, out.getMessageQueue().size() );
- Assert.assertEquals( "DEFGHI", out.getMessageQueue().pop() );
+ Assert.assertEquals( "DEFGHI", out.getMessageQueue().poll() );
// Test one decode and two output
in.clear();
@@ -87,8 +88,8 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 2, out.getMessageQueue().size() );
- Assert.assertEquals( "JKL", out.getMessageQueue().pop() );
- Assert.assertEquals( "MNO", out.getMessageQueue().pop() );
+ Assert.assertEquals( "JKL", out.getMessageQueue().poll() );
+ Assert.assertEquals( "MNO", out.getMessageQueue().poll() );
// Test splitted long delimiter
decoder = new TextLineDecoder(
@@ -109,7 +110,7 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 1, out.getMessageQueue().size() );
- Assert.assertEquals( "PQR", out.getMessageQueue().pop() );
+ Assert.assertEquals( "PQR", out.getMessageQueue().poll() );
}
public void testAutoDecode() throws Exception
@@ -128,7 +129,7 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 1, out.getMessageQueue().size() );
- Assert.assertEquals( "ABC", out.getMessageQueue().pop() );
+ Assert.assertEquals( "ABC", out.getMessageQueue().poll() );
// Test two decode and one output
in.clear();
@@ -141,7 +142,7 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 1, out.getMessageQueue().size() );
- Assert.assertEquals( "DEFGHI", out.getMessageQueue().pop() );
+ Assert.assertEquals( "DEFGHI", out.getMessageQueue().poll() );
// Test one decode and two output
in.clear();
@@ -149,8 +150,8 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 2, out.getMessageQueue().size() );
- Assert.assertEquals( "JKL", out.getMessageQueue().pop() );
- Assert.assertEquals( "MNO", out.getMessageQueue().pop() );
+ Assert.assertEquals( "JKL", out.getMessageQueue().poll() );
+ Assert.assertEquals( "MNO", out.getMessageQueue().poll() );
// Test multiple '\n's
in.clear();
@@ -158,9 +159,9 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 3, out.getMessageQueue().size() );
- Assert.assertEquals( "", out.getMessageQueue().pop() );
- Assert.assertEquals( "", out.getMessageQueue().pop() );
- Assert.assertEquals( "", out.getMessageQueue().pop() );
+ Assert.assertEquals( "", out.getMessageQueue().poll() );
+ Assert.assertEquals( "", out.getMessageQueue().poll() );
+ Assert.assertEquals( "", out.getMessageQueue().poll() );
// Test splitted long delimiter (\r\r\n)
in.clear();
@@ -178,7 +179,7 @@
in.flip();
decoder.decode( session, in, out );
Assert.assertEquals( 1, out.getMessageQueue().size() );
- Assert.assertEquals( "PQR", out.getMessageQueue().pop() );
+ Assert.assertEquals( "PQR", out.getMessageQueue().poll() );
}
private static class DummySession extends BaseIoSession
@@ -240,11 +241,11 @@
private static class TestDecoderOutput implements ProtocolDecoderOutput
{
- private Queue messageQueue = new Queue();
+ private Queue<Object> messageQueue = new LinkedList<Object>();
public void write( Object message )
{
- messageQueue.push( message );
+ messageQueue.offer( message );
}
public Queue getMessageQueue()
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java Sun Nov 19 22:34:55 2006
@@ -65,7 +65,7 @@
encoder.encode( session, "ABC", out );
Assert.assertEquals( 1, out.getBufferQueue().size() );
- ByteBuffer buf = ( ByteBuffer ) out.getBufferQueue().pop();
+ ByteBuffer buf = ( ByteBuffer ) out.getBufferQueue().poll();
Assert.assertEquals( 5, buf.remaining() );
Assert.assertEquals( 'A', buf.get() );
Assert.assertEquals( 'B', buf.get() );
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java Sun Nov 19 22:34:55 2006
@@ -37,8 +37,8 @@
*/
public class ChatProtocolHandler extends IoHandlerAdapter
{
- private Set sessions = Collections.synchronizedSet( new HashSet() );
- private Set users = Collections.synchronizedSet( new HashSet() );
+ private Set<IoSession> sessions = Collections.synchronizedSet( new HashSet<IoSession>() );
+ private Set<String> users = Collections.synchronizedSet( new HashSet<String>() );
public void exceptionCaught( IoSession session, Throwable cause )
{
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java Sun Nov 19 22:34:55 2006
@@ -173,7 +173,7 @@
private Map parseRequest( Reader is )
{
- Map map = new HashMap();
+ Map<String, String[]> map = new HashMap<String, String[]>();
BufferedReader rdr = new BufferedReader( is );
try
@@ -198,8 +198,7 @@
// If method 'POST' then read Content-Length worth of data
if( url[ 0 ].equalsIgnoreCase( "POST" ) )
{
- int len = Integer.parseInt( ( ( String[] ) map
- .get( "Content-Length" ) )[ 0 ] );
+ int len = Integer.parseInt( map.get( "Content-Length" )[ 0 ] );
char[] buf = new char[ len ];
if( rdr.read( buf ) == len )
{
@@ -239,7 +238,7 @@
String name = "@".concat( tokens[ 0 ] );
if( map.containsKey( name ) )
{
- params = ( String[] ) map.get( name );
+ params = map.get( name );
String[] tmp = new String[ params.length + 1 ];
for( int j = 0; j < params.length; j++ )
tmp[ j ] = params[ j ];
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java Sun Nov 19 22:34:55 2006
@@ -41,11 +41,11 @@
*/
public class HttpResponseEncoder implements MessageEncoder
{
- private static final Set TYPES;
+ private static final Set<Class> TYPES;
static
{
- Set types = new HashSet();
+ Set<Class> types = new HashSet<Class>();
types.add( HttpResponseMessage.class );
TYPES = Collections.unmodifiableSet( types );
}
@@ -110,7 +110,7 @@
out.write( buf );
}
- public Set getMessageTypes()
+ public Set<Class> getMessageTypes()
{
return TYPES;
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java Sun Nov 19 22:34:55 2006
@@ -42,7 +42,7 @@
public static final int HTTP_STATUS_NOT_FOUND = 404;
/** Map<String, String> */
- private Map headers = new HashMap();
+ private Map<String, String> headers = new HashMap<String, String>();
/** Storage for body of HTTP response. */
private ByteArrayOutputStream body = new ByteArrayOutputStream( 1024 );
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java Sun Nov 19 22:34:55 2006
@@ -66,7 +66,7 @@
public void run()
{
String url;
- Map headers = new TreeMap();
+ Map<String, String> headers = new TreeMap<String, String>();
BufferedReader in = new BufferedReader(
new InputStreamReader( this.in ) );
PrintWriter out = new PrintWriter(
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java Sun Nov 19 22:34:55 2006
@@ -37,11 +37,11 @@
*/
public class AddMessageEncoder extends AbstractMessageEncoder
{
- private static final Set TYPES;
+ private static final Set<Class> TYPES;
static
{
- Set types = new HashSet();
+ Set<Class> types = new HashSet<Class>();
types.add( AddMessage.class );
TYPES = Collections.unmodifiableSet( types );
}
@@ -57,7 +57,7 @@
out.putInt( m.getValue() );
}
- public Set getMessageTypes()
+ public Set<Class> getMessageTypes()
{
return TYPES;
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java Sun Nov 19 22:34:55 2006
@@ -37,11 +37,11 @@
*/
public class ResultMessageEncoder extends AbstractMessageEncoder
{
- private static final Set TYPES;
+ private static final Set<Class> TYPES;
static
{
- Set types = new HashSet();
+ Set<Class> types = new HashSet<Class>();
types.add( ResultMessage.class );
TYPES = Collections.unmodifiableSet( types );
}
@@ -65,7 +65,7 @@
}
}
- public Set getMessageTypes()
+ public Set<Class> getMessageTypes()
{
return TYPES;
}
Modified: mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java (original)
+++ mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java Sun Nov 19 22:34:55 2006
@@ -20,6 +20,8 @@
package org.apache.mina.filter.support;
import java.nio.ByteBuffer;
+import java.util.LinkedList;
+import java.util.Queue;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
@@ -34,7 +36,6 @@
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.DefaultWriteFuture;
import org.apache.mina.filter.SSLFilter;
-import org.apache.mina.util.Queue;
import org.apache.mina.util.SessionLog;
/**
@@ -53,7 +54,7 @@
private final SSLFilter parent;
private final SSLContext ctx;
private final IoSession session;
- private final Queue scheduledWrites = new Queue();
+ private final Queue<ScheduledWrite> scheduledWrites = new LinkedList<ScheduledWrite>();
private SSLEngine sslEngine;
@@ -242,14 +243,14 @@
public void scheduleWrite( NextFilter nextFilter, WriteRequest writeRequest )
{
- scheduledWrites.push( new ScheduledWrite( nextFilter, writeRequest ) );
+ scheduledWrites.offer( new ScheduledWrite( nextFilter, writeRequest ) );
}
public void flushScheduledWrites() throws SSLException
{
ScheduledWrite scheduledWrite;
- while( ( scheduledWrite = ( ScheduledWrite ) scheduledWrites.pop() ) != null )
+ while( ( scheduledWrite = scheduledWrites.poll() ) != null )
{
if( SessionLog.isDebugEnabled( session ) )
{
Modified: mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceManager.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceManager.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceManager.java (original)
+++ mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceManager.java Sun Nov 19 22:34:55 2006
@@ -28,7 +28,6 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
-import org.apache.mina.management.IoSessionStat;
import org.apache.mina.management.StatCollector;
@@ -124,25 +123,25 @@
public float getAverageByteReadThroughput()
{
- return collector.getBytesReadThroughput() / (float) collector.getSessionCount();
+ return collector.getBytesReadThroughput() / collector.getSessionCount();
}
public float getAverageByteWrittenThroughput()
{
- return collector.getBytesWrittenThroughput() / (float) collector.getSessionCount();
+ return collector.getBytesWrittenThroughput() / collector.getSessionCount();
}
public float getAverageMessageReadThroughput()
{
- return collector.getMsgReadThroughput() / (float) collector.getSessionCount();
+ return collector.getMsgReadThroughput() / collector.getSessionCount();
}
public float getAverageMessageWrittenThroughput()
{
- return collector.getMsgWrittenThroughput() / (float) collector.getSessionCount();
+ return collector.getMsgWrittenThroughput() / collector.getSessionCount();
}
Modified: mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java (original)
+++ mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java Sun Nov 19 22:34:55 2006
@@ -122,14 +122,14 @@
protected Object createInstance() throws Exception
{
- BlockingQueue queue = null;
+ BlockingQueue<Runnable> queue = null;
if( queueCapacity > 0 )
{
- queue = new LinkedBlockingQueue( queueCapacity );
+ queue = new LinkedBlockingQueue<Runnable>( queueCapacity );
}
else
{
- queue = new SynchronousQueue();
+ queue = new SynchronousQueue<Runnable>();
}
return new ThreadPoolExecutor(
corePoolSize, maxPoolSize, keepAliveSeconds, TimeUnit.SECONDS,
Modified: mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/DefaultIoFilterChainBuilderFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/DefaultIoFilterChainBuilderFactoryBeanTest.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/DefaultIoFilterChainBuilderFactoryBeanTest.java (original)
+++ mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/DefaultIoFilterChainBuilderFactoryBeanTest.java Sun Nov 19 22:34:55 2006
@@ -75,7 +75,7 @@
public void testIllegalObjectsInFilterList() throws Exception
{
- LinkedList mappings = new LinkedList();
+ LinkedList<Object> mappings = new LinkedList<Object>();
mappings.add( new IoFilterMapping( "f0", filters[ 0 ] ) );
mappings.add( new Object() );
DefaultIoFilterChainBuilderFactoryBean factory =
@@ -92,7 +92,7 @@
public void testNamedAndUnnamedFilters() throws Exception
{
- LinkedList mappings = new LinkedList();
+ LinkedList<Object> mappings = new LinkedList<Object>();
mappings.add( new IoFilterMapping( "f0", filters[ 0 ] ) );
mappings.add( filters[ 1 ] );
mappings.add( new IoFilterMapping( "f2", filters[ 2 ] ) );
Modified: mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java (original)
+++ mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java Sun Nov 19 22:34:55 2006
@@ -38,7 +38,7 @@
{
public void testSuccessfulCreationWithExecutor() throws Exception
{
- Executor executor = new ThreadPoolExecutor( 1, 10, 3600, TimeUnit.SECONDS, new SynchronousQueue() );
+ Executor executor = new ThreadPoolExecutor( 1, 10, 3600, TimeUnit.SECONDS, new SynchronousQueue<Runnable>() );
ExecutorThreadModelFactoryBean factory = new ExecutorThreadModelFactoryBean();
factory.setServiceName( "foo" );
factory.setExecutor( executor );
Modified: mina/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/pom.xml?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Sun Nov 19 22:34:55 2006
@@ -81,8 +81,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
<debug>true</debug>
<optimize>true</optimize>
<showDeprecations>true</showDeprecations>