You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/04/18 06:20:42 UTC
svn commit: r161724 - in directory/protocol-providers/ldap/trunk/src:
main/java/org/apache/ldap/server/protocol/
test/org/apache/ldap/server/protocol/
Author: trustin
Date: Sun Apr 17 21:20:38 2005
New Revision: 161724
URL: http://svn.apache.org/viewcvs?view=rev&rev=161724
Log:
Catched up recent changes on MINA
Modified:
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AbandonHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/BindHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ExtendedHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java
directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java
directory/protocol-providers/ldap/trunk/src/test/org/apache/ldap/server/protocol/LdapProtocolProviderTest.java
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AbandonHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AbandonHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AbandonHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AbandonHandler.java Sun Apr 17 21:20:38 2005
@@ -20,7 +20,7 @@
import org.apache.ldap.common.NotImplementedException;
import org.apache.ldap.common.message.AbandonRequest;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/AddHandler.java Sun Apr 17 21:20:38 2005
@@ -27,7 +27,7 @@
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
* A single reply handler for {@link org.apache.ldap.common.message.AddRequest}s.
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/BindHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/BindHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/BindHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/BindHandler.java Sun Apr 17 21:20:38 2005
@@ -21,9 +21,9 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
+import javax.naming.spi.InitialContextFactory;
import org.apache.ldap.common.exception.LdapException;
import org.apache.ldap.common.message.BindRequest;
@@ -34,9 +34,8 @@
import org.apache.ldap.common.message.LdapResultImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.util.ExceptionUtils;
-
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/CompareHandler.java Sun Apr 17 21:20:38 2005
@@ -29,7 +29,7 @@
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/DeleteHandler.java Sun Apr 17 21:20:38 2005
@@ -27,7 +27,7 @@
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
* A single reply handler for {@link org.apache.ldap.common.message.DeleteRequest}s.
@@ -45,7 +45,7 @@
try
{
- DirContext ctx = ( DirContext ) SessionRegistry.getSingleton().getLdapContext( session, null, true );
+ DirContext ctx = SessionRegistry.getSingleton().getLdapContext( session, null, true );
ctx.destroySubcontext( req.getName() );
}
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ExtendedHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ExtendedHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ExtendedHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ExtendedHandler.java Sun Apr 17 21:20:38 2005
@@ -19,7 +19,7 @@
import org.apache.ldap.common.NotImplementedException;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/LdapProtocolProvider.java Sun Apr 17 21:20:38 2005
@@ -24,6 +24,8 @@
import javax.naming.Context;
+import org.apache.asn1.codec.mina.Asn1CodecDecoder;
+import org.apache.asn1.codec.mina.Asn1CodecEncoder;
import org.apache.ldap.common.exception.LdapNamingException;
import org.apache.ldap.common.message.AbandonRequest;
import org.apache.ldap.common.message.AbandonRequestImpl;
@@ -50,16 +52,14 @@
import org.apache.ldap.common.message.UnbindRequestImpl;
import org.apache.ldap.common.message.spi.Provider;
import org.apache.mina.common.IdleStatus;
-import org.apache.mina.protocol.DemuxingProtocolHandler;
import org.apache.mina.protocol.ProtocolCodecFactory;
import org.apache.mina.protocol.ProtocolDecoder;
import org.apache.mina.protocol.ProtocolEncoder;
import org.apache.mina.protocol.ProtocolHandler;
import org.apache.mina.protocol.ProtocolProvider;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
-import org.apache.mina.protocol.codec.Asn1CodecDecoder;
-import org.apache.mina.protocol.codec.Asn1CodecEncoder;
+import org.apache.mina.protocol.handler.DemuxingProtocolHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
* An LDAP protocol provider implementation which dynamically associates
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyDnHandler.java Sun Apr 17 21:20:38 2005
@@ -18,8 +18,6 @@
import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
import org.apache.ldap.common.exception.LdapException;
@@ -31,7 +29,7 @@
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/ModifyHandler.java Sun Apr 17 21:20:38 2005
@@ -29,7 +29,7 @@
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SearchHandler.java Sun Apr 17 21:20:38 2005
@@ -43,7 +43,7 @@
import org.apache.ldap.common.util.ArrayUtils;
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
* A handler for processing search requests.
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/SessionRegistry.java Sun Apr 17 21:20:38 2005
@@ -23,11 +23,10 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.directory.InitialDirContext;
import javax.naming.ldap.Control;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
+import javax.naming.spi.InitialContextFactory;
import org.apache.ldap.common.exception.LdapNoPermissionException;
import org.apache.mina.protocol.ProtocolSession;
Modified: directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java (original)
+++ directory/protocol-providers/ldap/trunk/src/main/java/org/apache/ldap/server/protocol/UnbindHandler.java Sun Apr 17 21:20:38 2005
@@ -21,7 +21,7 @@
import javax.naming.ldap.LdapContext;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**
Modified: directory/protocol-providers/ldap/trunk/src/test/org/apache/ldap/server/protocol/LdapProtocolProviderTest.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/ldap/trunk/src/test/org/apache/ldap/server/protocol/LdapProtocolProviderTest.java?view=diff&r1=161723&r2=161724
==============================================================================
--- directory/protocol-providers/ldap/trunk/src/test/org/apache/ldap/server/protocol/LdapProtocolProviderTest.java (original)
+++ directory/protocol-providers/ldap/trunk/src/test/org/apache/ldap/server/protocol/LdapProtocolProviderTest.java Sun Apr 17 21:20:38 2005
@@ -44,7 +44,7 @@
import org.apache.ldap.common.message.UnbindRequest;
import org.apache.ldap.common.message.UnbindRequestImpl;
import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.DemuxingProtocolHandler.MessageHandler;
+import org.apache.mina.protocol.handler.MessageHandler;
/**