directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r659378 - /directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
Date Fri, 23 May 2008 02:45:16 GMT
Author: akarasulu
Date: Thu May 22 19:45:15 2008
New Revision: 659378

URL: http://svn.apache.org/viewvc?rev=659378&view=rev
Log:
removing SearchResultFilter and SearchResultFilterEnumeration and replacing with EntryFilter
and EntryFilteringCursor

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=659378&r1=659377&r2=659378&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
Thu May 22 19:45:15 2008
@@ -25,7 +25,6 @@
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.ServerEntryUtils;
-import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -329,10 +328,7 @@
             ServerEntry clone = ( ServerEntry ) serverEntry.clone();
             try
             {
-                // setup the op context
-                AddOperationContext opCtx = new AddOperationContext( registries, clone );
-
-                doAddOperation( opCtx, target, clone );
+                doAddOperation( target, clone );
             }
             catch ( Exception e )
             {
@@ -360,9 +356,7 @@
             try
             {
                 // setup the op context
-                AddOperationContext opCtx = new AddOperationContext( registries, clone );
-
-                doAddOperation( opCtx, target, clone );
+                doAddOperation( target, clone );
             }
             catch ( Exception e )
             {
@@ -401,9 +395,7 @@
             try
             {
                 // setup the op context
-                AddOperationContext opCtx = new AddOperationContext( registries, clone );
-
-                doAddOperation( opCtx, target, clone );
+                doAddOperation( target, clone );
             }
             catch ( Exception e )
             {
@@ -427,9 +419,7 @@
             try
             {
                 // setup the op context
-                AddOperationContext opCtx = new AddOperationContext( registries, entry );
-                
-                doAddOperation( opCtx, target, entry );
+                doAddOperation( target, entry );
             }
             catch ( Exception e )
             {
@@ -545,11 +535,7 @@
         try
         {
             ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attributes, target,
registries );
-            
-            // setup the op context
-            AddOperationContext opCtx = new AddOperationContext( registries, serverEntry
);
-
-            doAddOperation( opCtx, target, serverEntry );
+            doAddOperation( target, serverEntry );
         }
         catch ( Exception e )
         {
@@ -652,7 +638,6 @@
         throws NamingException
     {
         SearchControls ctls = new SearchControls();
-        LdapDN target = buildTarget( name );
 
         // If we need to return specific attributes add em to the SearchControls
         if ( null != attributesToReturn )



Mime
View raw message