directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r687105 [2/3] - in /directory/apacheds/trunk: protocol-newldap/src/main/java/org/apache/directory/server/ldap/ protocol-newldap/src/main/java/org/apache/directory/server/ldap/gui/ protocol-newldap/src/main/java/org/apache/directory/server/l...
Date Tue, 19 Aug 2008 17:40:58 GMT
Added: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java?rev=687105&view=auto
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java (added)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java Tue Aug 19 10:40:48 2008
@@ -0,0 +1,67 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.server.ldap.handlers;
+
+
+import org.apache.directory.server.core.entry.ClonedServerEntry;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.ModifyRequest;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.name.LdapDN;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * A single reply handler for {@link ModifyRequest}s.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev: 664302 $
+ */
+public class ModifyHandler extends ReferralAwareRequestHandler<ModifyRequest>
+{
+    private static final Logger LOG = LoggerFactory.getLogger( ModifyHandler.class );
+
+
+    /**
+     * @see ReferralAwareRequestHandler#handleIgnoringReferrals(LdapSession, LdapDN, ClonedServerEntry, 
+     * org.apache.directory.shared.ldap.message.SingleReplyRequest)
+     */
+    @Override
+    public void handleIgnoringReferrals( LdapSession session, LdapDN reqTargetDn, 
+        ClonedServerEntry entry, ModifyRequest req )
+    {
+        LOG.debug( "Handling modify request while ignoring referrals: {}", req );
+        LdapResult result = req.getResultResponse().getLdapResult();
+
+        try
+        {
+            session.getCoreSession().modify( req );
+            result.setResultCode( ResultCodeEnum.SUCCESS );
+            session.getIoSession().write( req.getResultResponse() );
+        }
+        catch ( Exception e )
+        {
+            handleException( session, req, e );
+        }
+    }
+}
\ No newline at end of file

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/PersistentSearchListener.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/PersistentSearchListener.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers;
+package org.apache.directory.server.ldap.handlers;
 
 
 import javax.naming.NamingException;
@@ -31,7 +31,7 @@
 import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.message.AbandonListener;
 import org.apache.directory.shared.ldap.message.AbandonableRequest;

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/ReferralAwareRequestHandler.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/ReferralAwareRequestHandler.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers;
+package org.apache.directory.server.ldap.handlers;
 
 
 import javax.naming.InvalidNameException;
@@ -26,7 +26,7 @@
 
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerAttribute;
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.codec.util.LdapURL;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -72,7 +72,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.directory.server.newldap.handlers.LdapRequestHandler#handle(org.apache.directory.server.newldap.LdapSession, org.apache.directory.shared.ldap.message.Request)
+     * @see org.apache.directory.server.ldap.handlers.LdapRequestHandler#handle(org.apache.directory.server.ldap.LdapSession, org.apache.directory.shared.ldap.message.Request)
      */
     @Override
     public final void handle( LdapSession session, T req ) throws Exception

Added: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=687105&view=auto
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (added)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Tue Aug 19 10:40:48 2008
@@ -0,0 +1,469 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.server.ldap.handlers;
+
+
+import org.apache.directory.server.core.entry.ClonedServerEntry;
+import org.apache.directory.server.core.entry.ServerEntryUtils;
+import org.apache.directory.server.core.entry.ServerStringValue;
+import org.apache.directory.server.core.event.NotificationCriteria;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
+import org.apache.directory.shared.ldap.filter.EqualityNode;
+import org.apache.directory.shared.ldap.filter.OrNode;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.message.AbandonListener;
+import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.ManageDsaITControl;
+import org.apache.directory.shared.ldap.message.PersistentSearchControl;
+import org.apache.directory.shared.ldap.message.ReferralImpl;
+import org.apache.directory.shared.ldap.message.Response;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.SearchResponseDone;
+import org.apache.directory.shared.ldap.message.SearchResponseEntry;
+import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
+import org.apache.directory.shared.ldap.message.SearchResponseReference;
+import org.apache.directory.shared.ldap.message.SearchResponseReferenceImpl;
+import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.naming.NamingException;
+
+
+/**
+ * A handler for processing search requests.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev: 664302 $
+ */
+public class SearchHandler extends ReferralAwareRequestHandler<SearchRequest>
+{
+    private static final Logger LOG = LoggerFactory.getLogger( SearchHandler.class );
+
+    /** Speedup for logs */
+    private static final boolean IS_DEBUG = LOG.isDebugEnabled();
+    
+    AttributeType objectClassAttributeType;
+    
+    private EqualityNode<String> getOcIsReferralAssertion( LdapSession session ) throws Exception
+    {
+        if ( objectClassAttributeType == null )
+        {
+            objectClassAttributeType = session.getCoreSession().getDirectoryService().getRegistries()
+                .getAttributeTypeRegistry().lookup( SchemaConstants.OBJECT_CLASS_AT );
+        }
+        
+        EqualityNode<String> ocIsReferral = new EqualityNode<String>( 
+            SchemaConstants.OBJECT_CLASS_AT,
+            new ServerStringValue( objectClassAttributeType, SchemaConstants.REFERRAL_OC ) );
+        
+        return ocIsReferral;
+    }
+    
+    
+    private void handlePersistentSearch( LdapSession session, SearchRequest req, 
+        PersistentSearchControl psearchControl ) throws Exception 
+    {
+        /*
+         * We want the search to complete first before we start listening to 
+         * events when the control does NOT specify changes ONLY mode.
+         */
+        if ( ! psearchControl.isChangesOnly() )
+        {
+            SearchResponseDone done = doSimpleSearch( session, req );
+            
+            // ok if normal search beforehand failed somehow quickly abandon psearch
+            if ( done.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
+            {
+                session.getIoSession().write( done );
+                return;
+            }
+        }
+
+        // now we process entries for ever as they change
+        PersistentSearchListener handler = new PersistentSearchListener( session, req );
+        
+        // TODO what about notification criteria ?????????????????? TODO add it 
+        NotificationCriteria criteria = new NotificationCriteria();
+        criteria.setAliasDerefMode( req.getDerefAliases() );
+        criteria.setBase( req.getBase() );
+        getLdapServer().getDirectoryService().getEventService().addListener( handler );
+        return;
+    }
+    
+    
+    /**
+     * Deal with RootDE search. 
+     * @param session
+     * @param req
+     * @throws Exception
+     */
+    private void handleRootDseSearch( LdapSession session, SearchRequest req ) throws Exception
+    {
+        EntryFilteringCursor cursor = null;
+        
+        try
+        {
+            cursor = session.getCoreSession().search( req );
+            
+            // Position the cursor at the beginning
+            cursor.beforeFirst();
+            boolean hasRootDSE = false;
+            
+            while ( cursor.next() )
+            {
+            	if ( hasRootDSE )
+            	{
+            		// This is an error ! We should never find more
+            		// than one rootDSE !
+            		// TODO : handle this error
+            	}
+            	else
+            	{
+            		hasRootDSE = true;
+	                ClonedServerEntry entry = cursor.get();
+	                session.getIoSession().write( generateResponse( session, req, entry ) );
+            	}
+            }
+    
+            // write the SearchResultDone message
+            session.getIoSession().write( req.getResultResponse() );
+        }
+        finally
+        {
+        	// Close the cursor now.
+            if ( cursor != null )
+            {
+                try
+                {
+                    cursor.close();
+                }
+                catch ( NamingException e )
+                {
+                    LOG.error( "failed on list.close()", e );
+                }
+            }
+        }
+    }
+    
+    
+    /**
+     * Conducts a simple search across the result set returning each entry 
+     * back except for the search response done.  This is calculated but not
+     * returned so the persistent search mechanism can leverage this method
+     * along with standard search.
+     *
+     * @param session the LDAP session object for this request
+     * @param req the search request 
+     * @return the result done 
+     * @throws Exception if there are failures while processing the request
+     */
+    private SearchResponseDone doSimpleSearch( LdapSession session, SearchRequest req ) throws Exception
+    {
+        /*
+         * Iterate through all search results building and sending back responses
+         * for each search result returned.
+         */
+        EntryFilteringCursor cursor = null;
+        
+        try
+        {
+            cursor = session.getCoreSession().search( req );
+            
+            // TODO - fix this (need to make Cursors abandonable)
+            if ( cursor instanceof AbandonListener )
+            {
+                req.addAbandonListener( ( AbandonListener ) cursor );
+            }
+    
+            // Position the cursor at the beginning
+            cursor.beforeFirst();
+            
+            while ( cursor.next() )
+            {
+                ClonedServerEntry entry = cursor.get();
+                session.getIoSession().write( generateResponse( session, req, entry ) );
+            }
+    
+            LdapResult ldapResult = req.getResultResponse().getLdapResult();
+            ldapResult.setResultCode( ResultCodeEnum.SUCCESS );
+            
+            // DO NOT WRITE THE RESPONSE - JUST RETURN IT
+            
+            return ( SearchResponseDone ) req.getResultResponse();
+        }
+        finally
+        {
+            if ( cursor != null )
+            {
+                try
+                {
+                    cursor.close();
+                }
+                catch ( NamingException e )
+                {
+                    LOG.error( "failed on list.close()", e );
+                }
+            }
+        }
+    }
+    
+
+    /**
+     * Generates a response for an entry retrieved from the server core based 
+     * on the nature of the request with respect to referral handling.  This 
+     * method will either generate a SearchResponseEntry or a 
+     * SearchResponseReference depending on if the entry is a referral or if 
+     * the ManageDSAITControl has been enabled.
+     *
+     * @param req the search request
+     * @param entry the entry to be handled
+     * @return the response for the entry
+     * @throws Exception if there are problems in generating the response
+     */
+    private Response generateResponse( LdapSession session, SearchRequest req, ClonedServerEntry entry ) throws Exception
+    {
+        EntryAttribute ref = entry.getOriginalEntry().get( SchemaConstants.REF_AT );
+        boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaITControl.CONTROL_OID );
+
+        if ( ref != null && ! hasManageDsaItControl )
+        {
+            SearchResponseReference respRef;
+            respRef = new SearchResponseReferenceImpl( req.getMessageId() );
+            respRef.setReferral( new ReferralImpl() );
+            
+            for ( Value<?> val : ref )
+            {
+                String url = ( String ) val.get();
+                
+                if ( ! url.startsWith( "ldap" ) )
+                {
+                    respRef.getReferral().addLdapUrl( url );
+                }
+                
+                LdapURL ldapUrl = new LdapURL();
+                ldapUrl.setForceScopeRendering( true );
+                try
+                {
+                    ldapUrl.parse( url.toCharArray() );
+                }
+                catch ( LdapURLEncodingException e )
+                {
+                    LOG.error( "Bad URL ({}) for ref in {}.  Reference will be ignored.", url, entry );
+                }
+
+                switch( req.getScope() )
+                {
+                    case SUBTREE:
+                        ldapUrl.setScope( SearchScope.SUBTREE.getJndiScope() );
+                        break;
+                    case ONELEVEL: // one level here is object level on remote server
+                        ldapUrl.setScope( SearchScope.OBJECT.getJndiScope() );
+                        break;
+                    default:
+                        throw new IllegalStateException( "Unexpected base scope." );
+                }
+                
+                respRef.getReferral().addLdapUrl( ldapUrl.toString() );
+            }
+            
+            return respRef;
+        }
+        else 
+        {
+            SearchResponseEntry respEntry;
+            respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+            respEntry.setAttributes( ServerEntryUtils.toAttributesImpl( entry ) );
+            respEntry.setObjectName( entry.getDn() );
+            
+            return respEntry;
+        }
+    }
+    
+    
+    /**
+     * Alters the filter expression based on the presence of the 
+     * ManageDsaIT control.  If the control is not present, the search
+     * filter will be altered to become a disjunction with two terms.
+     * The first term is the original filter.  The second term is a
+     * (objectClass=referral) assertion.  When OR'd together these will
+     * make sure we get all referrals so we can process continuations 
+     * properly without having the filter remove them from the result 
+     * set.
+     * 
+     * NOTE: original filter is first since most entries are not referrals 
+     * so it has a higher probability on average of accepting and shorting 
+     * evaluation before having to waste cycles trying to evaluate if the 
+     * entry is a referral.
+     *
+     * @param session the session to use to construct the filter (schema access)
+     * @param req the request to get the original filter from
+     * @throws Exception if there are schema access problems
+     */
+    public void modifyFilter( LdapSession session, SearchRequest req ) throws Exception
+    {
+        if ( req.hasControl( ManageDsaITControl.CONTROL_OID ) )
+        {
+            return;
+        }
+        
+        /*
+         * Most of the time the search filter is just (objectClass=*) and if 
+         * this is the case then there's no reason at all to OR this with an
+         * (objectClass=referral).  If we detect this case then we leave it 
+         * as is to represent the OR condition:
+         * 
+         *  (| (objectClass=referral)(objectClass=*)) == (objectClass=*)
+         */
+        if ( req.getFilter() instanceof PresenceNode )
+        {
+            PresenceNode presenceNode = ( PresenceNode ) req.getFilter();
+            
+            AttributeType at = session.getCoreSession().getDirectoryService()
+                .getRegistries().getAttributeTypeRegistry().lookup( presenceNode.getAttribute() );
+            if ( at.getOid().equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
+            {
+                return;
+            }
+        }
+
+        // using varags to add two expressions to an OR node 
+        req.setFilter( new OrNode( req.getFilter(), getOcIsReferralAssertion( session ) ) );
+    }
+    
+    
+    /**
+     * Main message handing method for search requests.  This will be called 
+     * even if the ManageDsaIT control is present because the super class does
+     * not know that the search operation has more to do after finding the 
+     * base.  The call to this means that finding the base can ignore 
+     * referrals.
+     * 
+     * @param session the associated session
+     * @param req the received SearchRequest
+     */
+    public void handleIgnoringReferrals( LdapSession session, LdapDN reqTargetDn, 
+        ClonedServerEntry entry, SearchRequest req )
+    {
+        if ( IS_DEBUG )
+        {
+            LOG.debug( "Message received:  {}", req.toString() );
+        }
+
+        // add the search request to the registry of outstanding requests for this session
+        session.registerOutstandingRequest( req );
+
+        try
+        {
+            // modify the filter to affect continuation support
+            modifyFilter( session, req );
+            
+            // ===============================================================
+            // Handle search in rootDSE differently.
+            // ===============================================================
+            if ( isRootDSESearch( req ) )
+            {
+                handleRootDseSearch( session, req );
+                return;
+            }
+
+            // ===============================================================
+            // Handle psearch differently
+            // ===============================================================
+
+            PersistentSearchControl psearchControl = ( PersistentSearchControl ) 
+                req.getControls().get( PersistentSearchControl.CONTROL_OID );
+            
+            if ( psearchControl != null )
+            {
+                handlePersistentSearch( session, req, psearchControl );
+                return;
+            }
+
+            // ===============================================================
+            // Handle regular search requests from here down
+            // ===============================================================
+
+            SearchResponseDone done = doSimpleSearch( session, req );
+            session.getIoSession().write( done );
+        }
+        catch ( Exception e )
+        {
+            /*
+             * From RFC 2251 Section 4.11:
+             *
+             * In the event that a server receives an Abandon Request on a Search
+             * operation in the midst of transmitting responses to the Search, that
+             * server MUST cease transmitting entry responses to the abandoned
+             * request immediately, and MUST NOT send the SearchResultDone. Of
+             * course, the server MUST ensure that only properly encoded LDAPMessage
+             * PDUs are transmitted.
+             *
+             * SO DON'T SEND BACK ANYTHING!!!!!
+             */
+            if ( e instanceof OperationAbandonedException )
+            {
+                return;
+            }
+
+            handleException( session, req, e );
+        }
+    }
+
+
+    /**
+     * Determines if a search request is on the RootDSE of the server.
+     * 
+     * It is a RootDSE search if :
+     * - the base DN is empty
+     * - and the scope is BASE OBJECT
+     * - and the filter is (ObjectClass = *)
+     * 
+     * (RFC 4511, 5.1, par. 1 & 2)
+     *
+     * @param req the request issued
+     * @return true if the search is on the RootDSE false otherwise
+     */
+    private static boolean isRootDSESearch( SearchRequest req )
+    {
+        boolean isBaseIsRoot = req.getBase().isEmpty();
+        boolean isBaseScope = req.getScope() == SearchScope.OBJECT;
+        boolean isRootDSEFilter = false;
+        
+        if ( req.getFilter() instanceof PresenceNode )
+        {
+            String attribute = ( ( PresenceNode ) req.getFilter() ).getAttribute();
+            isRootDSEFilter = attribute.equalsIgnoreCase( SchemaConstants.OBJECT_CLASS_AT ) ||
+                                attribute.equals( SchemaConstants.OBJECT_CLASS_AT_OID );
+        }
+        
+        return isBaseIsRoot && isBaseScope && isRootDSEFilter;
+    }
+}
\ No newline at end of file

Added: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java?rev=687105&view=auto
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java (added)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java Tue Aug 19 10:40:48 2008
@@ -0,0 +1,55 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.server.ldap.handlers;
+
+
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.shared.ldap.message.UnbindRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * A no reply protocol handler implementation for LDAP {@link
+ * org.apache.directory.shared.ldap.message.UnbindRequest}s.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev: 664463 $
+ */
+public class UnbindHandler extends LdapRequestHandler<UnbindRequest>
+{
+    private static final Logger LOG = LoggerFactory.getLogger( UnbindHandler.class );
+
+
+    public void handle( LdapSession session, UnbindRequest request ) throws Exception
+    {
+        try
+        {
+            session.getCoreSession().unbind( request );
+            session.getIoSession().close();
+            ldapServer.removeLdapSession( session.getIoSession() );
+        }
+        catch ( Throwable t )
+        {
+            LOG.error( "failed to unbind session properly", t );
+        }
+    }
+}
\ No newline at end of file

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractMechanismHandler.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractMechanismHandler.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractMechanismHandler.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractMechanismHandler.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractMechanismHandler.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractMechanismHandler.java Tue Aug 19 10:40:48 2008
@@ -17,11 +17,11 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind;
+package org.apache.directory.server.ldap.handlers.bind;
 
 import javax.security.sasl.SaslServer;
 
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoSession;
 import org.slf4j.Logger;

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractSaslCallbackHandler.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractSaslCallbackHandler.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Tue Aug 19 10:40:48 2008
@@ -17,13 +17,13 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind;
+package org.apache.directory.server.ldap.handlers.bind;
 
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractSaslServer.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractSaslServer.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/AbstractSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java Tue Aug 19 10:40:48 2008
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.bind;
+package org.apache.directory.server.ldap.handlers.bind;
 
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.BindRequest;
 import org.apache.directory.shared.ldap.util.StringTools;
 

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/MechanismHandler.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/MechanismHandler.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/MechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java Tue Aug 19 10:40:48 2008
@@ -17,12 +17,12 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind;
+package org.apache.directory.server.ldap.handlers.bind;
 
 
 import javax.security.sasl.SaslServer;
 
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.BindRequest;
 
 

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslConstants.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SaslConstants.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslConstants.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslConstants.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SaslConstants.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SaslConstants.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslConstants.java Tue Aug 19 10:40:48 2008
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.server.newldap.handlers.bind;
+package org.apache.directory.server.ldap.handlers.bind;
 
 /**
  * SASL Constants used to store informations releated to the Challenge/response

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslFilter.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SaslFilter.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslFilter.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslFilter.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SaslFilter.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SaslFilter.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SaslFilter.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind;
+package org.apache.directory.server.ldap.handlers.bind;
 
 
 import javax.security.sasl.Sasl;

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SimpleMechanismHandler.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SimpleMechanismHandler.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Tue Aug 19 10:40:48 2008
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.bind;
+package org.apache.directory.server.ldap.handlers.bind;
 
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
-import org.apache.directory.server.newldap.LdapProtocolUtils;
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.LdapProtocolUtils;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.BindRequest;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind.cramMD5;
+package org.apache.directory.server.ldap.handlers.bind.cramMD5;
 
 
 import java.util.HashSet;
@@ -27,9 +27,9 @@
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractSaslCallbackHandler;
-import org.apache.directory.server.newldap.handlers.bind.SaslConstants;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractSaslCallbackHandler;
+import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java Tue Aug 19 10:40:48 2008
@@ -17,13 +17,13 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind.cramMD5;
+package org.apache.directory.server.ldap.handlers.bind.cramMD5;
 
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.SaslConstants;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
 

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind.digestMD5;
+package org.apache.directory.server.ldap.handlers.bind.digestMD5;
 
 
 import java.util.HashSet;
@@ -27,9 +27,9 @@
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractSaslCallbackHandler;
-import org.apache.directory.server.newldap.handlers.bind.SaslConstants;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractSaslCallbackHandler;
+import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java Tue Aug 19 10:40:48 2008
@@ -17,14 +17,14 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind.digestMD5;
+package org.apache.directory.server.ldap.handlers.bind.digestMD5;
 
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.SaslConstants;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
 

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java Tue Aug 19 10:40:48 2008
@@ -17,14 +17,14 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind.gssapi;
+package org.apache.directory.server.ldap.handlers.bind.gssapi;
 
 
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
 import org.apache.directory.server.kerberos.shared.store.operations.GetPrincipal;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractSaslCallbackHandler;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractSaslCallbackHandler;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.message.BindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java Tue Aug 19 10:40:48 2008
@@ -17,12 +17,12 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind.gssapi;
+package org.apache.directory.server.ldap.handlers.bind.gssapi;
 
 
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.SaslConstants;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
 

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java Tue Aug 19 10:40:48 2008
@@ -17,12 +17,12 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind.ntlm;
+package org.apache.directory.server.ldap.handlers.bind.ntlm;
 
 
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.SaslConstants;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.message.BindRequest;
 
 import javax.security.sasl.SaslServer;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.bind.ntlm;
+package org.apache.directory.server.ldap.handlers.bind.ntlm;
 
 
 import org.apache.mina.common.IoSession;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Tue Aug 19 10:40:48 2008
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.bind.ntlm;
+package org.apache.directory.server.ldap.handlers.bind.ntlm;
 
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractSaslServer;
-import org.apache.directory.server.newldap.handlers.bind.SaslConstants;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractSaslServer;
+import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/package-info.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/package-info.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/package-info.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/package-info.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/package-info.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/package-info.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/package-info.java Tue Aug 19 10:40:48 2008
@@ -25,4 +25,4 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-package org.apache.directory.server.newldap.handlers.bind;
+package org.apache.directory.server.ldap.handlers.bind;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java Tue Aug 19 10:40:48 2008
@@ -17,13 +17,13 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.bind.plain;
+package org.apache.directory.server.ldap.handlers.bind.plain;
 
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.SaslConstants;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.message.BindRequest;
 
 import javax.security.sasl.SaslServer;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java Tue Aug 19 10:40:48 2008
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.bind.plain;
+package org.apache.directory.server.ldap.handlers.bind.plain;
 
 
 import java.io.IOException;
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.handlers.bind.AbstractSaslServer;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.handlers.bind.AbstractSaslServer;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.extended;
+package org.apache.directory.server.ldap.handlers.extended;
 
 
 import java.util.ArrayList;
@@ -27,9 +27,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.server.newldap.ExtendedOperationHandler;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.ExtendedOperationHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.extended.GracefulDisconnect;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.extended;
+package org.apache.directory.server.ldap.handlers.extended;
 
 
 import java.awt.Dimension;
@@ -39,10 +39,10 @@
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
 import org.apache.directory.server.core.partition.impl.btree.gui.PartitionFrame;
-import org.apache.directory.server.newldap.ExtendedOperationHandler;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.LdapSession;
-import org.apache.directory.server.newldap.gui.SessionsFrame;
+import org.apache.directory.server.ldap.ExtendedOperationHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.LdapSession;
+import org.apache.directory.server.ldap.gui.SessionsFrame;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.newldap.handlers.extended;
+package org.apache.directory.server.ldap.handlers.extended;
 
 
 import java.security.KeyStore;
@@ -36,9 +36,9 @@
 import javax.net.ssl.X509TrustManager;
 
 import org.apache.directory.server.core.security.CoreKeyStoreSpi;
-import org.apache.directory.server.newldap.ExtendedOperationHandler;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.ExtendedOperationHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java Tue Aug 19 10:40:48 2008
@@ -19,7 +19,7 @@
  */
 
 
-package org.apache.directory.server.newldap.handlers.extended;
+package org.apache.directory.server.ldap.handlers.extended;
 
 
 import java.io.Serializable;
@@ -36,9 +36,9 @@
 import org.apache.directory.server.core.sp.StoredProcEngineConfig;
 import org.apache.directory.server.core.sp.StoredProcExecutionManager;
 import org.apache.directory.server.core.sp.java.JavaStoredProcEngineConfig;
-import org.apache.directory.server.newldap.ExtendedOperationHandler;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.LdapSession;
+import org.apache.directory.server.ldap.ExtendedOperationHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.IAsn1Container;
 import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedure;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/package-info.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/package-info.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/package-info.java Tue Aug 19 10:40:48 2008
@@ -20,9 +20,9 @@
 
 /**
  * Provides LDAP 'Extended' operations that implement
- * {@link org.apache.directory.server.newldap.ExtendedOperationHandler}.
+ * {@link org.apache.directory.server.ldap.ExtendedOperationHandler}.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-package org.apache.directory.server.newldap.handlers.extended;
+package org.apache.directory.server.ldap.handlers.extended;

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/package-info.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/package-info.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/package-info.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/package-info.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/package-info.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/package-info.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/package-info.java Tue Aug 19 10:40:48 2008
@@ -25,4 +25,4 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-package org.apache.directory.server.newldap.handlers;
+package org.apache.directory.server.ldap.handlers;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/LdapsInitializer.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.ssl;
+package org.apache.directory.server.ldap.handlers.ssl;
 
 
 import java.security.KeyStore;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/ServerX509TrustManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/ServerX509TrustManager.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/ServerX509TrustManager.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/ServerX509TrustManager.java Tue Aug 19 10:40:48 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.newldap.handlers.ssl;
+package org.apache.directory.server.ldap.handlers.ssl;
 
 
 import java.security.cert.CertificateException;

Modified: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/package-info.java?rev=687105&r1=687026&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/package-info.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/handlers/ssl/package-info.java Tue Aug 19 10:40:48 2008
@@ -24,4 +24,4 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-package org.apache.directory.server.newldap.handlers.ssl;
+package org.apache.directory.server.ldap.handlers.ssl;

Copied: directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/package-info.java (from r687026, directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/package-info.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/package-info.java?p2=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/package-info.java&p1=directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/package-info.java&r1=687026&r2=687105&rev=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/newldap/package-info.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/main/java/org/apache/directory/server/ldap/package-info.java Tue Aug 19 10:40:48 2008
@@ -25,4 +25,4 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-package org.apache.directory.server.newldap;
+package org.apache.directory.server.ldap;

Modified: directory/apacheds/trunk/protocol-newldap/src/test/java/org/apache/directory/server/newldap/LdapServerSettingsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/test/java/org/apache/directory/server/newldap/LdapServerSettingsTest.java?rev=687105&r1=687104&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/test/java/org/apache/directory/server/newldap/LdapServerSettingsTest.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/test/java/org/apache/directory/server/newldap/LdapServerSettingsTest.java Tue Aug 19 10:40:48 2008
@@ -25,11 +25,11 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.directory.server.newldap.ExtendedOperationHandler;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.handlers.bind.MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.plain.PlainMechanismHandler;
-import org.apache.directory.server.newldap.handlers.extended.StartTlsHandler;
+import org.apache.directory.server.ldap.ExtendedOperationHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
+import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 
 import java.util.List;

Modified: directory/apacheds/trunk/protocol-newldap/src/test/java/org/apache/directory/server/newldap/SettingAlternativeHandlersTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-newldap/src/test/java/org/apache/directory/server/newldap/SettingAlternativeHandlersTest.java?rev=687105&r1=687104&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-newldap/src/test/java/org/apache/directory/server/newldap/SettingAlternativeHandlersTest.java (original)
+++ directory/apacheds/trunk/protocol-newldap/src/test/java/org/apache/directory/server/newldap/SettingAlternativeHandlersTest.java Tue Aug 19 10:40:48 2008
@@ -22,16 +22,16 @@
 
 import junit.framework.TestCase;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.handlers.NewAbandonHandler;
-import org.apache.directory.server.newldap.handlers.NewAddHandler;
-import org.apache.directory.server.newldap.handlers.NewBindHandler;
-import org.apache.directory.server.newldap.handlers.NewCompareHandler;
-import org.apache.directory.server.newldap.handlers.NewDeleteHandler;
-import org.apache.directory.server.newldap.handlers.NewModifyDnHandler;
-import org.apache.directory.server.newldap.handlers.NewModifyHandler;
-import org.apache.directory.server.newldap.handlers.NewSearchHandler;
-import org.apache.directory.server.newldap.handlers.NewUnbindHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.handlers.AbandonHandler;
+import org.apache.directory.server.ldap.handlers.AddHandler;
+import org.apache.directory.server.ldap.handlers.BindHandler;
+import org.apache.directory.server.ldap.handlers.CompareHandler;
+import org.apache.directory.server.ldap.handlers.DeleteHandler;
+import org.apache.directory.server.ldap.handlers.ModifyDnHandler;
+import org.apache.directory.server.ldap.handlers.ModifyHandler;
+import org.apache.directory.server.ldap.handlers.SearchHandler;
+import org.apache.directory.server.ldap.handlers.UnbindHandler;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.AbandonRequest;
@@ -111,7 +111,7 @@
     }
 
     
-    public static class BogusAbandonHandler extends NewAbandonHandler
+    public static class BogusAbandonHandler extends AbandonHandler
     {
         public void abandonMessageReceived( IoSession session, AbandonRequest request )
         {
@@ -120,7 +120,7 @@
     }
 
     
-    public static class BogusUnbindHandler extends NewUnbindHandler
+    public static class BogusUnbindHandler extends UnbindHandler
     {
         public void unbindMessageReceived( IoSession session, UnbindRequest request )
         {
@@ -128,7 +128,7 @@
         }
     }
 
-    public static class BogusAddHandler extends NewAddHandler
+    public static class BogusAddHandler extends AddHandler
     {
         public void addMessageReceived( IoSession session, AddRequest request )
         {
@@ -136,7 +136,7 @@
         }
     }
 
-    public static class BogusBindHandler extends NewBindHandler
+    public static class BogusBindHandler extends BindHandler
     {
         public void setDirectoryService( DirectoryService directoryService )
         {
@@ -149,7 +149,7 @@
         }
     }
 
-    public static class BogusCompareHandler extends NewCompareHandler
+    public static class BogusCompareHandler extends CompareHandler
     {
         public void compareMessageReceived( IoSession session, CompareRequest request )
         {
@@ -157,7 +157,7 @@
         }
     }
 
-    public static class BogusDeleteHandler extends  NewDeleteHandler
+    public static class BogusDeleteHandler extends  DeleteHandler
     {
         public void deleteMessageReceived( IoSession session, DeleteRequest request )
         {
@@ -165,7 +165,7 @@
         }
     }
 
-    public static class BogusModifyDnHandler extends  NewModifyDnHandler
+    public static class BogusModifyDnHandler extends  ModifyDnHandler
     {
         public void modifyDnMessageReceived( IoSession session, ModifyDnRequest request )
         {
@@ -173,7 +173,7 @@
         }
     }
 
-    public static class BogusModifyHandler extends NewModifyHandler
+    public static class BogusModifyHandler extends ModifyHandler
     {
         public void modifyMessageReceived( IoSession session, ModifyRequest request )
         {
@@ -181,7 +181,7 @@
         }
     }
 
-    public static class BogusSearchHandler extends NewSearchHandler
+    public static class BogusSearchHandler extends SearchHandler
     {
         public void searchMessageReceived( IoSession session, SearchRequest request )
         {

Modified: directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java?rev=687105&r1=687104&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java (original)
+++ directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java Tue Aug 19 10:40:48 2008
@@ -25,15 +25,15 @@
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.integ.IntegrationUtils;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.handlers.bind.MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.SimpleMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.digestMD5.DigestMd5MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.gssapi.GssapiMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.ntlm.NtlmMechanismHandler;
-import org.apache.directory.server.newldap.handlers.extended.StartTlsHandler;
-import org.apache.directory.server.newldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
+import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
+import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.SocketAcceptor;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.mina.util.AvailablePortFinder;

Modified: directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java?rev=687105&r1=687104&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java (original)
+++ directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java Tue Aug 19 10:40:48 2008
@@ -30,7 +30,7 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.integ.IntegrationUtils;
-import org.apache.directory.server.newldap.LdapServer;
+import org.apache.directory.server.ldap.LdapServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/StartedPristineState.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/StartedPristineState.java?rev=687105&r1=687104&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/StartedPristineState.java (original)
+++ directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/StartedPristineState.java Tue Aug 19 10:40:48 2008
@@ -22,7 +22,7 @@
 import java.io.IOException;
 
 import org.apache.directory.server.integ.InheritableServerSettings;
-import org.apache.directory.server.newldap.LdapServer;
+import org.apache.directory.server.ldap.LdapServer;
 
 import static org.apache.directory.server.core.integ.IntegrationUtils.doDelete;
 import org.junit.internal.runners.TestClass;

Modified: directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/TestServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/TestServerContext.java?rev=687105&r1=687104&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/TestServerContext.java (original)
+++ directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/state/TestServerContext.java Tue Aug 19 10:40:48 2008
@@ -26,7 +26,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.integ.InheritableServerSettings;
-import org.apache.directory.server.newldap.LdapServer;
+import org.apache.directory.server.ldap.LdapServer;
 import org.junit.internal.runners.MethodRoadie;
 import org.junit.internal.runners.TestClass;
 import org.junit.internal.runners.TestMethod;

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java?rev=687105&r1=687104&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java Tue Aug 19 10:40:48 2008
@@ -41,14 +41,14 @@
 import org.apache.directory.server.kerberos.shared.io.decoder.EncryptionKeyDecoder;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.handlers.bind.MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.digestMD5.DigestMd5MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.gssapi.GssapiMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.ntlm.NtlmMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.plain.PlainMechanismHandler;
-import org.apache.directory.server.newldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
+import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.SocketAcceptor;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.AttributeImpl;

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java?rev=687105&r1=687104&r2=687105&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java Tue Aug 19 10:40:48 2008
@@ -36,14 +36,14 @@
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.integ.LdapServerFactory;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.newldap.LdapServer;
-import org.apache.directory.server.newldap.handlers.bind.MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.digestMD5.DigestMd5MechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.gssapi.GssapiMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.ntlm.NtlmMechanismHandler;
-import org.apache.directory.server.newldap.handlers.bind.plain.PlainMechanismHandler;
-import org.apache.directory.server.newldap.handlers.extended.StoredProcedureExtendedOperationHandler;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
+import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
+import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.SocketAcceptor;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.AttributeImpl;



Mime
View raw message