Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B75676C2 for ; Thu, 3 Nov 2011 18:45:58 +0000 (UTC) Received: (qmail 31179 invoked by uid 500); 3 Nov 2011 18:45:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 31126 invoked by uid 500); 3 Nov 2011 18:45:58 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 31119 invoked by uid 99); 3 Nov 2011 18:45:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 18:45:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 18:45:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7689423889FD for ; Thu, 3 Nov 2011 18:45:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1197267 - in /directory/apacheds/branches/apacheds-osgi: core-api/src/main/java/org/apache/directory/server/core/api/partition/ interceptors/authz/src/main/java/org/apache/directory/server/core/authz/ interceptors/trigger/src/main/java/org... Date: Thu, 03 Nov 2011 18:45:36 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111103184536.7689423889FD@eris.apache.org> Author: kayyagari Date: Thu Nov 3 18:45:35 2011 New Revision: 1197267 URL: http://svn.apache.org/viewvc?rev=1197267&view=rev Log: o removed LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Modified: directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java?rev=1197267&r1=1197266&r2=1197267&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java (original) +++ directory/apacheds/branches/apacheds-osgi/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java Thu Nov 3 18:45:35 2011 @@ -52,11 +52,6 @@ public class ByPassConstants */ public static final Collection GETMATCHEDDN_BYPASS; - /** - * safe to use set of bypass instructions to lookup raw entries excluding operational attributes - */ - public static final Collection LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS; - public static final Collection GET_ROOT_DSE_BYPASS; /** @@ -113,18 +108,6 @@ public class ByPassConstants c = new HashSet(); c.add( "NormalizationInterceptor" ); - c.add( "AuthenticationInterceptor" ); - c.add( "AciAuthorizationInterceptor" ); - c.add( "DefaultAuthorizationInterceptor" ); - c.add( "SchemaInterceptor" ); - c.add( "SubentryInterceptor" ); - c.add( "EventInterceptor" ); - c.add( "TriggerInterceptor" ); - c.add( "JournalInterceptor" ); - LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS = Collections.unmodifiableCollection( c ); - - c = new HashSet(); - c.add( "NormalizationInterceptor" ); c.add( "ChangeLogInterceptor" ); c.add( "AciAuthorizationInterceptor" ); c.add( "DefaultAuthorizationInterceptor" ); Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1197267&r1=1197266&r2=1197267&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original) +++ directory/apacheds/branches/apacheds-osgi/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Thu Nov 3 18:45:35 2011 @@ -1076,8 +1076,9 @@ public class AciAuthorizationInterceptor // This will certainly be fixed by the SubentryInterceptor, // but after this service. - Entry importedEntry = moveAndRenameContext.lookup( oldDn, - ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS, SchemaConstants.ALL_ATTRIBUTES_ARRAY ); + CoreSession session = moveAndRenameContext.getSession(); + LookupOperationContext lookupContext = new LookupOperationContext( session, oldDn, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY ); + Entry importedEntry = session.getDirectoryService().getPartitionNexus().lookup( lookupContext ); // As the target entry does not exist yet and so // its subentry operational attributes are not there, @@ -1169,7 +1170,9 @@ public class AciAuthorizationInterceptor // will not be valid at the new location. // This will certainly be fixed by the SubentryInterceptor, // but after this service. - Entry importedEntry = moveContext.lookup( oriChildName, ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS, SchemaConstants.ALL_ATTRIBUTES_ARRAY ); + CoreSession session = moveContext.getSession(); + LookupOperationContext lookupContext = new LookupOperationContext( session, oriChildName, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY ); + Entry importedEntry = session.getDirectoryService().getPartitionNexus().lookup( lookupContext ); // As the target entry does not exist yet and so // its subentry operational attributes are not there, Modified: directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?rev=1197267&r1=1197266&r2=1197267&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java (original) +++ directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java Thu Nov 3 18:45:35 2011 @@ -22,6 +22,8 @@ package org.apache.directory.server.core import java.util.Map; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.OperationContext; import org.apache.directory.server.core.api.partition.ByPassConstants; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; @@ -72,6 +74,9 @@ public class DeleteStoredProcedureParame * Using LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS here to exclude operational attributes * especially subentry related ones like "triggerExecutionSubentries". */ - return opContext.lookup( deletedEntryName, ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS, SchemaConstants.ALL_ATTRIBUTES_ARRAY ); + CoreSession session = opContext.getSession(); + LookupOperationContext lookupContext = new LookupOperationContext( session, deletedEntryName, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY ); + + return session.getDirectoryService().getPartitionNexus().lookup( lookupContext ); } } Modified: directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?rev=1197267&r1=1197266&r2=1197267&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java (original) +++ directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Thu Nov 3 18:45:35 2011 @@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.directory.server.core.api.CoreSession; +import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; import org.apache.directory.server.core.api.interceptor.context.OperationContext; import org.apache.directory.server.core.api.partition.ByPassConstants; @@ -104,9 +106,12 @@ public class ModifyStoredProcedureParame private Entry getEntry( OperationContext opContext ) throws LdapException { /** - * Using LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS here to exclude operational attributes + * Exclude operational attributes while doing lookup * especially subentry related ones like "triggerExecutionSubentries". */ - return opContext.lookup( modifiedEntryName, ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS, SchemaConstants.ALL_ATTRIBUTES_ARRAY ); + CoreSession session = opContext.getSession(); + LookupOperationContext lookupContext = new LookupOperationContext( session, modifiedEntryName, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY ); + + return session.getDirectoryService().getPartitionNexus().lookup( lookupContext ); } } Modified: directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=1197267&r1=1197266&r2=1197267&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original) +++ directory/apacheds/branches/apacheds-osgi/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Thu Nov 3 18:45:35 2011 @@ -441,7 +441,10 @@ public class TriggerInterceptor extends // will not be valid at the new location. // This will certainly be fixed by the SubentryInterceptor, // but after this service. - Entry importedEntry = moveAndRenameContext.lookup( oldDn, ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS, SchemaConstants.ALL_ATTRIBUTES_ARRAY ); + CoreSession session = moveAndRenameContext.getSession(); + LookupOperationContext lookupContext = new LookupOperationContext( session, oldDn, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY ); + + Entry importedEntry = session.getDirectoryService().getPartitionNexus().lookup( lookupContext ); // As the target entry does not exist yet and so // its subentry operational attributes are not there, @@ -513,7 +516,10 @@ public class TriggerInterceptor extends // will not be valid at the new location. // This will certainly be fixed by the SubentryInterceptor, // but after this service. - Entry importedEntry = moveContext.lookup( dn, ByPassConstants.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS, SchemaConstants.ALL_ATTRIBUTES_ARRAY ); + CoreSession session = moveContext.getSession(); + LookupOperationContext lookupContext = new LookupOperationContext( session, dn, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY ); + + Entry importedEntry = session.getDirectoryService().getPartitionNexus().lookup( lookupContext ); // As the target entry does not exist yet and so // its subentry operational attributes are not there,