Modified: mina/trunk/core/src/test/java/org/apache/mina/util/IoBufferTest.java URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/util/IoBufferTest.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/core/src/test/java/org/apache/mina/util/IoBufferTest.java (original) +++ mina/trunk/core/src/test/java/org/apache/mina/util/IoBufferTest.java Sat Dec 17 08:00:42 2011 @@ -13,8 +13,7 @@ import java.util.Arrays; import org.junit.Test; -public class IoBufferTest -{ +public class IoBufferTest { /** * Test the addition of 3 heap buffers with data */ @@ -34,17 +33,17 @@ public class IoBufferTest IoBuffer ioBuffer = new IoBuffer(); ioBuffer.add(bb1, bb2).add(bb3); - + assertEquals(0, ioBuffer.position()); assertEquals(10, ioBuffer.limit()); assertEquals(10, ioBuffer.capacity()); assertTrue(ioBuffer.hasRemaining()); - - for (int i=0;i<10;i++) { + + for (int i = 0; i < 10; i++) { assertTrue(ioBuffer.hasRemaining()); assertEquals("0123456789".charAt(i), ioBuffer.get()); } - + try { assertFalse(ioBuffer.hasRemaining()); ioBuffer.get(); @@ -53,7 +52,7 @@ public class IoBufferTest assertTrue(true); } } - + /** * Test the addition of 3 heap buffers, one being empty */ @@ -71,16 +70,16 @@ public class IoBufferTest IoBuffer ioBuffer = new IoBuffer(); ioBuffer.add(bb1, bb2).add(bb3); - + assertEquals(0, ioBuffer.position()); assertEquals(7, ioBuffer.limit()); assertEquals(7, ioBuffer.capacity()); - - for (int i=0;i<7;i++) { + + for (int i = 0; i < 7; i++) { assertTrue(ioBuffer.hasRemaining()); assertEquals("0123456".charAt(i), ioBuffer.get()); } - + try { ioBuffer.get(); fail(); @@ -88,11 +87,11 @@ public class IoBufferTest assertTrue(true); } } - + /** * Test the addition of mixed type buffers */ - @Test ( expected=RuntimeException.class) + @Test(expected = RuntimeException.class) public void testAddMixedTypeBuffers() { ByteBuffer bb1 = ByteBuffer.allocate(5); bb1.put("012".getBytes()); @@ -105,11 +104,11 @@ public class IoBufferTest IoBuffer ioBuffer = new IoBuffer(); ioBuffer.add(bb1, bb2); } - + /** * Test the addition of mixed order buffers */ - @Test ( expected=RuntimeException.class) + @Test(expected = RuntimeException.class) public void testAddMixedOrderBuffers() { ByteBuffer bb1 = ByteBuffer.allocate(5); bb1.order(ByteOrder.LITTLE_ENDIAN); @@ -124,15 +123,14 @@ public class IoBufferTest IoBuffer ioBuffer = new IoBuffer(); ioBuffer.add(bb1, bb2); } - + /** * Test the allocation of a new heap IoBuffer with no byte in it */ @Test - public void testAllocate0() - { + public void testAllocate0() { IoBuffer ioBuffer = IoBuffer.allocate(0); - + assertFalse(ioBuffer.isDirect()); assertEquals(0, ioBuffer.capacity()); assertEquals(0, ioBuffer.limit()); @@ -144,25 +142,23 @@ public class IoBufferTest * Test the allocation of a new heap IoBuffer with 1024 bytes */ @Test - public void testAllocate1024() - { + public void testAllocate1024() { IoBuffer ioBuffer = IoBuffer.allocate(1024); - + assertFalse(ioBuffer.isDirect()); assertEquals(1024, ioBuffer.capacity()); assertEquals(1024, ioBuffer.limit()); assertEquals(0, ioBuffer.position()); assertTrue(ioBuffer.hasRemaining()); } - + /** * Test the allocation of a new direct IoBuffer with no byte in it */ @Test - public void testAllocateDirect0() - { + public void testAllocateDirect0() { IoBuffer ioBuffer = IoBuffer.allocateDirect(0); - + assertTrue(ioBuffer.isDirect()); assertEquals(0, ioBuffer.capacity()); assertEquals(0, ioBuffer.limit()); @@ -174,17 +170,16 @@ public class IoBufferTest * Test the allocation of a new direct IoBuffer with 1024 bytes */ @Test - public void testAllocateDirect1024() - { + public void testAllocateDirect1024() { IoBuffer ioBuffer = IoBuffer.allocateDirect(1024); - + assertTrue(ioBuffer.isDirect()); assertEquals(1024, ioBuffer.capacity()); assertEquals(1024, ioBuffer.limit()); assertEquals(0, ioBuffer.position()); assertTrue(ioBuffer.hasRemaining()); } - + /** * Test the get() method on a IoBuffer containing one ByteBuffer with 3 bytes */ @@ -193,7 +188,7 @@ public class IoBufferTest ByteBuffer bb = ByteBuffer.allocate(5); bb.put("012".getBytes()); bb.flip(); - + IoBuffer ioBuffer = new IoBuffer(bb); assertEquals(0, ioBuffer.position()); assertEquals(3, ioBuffer.limit()); @@ -204,7 +199,7 @@ public class IoBufferTest assertEquals('1', ioBuffer.get()); assertTrue(ioBuffer.hasRemaining()); assertEquals('2', ioBuffer.get()); - + try { assertFalse(ioBuffer.hasRemaining()); ioBuffer.get(); @@ -214,14 +209,14 @@ public class IoBufferTest assertEquals(3, ioBuffer.position()); } } - + /** * Test the get() method on a IoBuffer containing one ByteBuffer with 0 bytes */ @Test public void testGetOneBuffer0Bytes() { ByteBuffer bb = ByteBuffer.allocate(0); - + IoBuffer ioBuffer = new IoBuffer(bb); assertEquals(0, ioBuffer.position()); assertEquals(0, ioBuffer.limit()); @@ -235,7 +230,7 @@ public class IoBufferTest assertEquals(0, ioBuffer.position()); } } - + /** * Test the get() method on a IoBuffer containing two ByteBuffer with 3 bytes */ @@ -248,7 +243,7 @@ public class IoBufferTest ByteBuffer bb2 = ByteBuffer.allocate(5); bb2.put("345".getBytes()); bb2.flip(); - + IoBuffer ioBuffer = new IoBuffer(bb1, bb2); assertEquals(0, ioBuffer.position()); @@ -266,7 +261,7 @@ public class IoBufferTest assertEquals('4', ioBuffer.get()); assertTrue(ioBuffer.hasRemaining()); assertEquals('5', ioBuffer.get()); - + try { assertFalse(ioBuffer.hasRemaining()); ioBuffer.get(); @@ -276,7 +271,7 @@ public class IoBufferTest assertEquals(6, ioBuffer.position()); } } - + /** * Test the array method for a IoBuffer containing one ByteBuffer */ @@ -287,26 +282,26 @@ public class IoBufferTest bb1.flip(); IoBuffer ioBuffer = new IoBuffer(bb1); - + byte[] array = ioBuffer.array(); assertNotNull(array); assertEquals(3, array.length); - assertTrue(Arrays.equals(new byte[]{'0', '1', '2'}, array)); + assertTrue(Arrays.equals(new byte[] { '0', '1', '2' }, array)); } - + /** * Test the array method for a IoBuffer containing one empty ByteBuffer */ @Test public void testArrayEmptyByteBuffer() { IoBuffer ioBuffer = new IoBuffer(); - + byte[] array = ioBuffer.array(); assertNotNull(array); assertEquals(0, array.length); - assertTrue(Arrays.equals(new byte[]{}, array)); + assertTrue(Arrays.equals(new byte[] {}, array)); } - + /** * Test the array method for a IoBuffer containing one ByteBuffer not initialized */ @@ -314,13 +309,13 @@ public class IoBufferTest public void testArrayByteBufferNotInitialized() { ByteBuffer bb = ByteBuffer.allocate(3); IoBuffer ioBuffer = new IoBuffer(bb); - + byte[] array = ioBuffer.array(); assertNotNull(array); assertEquals(3, array.length); - assertTrue(Arrays.equals(new byte[]{0x00, 0x00, 0x00}, array)); + assertTrue(Arrays.equals(new byte[] { 0x00, 0x00, 0x00 }, array)); } - + /** * Test the array method for a IoBuffer containing three ByteBuffers */ @@ -337,13 +332,13 @@ public class IoBufferTest bb3.flip(); IoBuffer ioBuffer = new IoBuffer(bb1, bb2, bb3); - + byte[] array = ioBuffer.array(); assertNotNull(array); assertEquals(7, array.length); - assertTrue(Arrays.equals(new byte[]{'0', '1', '2', '3', '4', '5', '6'}, array)); + assertTrue(Arrays.equals(new byte[] { '0', '1', '2', '3', '4', '5', '6' }, array)); } - + /** * Test the getInt() method, on a buffer containing 2 ints in one ByteBuffer */ @@ -358,7 +353,7 @@ public class IoBufferTest assertEquals(12345, ioBuffer.getInt()); assertEquals(67890, ioBuffer.getInt()); } - + /** * Test the getInt() method, on a buffer containing 2 ints in two ByteBuffers */ @@ -377,7 +372,7 @@ public class IoBufferTest assertEquals(12345, ioBuffer.getInt()); assertEquals(67890, ioBuffer.getInt()); } - + /** * Test the getInt() method, on a buffer containing 2 ints in two ByteBuffers * with LittleInidan order @@ -399,43 +394,43 @@ public class IoBufferTest assertEquals(12345, ioBuffer.getInt()); assertEquals(67890, ioBuffer.getInt()); } - + /** * Test the getInt() method, on a buffer containing 1 int spread in two ByteBuffers */ @Test public void testGetInt1Int2BBs() { ByteBuffer bb1 = ByteBuffer.allocate(1); - bb1.put((byte)0x01); + bb1.put((byte) 0x01); bb1.flip(); ByteBuffer bb2 = ByteBuffer.allocate(3); - bb2.put(new byte[]{0x02, 0x03, 0x04}); + bb2.put(new byte[] { 0x02, 0x03, 0x04 }); bb2.flip(); IoBuffer ioBuffer = new IoBuffer(bb1, bb2); assertEquals(0x01020304, ioBuffer.getInt()); } - + /** * Test the getInt() method, on a buffer containing 1 incomplet int spread in two ByteBuffers */ - @Test( expected=BufferUnderflowException.class ) + @Test(expected = BufferUnderflowException.class) public void testGetIntIncompletInt2BBs() { ByteBuffer bb1 = ByteBuffer.allocate(1); - bb1.put((byte)0x01); + bb1.put((byte) 0x01); bb1.flip(); ByteBuffer bb2 = ByteBuffer.allocate(2); - bb2.put(new byte[]{0x02, 0x03}); + bb2.put(new byte[] { 0x02, 0x03 }); bb2.flip(); IoBuffer ioBuffer = new IoBuffer(bb1, bb2); ioBuffer.getInt(); } - + /** * test the get(int) method on one buffer */ @@ -444,7 +439,7 @@ public class IoBufferTest ByteBuffer bb = ByteBuffer.allocate(4); bb.put("0123".getBytes()); bb.flip(); - + IoBuffer ioBuffer = new IoBuffer(bb); assertEquals('0', ioBuffer.get()); @@ -454,7 +449,7 @@ public class IoBufferTest assertEquals('1', ioBuffer.get(1)); assertEquals('2', ioBuffer.get(2)); assertEquals('2', ioBuffer.get()); - + try { ioBuffer.get(4); fail(); @@ -463,7 +458,7 @@ public class IoBufferTest assertTrue(true); } } - + /** * test the get(int) method on two buffers */ @@ -472,11 +467,11 @@ public class IoBufferTest ByteBuffer bb1 = ByteBuffer.allocate(4); bb1.put("0123".getBytes()); bb1.flip(); - + ByteBuffer bb2 = ByteBuffer.allocate(4); bb2.put("4567".getBytes()); bb2.flip(); - + IoBuffer ioBuffer = new IoBuffer(bb1, bb2); assertEquals('0', ioBuffer.get()); @@ -488,7 +483,7 @@ public class IoBufferTest assertEquals('2', ioBuffer.get()); assertEquals('3', ioBuffer.get()); assertEquals('4', ioBuffer.get()); - + try { ioBuffer.get(8); fail(); @@ -497,7 +492,7 @@ public class IoBufferTest assertTrue(true); } } - + /** * Test the clear() method */ @@ -506,25 +501,25 @@ public class IoBufferTest ByteBuffer bb1 = ByteBuffer.allocate(4); bb1.put("0123".getBytes()); bb1.flip(); - + ByteBuffer bb2 = ByteBuffer.allocate(4); bb2.put("4567".getBytes()); bb2.flip(); - + IoBuffer ioBuffer = new IoBuffer(bb1, bb2); // Move forward a bit ioBuffer.get(); ioBuffer.get(); - + // Clear ioBuffer.clear(); - + // We should be back to the origin assertEquals(0, ioBuffer.position()); assertEquals(8, ioBuffer.limit()); } - + /** * Test the flip() method */ @@ -533,20 +528,20 @@ public class IoBufferTest ByteBuffer bb1 = ByteBuffer.allocate(4); bb1.put("0123".getBytes()); bb1.flip(); - + ByteBuffer bb2 = ByteBuffer.allocate(4); bb2.put("4567".getBytes()); bb2.flip(); - + IoBuffer ioBuffer = new IoBuffer(bb1, bb2); // Move forward a bit ioBuffer.get(); ioBuffer.get(); - + // Clear ioBuffer.clear(); - + // We should be back to the origin assertEquals(0, ioBuffer.position()); assertEquals(8, ioBuffer.limit());
Modified: mina/trunk/examples/src/main/java/org/apache/mina/examples/http/BogusSslContextFactory.java URL: http://svn.apache.org/viewvc/mina/trunk/examples/src/main/java/org/apache/mina/examples/http/BogusSslContextFactory.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/examples/src/main/java/org/apache/mina/examples/http/BogusSslContextFactory.java (original) +++ mina/trunk/examples/src/main/java/org/apache/mina/examples/http/BogusSslContextFactory.java Sat Dec 17 08:00:42 2011 @@ -30,7 +30,7 @@ import javax.net.ssl.SSLContext; /** * Factory to create a bogus SSLContext. - * + * * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ public class BogusSslContextFactory { @@ -43,8 +43,7 @@ public class BogusSslContextFactory { private static final String KEY_MANAGER_FACTORY_ALGORITHM; static { - String algorithm = Security - .getProperty("ssl.KeyManagerFactory.algorithm"); + String algorithm = Security.getProperty("ssl.KeyManagerFactory.algorithm"); if (algorithm == null) { algorithm = KeyManagerFactory.getDefaultAlgorithm(); } @@ -58,10 +57,10 @@ public class BogusSslContextFactory { private static final String BOGUS_KEYSTORE = "bogus.cert"; // NOTE: The keystore was generated using keytool: - // keytool -genkey -alias bogus -keysize 512 -validity 3650 - // -keyalg RSA -dname "CN=bogus.com, OU=XXX CA, - // O=Bogus Inc, L=Stockholm, S=Stockholm, C=SE" - // -keypass boguspw -storepass boguspw -keystore bogus.cert + // keytool -genkey -alias bogus -keysize 512 -validity 3650 + // -keyalg RSA -dname "CN=bogus.com, OU=XXX CA, + // O=Bogus Inc, L=Stockholm, S=Stockholm, C=SE" + // -keypass boguspw -storepass boguspw -keystore bogus.cert /** * Bougus keystore password. @@ -69,27 +68,25 @@ public class BogusSslContextFactory { private static final char[] BOGUS_PW = { 'b', 'o', 'g', 'u', 's', 'p', 'w' }; private static SSLContext serverInstance = null; - + private static SSLContext clientInstance = null; /** * Get SSLContext singleton. - * + * * @return SSLContext * @throws java.security.GeneralSecurityException - * + * */ - public static SSLContext getInstance(boolean server) - throws GeneralSecurityException { + public static SSLContext getInstance(boolean server) throws GeneralSecurityException { SSLContext retInstance = null; if (server) { - synchronized(BogusSslContextFactory.class) { + synchronized (BogusSslContextFactory.class) { if (serverInstance == null) { try { serverInstance = createBougusServerSslContext(); } catch (Exception ioe) { - throw new GeneralSecurityException( - "Can't create Server SSLContext:" + ioe); + throw new GeneralSecurityException("Can't create Server SSLContext:" + ioe); } } } @@ -105,14 +102,12 @@ public class BogusSslContextFactory { return retInstance; } - private static SSLContext createBougusServerSslContext() - throws GeneralSecurityException, IOException { + private static SSLContext createBougusServerSslContext() throws GeneralSecurityException, IOException { // Create keystore KeyStore ks = KeyStore.getInstance("JKS"); InputStream in = null; try { - in = BogusSslContextFactory.class - .getResourceAsStream(BOGUS_KEYSTORE); + in = BogusSslContextFactory.class.getResourceAsStream(BOGUS_KEYSTORE); ks.load(in, BOGUS_PW); } finally { if (in != null) { @@ -124,20 +119,17 @@ public class BogusSslContextFactory { } // Set up key manager factory to use our key store - KeyManagerFactory kmf = KeyManagerFactory - .getInstance(KEY_MANAGER_FACTORY_ALGORITHM); + KeyManagerFactory kmf = KeyManagerFactory.getInstance(KEY_MANAGER_FACTORY_ALGORITHM); kmf.init(ks, BOGUS_PW); // Initialize the SSLContext to work with our key managers. SSLContext sslContext = SSLContext.getInstance(PROTOCOL); - sslContext.init(kmf.getKeyManagers(), - BogusTrustManagerFactory.X509_MANAGERS, null); + sslContext.init(kmf.getKeyManagers(), BogusTrustManagerFactory.X509_MANAGERS, null); return sslContext; } - private static SSLContext createBougusClientSslContext() - throws GeneralSecurityException { + private static SSLContext createBougusClientSslContext() throws GeneralSecurityException { SSLContext context = SSLContext.getInstance(PROTOCOL); context.init(null, BogusTrustManagerFactory.X509_MANAGERS, null); return context; Modified: mina/trunk/examples/src/main/java/org/apache/mina/examples/http/BogusTrustManagerFactory.java URL: http://svn.apache.org/viewvc/mina/trunk/examples/src/main/java/org/apache/mina/examples/http/BogusTrustManagerFactory.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/examples/src/main/java/org/apache/mina/examples/http/BogusTrustManagerFactory.java (original) +++ mina/trunk/examples/src/main/java/org/apache/mina/examples/http/BogusTrustManagerFactory.java Sat Dec 17 08:00:42 2011 @@ -32,18 +32,16 @@ import javax.net.ssl.X509TrustManager; /** * Bogus trust manager factory. Creates BogusX509TrustManager - * + * * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ class BogusTrustManagerFactory extends TrustManagerFactorySpi { static final X509TrustManager X509 = new X509TrustManager() { - public void checkClientTrusted(X509Certificate[] x509Certificates, - String s) throws CertificateException { + public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { } - public void checkServerTrusted(X509Certificate[] x509Certificates, - String s) throws CertificateException { + public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { } public X509Certificate[] getAcceptedIssuers() { Modified: mina/trunk/examples/src/main/java/org/apache/mina/examples/http/HttpsTest.java URL: http://svn.apache.org/viewvc/mina/trunk/examples/src/main/java/org/apache/mina/examples/http/HttpsTest.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/examples/src/main/java/org/apache/mina/examples/http/HttpsTest.java (original) +++ mina/trunk/examples/src/main/java/org/apache/mina/examples/http/HttpsTest.java Sat Dec 17 08:00:42 2011 @@ -54,11 +54,10 @@ public class HttpsTest { OneThreadSelectorStrategy strategy = new OneThreadSelectorStrategy(new SelectorFactory( NioSelectorProcessor.class)); NioTcpServer acceptor = new NioTcpServer(strategy); - + // Make it use https, injecting a default SSLContext instance - acceptor.setSslContext(BogusSslContextFactory - .getInstance(true)); - + acceptor.setSslContext(BogusSslContextFactory.getInstance(true)); + acceptor.setFilters(new LoggingFilter("INCOMING"), new HttpServerCodec(), new LoggingFilter("DECODED"), new DummyHttpSever()); Modified: mina/trunk/examples/src/main/java/org/apache/mina/examples/ldap/LdapTest.java URL: http://svn.apache.org/viewvc/mina/trunk/examples/src/main/java/org/apache/mina/examples/ldap/LdapTest.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/examples/src/main/java/org/apache/mina/examples/ldap/LdapTest.java (original) +++ mina/trunk/examples/src/main/java/org/apache/mina/examples/ldap/LdapTest.java Sat Dec 17 08:00:42 2011 @@ -47,8 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * A simple LDAP server class used to test theLDAP encoder/decoder. It only deal with the - * BindRequest message. + * A simple LDAP server class used to test theLDAP encoder/decoder. It only deal with the BindRequest message. */ public class LdapTest { private static final Logger LOG = LoggerFactory.getLogger(LdapTest.class); @@ -59,7 +58,7 @@ public class LdapTest { NioSelectorProcessor.class)); NioTcpServer acceptor = new NioTcpServer(strategy); acceptor.setFilters(new LoggingFilter("INCOMING"), new LdapCodec(), new LoggingFilter("DECODED"), - ldapServer.new DummyLdapSever()); + ldapServer.new DummyLdapSever()); acceptor.bind(new InetSocketAddress(10389)); @@ -71,45 +70,44 @@ public class LdapTest { private class DummyLdapSever extends DefaultIoFilter { @Override - public void messageReceived( IoSession session, Object message, ReadFilterChainController controller ) - { + public void messageReceived(IoSession session, Object message, ReadFilterChainController controller) { if (message instanceof AbandonRequest) { - handle(session, (AbandonRequest)message); + handle(session, (AbandonRequest) message); } else if (message instanceof AddRequest) { - handle(session, (AddRequest)message); + handle(session, (AddRequest) message); } else if (message instanceof BindRequest) { - handle(session, (BindRequest)message); + handle(session, (BindRequest) message); } else if (message instanceof CompareRequest) { - handle(session, (CompareRequest)message); + handle(session, (CompareRequest) message); } else if (message instanceof DeleteRequest) { - handle(session, (DeleteRequest)message); + handle(session, (DeleteRequest) message); } else if (message instanceof ExtendedRequest) { - handle(session, (ExtendedRequest)message); + handle(session, (ExtendedRequest) message); } else if (message instanceof ModifyRequest) { - handle(session, (ModifyRequest)message); + handle(session, (ModifyRequest) message); } else if (message instanceof ModifyDnRequest) { - handle(session, (ModifyDnRequest)message); + handle(session, (ModifyDnRequest) message); } else if (message instanceof SearchRequest) { - handle(session, (SearchRequest)message); + handle(session, (SearchRequest) message); } else if (message instanceof UnbindRequest) { - handle(session, (UnbindRequest)message); + handle(session, (UnbindRequest) message); } } - + /** * Process the AbandonRequest message */ private void handle(IoSession session, AbandonRequest abandonRequest) { // Do nothing } - + /** * Process the AddRequest message */ private void handle(IoSession session, AddRequest addRequest) { // Do nothing } - + /** * Process the BindRequest message */ @@ -120,49 +118,49 @@ public class LdapTest { session.write(response); } - + /** * Process the CompareRequest message */ private void handle(IoSession session, CompareRequest compareRequest) { // Do nothing } - + /** * Process the DeleteRequest message */ private void handle(IoSession session, DeleteRequest deleteRequest) { // Do nothing } - + /** * Process the ExtendedRequest message */ private void handle(IoSession session, ExtendedRequest extendedRequest) { // Do nothing } - + /** * Process the ModifyRequest message */ private void handle(IoSession session, ModifyRequest modifyRequest) { // Do nothing } - + /** * Process the ModifyDnRequest message */ private void handle(IoSession session, ModifyDnRequest modifyDnRequest) { // Do nothing } - + /** * Process the SearchRequest message */ private void handle(IoSession session, SearchRequest searchRequest) { // Do nothing } - + /** * Process the UnbindRequest message */ Modified: mina/trunk/http/src/main/java/org/apache/mina/http/DateUtil.java URL: http://svn.apache.org/viewvc/mina/trunk/http/src/main/java/org/apache/mina/http/DateUtil.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/http/src/main/java/org/apache/mina/http/DateUtil.java (original) +++ mina/trunk/http/src/main/java/org/apache/mina/http/DateUtil.java Sat Dec 17 08:00:42 2011 @@ -31,8 +31,11 @@ import java.util.regex.Pattern; public class DateUtil { private final static Locale LOCALE = Locale.US; + private final static TimeZone GMT_ZONE; + private final static String RFC_1123_PATTERN = "EEE, dd MMM yyyy HH:mm:ss zzz"; + private final static DateFormat RFC_1123_FORMAT; /** Pattern to find digits only. */ Modified: mina/trunk/http/src/main/java/org/apache/mina/http/HttpServerCodec.java URL: http://svn.apache.org/viewvc/mina/trunk/http/src/main/java/org/apache/mina/http/HttpServerCodec.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/http/src/main/java/org/apache/mina/http/HttpServerCodec.java (original) +++ mina/trunk/http/src/main/java/org/apache/mina/http/HttpServerCodec.java Sat Dec 17 08:00:42 2011 @@ -37,12 +37,13 @@ public class HttpServerCodec extends Pro private static final String PARTIAL_HEAD_ATT = "http.ph"; private static ProtocolEncoder encoder = new HttpServerEncoder(); + private static ProtocolDecoder decoder = new HttpServerDecoder(); public HttpServerCodec() { super(encoder, decoder); } - + @Override public void sessionCreated(IoSession session) { super.sessionCreated(session); Modified: mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapCodec.java URL: http://svn.apache.org/viewvc/mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapCodec.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapCodec.java (original) +++ mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapCodec.java Sat Dec 17 08:00:42 2011 @@ -46,10 +46,9 @@ import org.apache.mina.filterchain.Write import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * A LDAP message codec. - * + * * @author <a href="mailto:[email protected]";>Apache Directory Project</a> */ public class LdapCodec extends ProtocolCodecFilter { @@ -67,57 +66,52 @@ public class LdapCodec extends ProtocolC public LdapCodec() { super(ldapEncoder, ldapDecoder); } - - + @Override public void sessionCreated(IoSession session) { - LdapMessageContainer<MessageDecorator<? extends Message>> container = - new LdapMessageContainer<MessageDecorator<? extends Message>>(codec); + LdapMessageContainer<MessageDecorator<? extends Message>> container = new LdapMessageContainer<MessageDecorator<? extends Message>>( + codec); session.setAttribute("messageContainer", container); } - @Override public void sessionOpened(IoSession session) { } - @Override public void sessionClosed(IoSession session) { - session.removeAttribute( "messageContainer" ); + session.removeAttribute("messageContainer"); } - @Override public void sessionIdle(IoSession session, IdleStatus status) { // TODO Auto-generated method stub } - @Override public void messageWriting(IoSession session, Object message, WriteFilterChainController controller) { if (message instanceof AddResponse) { - ldapEncoder.encode(session, (AddResponse)message, controller); + ldapEncoder.encode(session, (AddResponse) message, controller); } else if (message instanceof BindResponse) { - ldapEncoder.encode(session, (BindResponse)message, controller); + ldapEncoder.encode(session, (BindResponse) message, controller); } else if (message instanceof DeleteResponse) { - ldapEncoder.encode(session, (DeleteResponse)message, controller); + ldapEncoder.encode(session, (DeleteResponse) message, controller); } else if (message instanceof CompareResponse) { - ldapEncoder.encode(session, (CompareResponse)message, controller); + ldapEncoder.encode(session, (CompareResponse) message, controller); } else if (message instanceof ExtendedResponse) { - ldapEncoder.encode(session, (ExtendedResponse)message, controller); + ldapEncoder.encode(session, (ExtendedResponse) message, controller); } else if (message instanceof IntermediateResponse) { - ldapEncoder.encode(session, (IntermediateResponse)message, controller); + ldapEncoder.encode(session, (IntermediateResponse) message, controller); } else if (message instanceof ModifyResponse) { - ldapEncoder.encode(session, (ModifyResponse)message, controller); + ldapEncoder.encode(session, (ModifyResponse) message, controller); } else if (message instanceof ModifyDnResponse) { - ldapEncoder.encode(session, (ModifyDnResponse)message, controller); + ldapEncoder.encode(session, (ModifyDnResponse) message, controller); } else if (message instanceof SearchResultDone) { - ldapEncoder.encode(session, (SearchResultDone)message, controller); + ldapEncoder.encode(session, (SearchResultDone) message, controller); } else if (message instanceof SearchResultEntry) { - ldapEncoder.encode(session, (SearchResultEntry)message, controller); + ldapEncoder.encode(session, (SearchResultEntry) message, controller); } else if (message instanceof SearchResultReference) { - ldapEncoder.encode(session, (SearchResultReference)message, controller); + ldapEncoder.encode(session, (SearchResultReference) message, controller); } else if (message instanceof ByteBuffer) { controller.callWriteNextFilter(session, message); } Modified: mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapProtocolDecoder.java URL: http://svn.apache.org/viewvc/mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapProtocolDecoder.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapProtocolDecoder.java (original) +++ mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapProtocolDecoder.java Sat Dec 17 08:00:42 2011 @@ -19,7 +19,6 @@ */ package org.apache.mina.ldap; - import java.nio.ByteBuffer; import org.apache.directory.shared.asn1.DecoderException; @@ -37,41 +36,37 @@ import org.apache.mina.filterchain.ReadF import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * A LDAP message decoder. It is based on shared-ldap decoder. - * + * * @author <a href="mailto:[email protected]";>Apache Directory Project</a> */ public class LdapProtocolDecoder implements ProtocolDecoder { /** The logger */ - private static Logger LOG = LoggerFactory.getLogger( LdapProtocolDecoder.class ); + private static Logger LOG = LoggerFactory.getLogger(LdapProtocolDecoder.class); /** A speedup for logger */ private static final boolean IS_DEBUG = LOG.isDebugEnabled(); /** The ASN 1 decoder instance */ private Asn1Decoder asn1Decoder; - - + /** * Creates a new instance of LdapProtocolEncoder. - * + * * @param codec The LDAP codec service associated with this encoder. */ public LdapProtocolDecoder() { asn1Decoder = new Asn1Decoder(); } - /** * {@inheritDoc} */ public Object decode(IoSession session, ByteBuffer in, ReadFilterChainController controller) { @SuppressWarnings("unchecked") - LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer = - (LdapMessageContainer<MessageDecorator<? extends Message>>) - session.getAttribute("messageContainer"); + LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer = (LdapMessageContainer<MessageDecorator<? extends Message>>) session + .getAttribute("messageContainer"); if (session.containsAttribute("maxPDUSize")) { int maxPDUSize = (Integer) session.getAttribute("maxPDUSize"); @@ -81,41 +76,35 @@ public class LdapProtocolDecoder impleme try { Object message = null; - + do { - message = decode( in, messageContainer ); - - controller.callReadNextFilter(session, message ); - } while( message != null); - } - catch (DecoderException lde) { + message = decode(in, messageContainer); + + controller.callReadNextFilter(session, message); + } while (message != null); + } catch (DecoderException lde) { // Do something } - + return null; } - /** - * Decode an incoming buffer into LDAP messages. The result can be 0, 1 or many - * LDAP messages, which will be stored into the array the caller has created. + * Decode an incoming buffer into LDAP messages. The result can be 0, 1 or many LDAP messages, which will be stored + * into the array the caller has created. * * @param buffer The incoming byte buffer - * @param messageContainer The LdapMessageContainer which will be used to store the - * message being decoded. If the message is not fully decoded, the ucrrent state - * is stored into this container + * @param messageContainer The LdapMessageContainer which will be used to store the message being decoded. If the + * message is not fully decoded, the ucrrent state is stored into this container * @param decodedMessages The list of decoded messages * @throws Exception If the decoding failed */ - private Object decode( ByteBuffer buffer, LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer ) throws DecoderException - { - while ( buffer.hasRemaining() ) - { - try - { - if ( IS_DEBUG ) - { - LOG.debug( "Decoding the PDU : " ); + private Object decode(ByteBuffer buffer, LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer) + throws DecoderException { + while (buffer.hasRemaining()) { + try { + if (IS_DEBUG) { + LOG.debug("Decoding the PDU : "); int size = buffer.limit(); int position = buffer.position(); @@ -125,23 +114,18 @@ public class LdapProtocolDecoder impleme System.arraycopy(buffer.array(), position, array, 0, pduLength); - if ( array.length == 0 ) - { - LOG.debug( "NULL buffer, what the HELL ???" ); - } - else - { - LOG.debug( Strings.dumpBytes(array) ); + if (array.length == 0) { + LOG.debug("NULL buffer, what the HELL ???"); + } else { + LOG.debug(Strings.dumpBytes(array)); } } - asn1Decoder.decode( buffer, messageContainer ); + asn1Decoder.decode(buffer, messageContainer); - if ( messageContainer.getState() == TLVStateEnum.PDU_DECODED ) - { - if ( IS_DEBUG ) - { - LOG.debug( "Decoded LdapMessage : " + messageContainer.getMessage() ); + if (messageContainer.getState() == TLVStateEnum.PDU_DECODED) { + if (IS_DEBUG) { + LOG.debug("Decoded LdapMessage : " + messageContainer.getMessage()); } Message message = messageContainer.getMessage(); @@ -149,46 +133,37 @@ public class LdapProtocolDecoder impleme return message; } - } - catch ( DecoderException de ) - { + } catch (DecoderException de) { buffer.clear(); messageContainer.clean(); - if ( de instanceof ResponseCarryingException ) - { + if (de instanceof ResponseCarryingException) { // Transform the DecoderException message to a MessageException - ResponseCarryingMessageException rcme = new ResponseCarryingMessageException( de.getMessage() ); - rcme.setResponse( ( ( ResponseCarryingException ) de ).getResponse() ); + ResponseCarryingMessageException rcme = new ResponseCarryingMessageException(de.getMessage()); + rcme.setResponse(((ResponseCarryingException) de).getResponse()); throw rcme; - } - else - { + } else { // TODO : This is certainly not the way we should handle such an exception ! - throw new ResponseCarryingException( de.getMessage() ); + throw new ResponseCarryingException(de.getMessage()); } } } - + return null; } - /** * {@inheritDoc} */ - public Object finishDecode( IoSession session) throws Exception - { + public Object finishDecode(IoSession session) throws Exception { return null; } - /** * {@inheritDoc} */ - public void dispose( IoSession session ) throws Exception - { + public void dispose(IoSession session) throws Exception { // Nothing to do } } Modified: mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapProtocolEncoder.java URL: http://svn.apache.org/viewvc/mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapProtocolEncoder.java?rev=1215440&r1=1215439&r2=1215440&view=diff ============================================================================== --- mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapProtocolEncoder.java (original) +++ mina/trunk/ldap/src/main/java/org/apache/mina/ldap/LdapProtocolEncoder.java Sat Dec 17 08:00:42 2011 @@ -19,7 +19,6 @@ */ package org.apache.mina.ldap; - import java.nio.ByteBuffer; import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; @@ -29,48 +28,43 @@ import org.apache.mina.api.IoSession; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filterchain.WriteFilterChainController; - /** * A LDAP message encoder. It is based on shared-ldap encoder. - * + * * @author <a href="mailto:[email protected]";>Apache Directory Project</a> */ public class LdapProtocolEncoder implements ProtocolEncoder { /** The stateful encoder */ private LdapEncoder encoder; - - + /** * Creates a new instance of LdapProtocolEncoder. - * + * * @param codec The LDAP codec service associated with this encoder. */ public LdapProtocolEncoder() { this.encoder = new LdapEncoder(LdapApiServiceFactory.getSingleton()); } - /** * {@inheritDoc} */ public Object encode(IoSession session, Object message, WriteFilterChainController controller) { try { - ByteBuffer buffer = encoder.encodeMessage( ( Message ) message ); - + ByteBuffer buffer = encoder.encodeMessage((Message) message); + controller.callWriteNextFilter(session, buffer); } catch (Exception e) { return null; } - + return null; } - /** * {@inheritDoc} */ - public void dispose( IoSession session ) throws Exception - { + public void dispose(IoSession session) throws Exception { // Nothing to do } }
