directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r615678 - in /directory/apacheds/branches/bigbang: core-integ/src/test/java/org/apache/directory/server/core/jndi/ core/src/main/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/authz/ core/src/main...
Date Sun, 27 Jan 2008 23:38:38 GMT
Author: elecharny
Date: Sun Jan 27 15:38:33 2008
New Revision: 615678

URL: http://svn.apache.org/viewvc?rev=615678&view=rev
Log:
Some more Attributes removal. Also removed some JNDI Name references. Fixed a test, as some
bug has been fixed in DefaultDirectoryService initialization.

Modified:
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
(original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
Sun Jan 27 15:38:33 2008
@@ -345,12 +345,20 @@
         }
 
         // 13 because it also matches organizationalPerson which the admin is
-        assertEquals( "Expected number of results returned was incorrect", 12, map.size()
);
+        assertEquals( "Expected number of results returned was incorrect", 13, map.size()
);
         assertTrue( map.containsKey( "ou=system" ) );
+        assertTrue( map.containsKey( "ou=configuration,ou=system" ) );
+        assertTrue( map.containsKey( "ou=interceptors,ou=configuration,ou=system" ) );
+        assertTrue( map.containsKey( "ou=partitions,ou=configuration,ou=system" ) );
+        assertTrue( map.containsKey( "ou=services,ou=configuration,ou=system" ) );
+        assertTrue( map.containsKey( "ou=groups,ou=system" ) );
         assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
         assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
-        assertTrue( map.containsKey( "ou=testing02,ou=system" ) );
         assertTrue( map.containsKey( "ou=subtest,ou=testing01,ou=system" ) );
+        assertTrue( map.containsKey( "ou=testing02,ou=system" ) );
+        assertTrue( map.containsKey( "ou=users,ou=system" ) );
+        assertTrue( map.containsKey( "prefNodeName=sysPrefRoot,ou=system" ) );
+        assertTrue( map.containsKey( "uid=admin,ou=system" ) );
     }
 
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Sun Jan 27 15:38:33 2008
@@ -86,7 +86,6 @@
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -1104,18 +1103,14 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
-            objectClass.add( SchemaConstants.TOP_OC );
-            objectClass.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
-            attributes.put( objectClass );
-
-            attributes.put( SchemaConstants.OU_AT, "configuration" );
-            attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
-            attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
+            ServerEntry serverEntry = new DefaultServerEntry( registries, configurationDn
);
+            serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC
);
 
-            ServerEntry entry = ServerEntryUtils.toServerEntry( attributes, configurationDn,
registries );
-            partitionNexus.add( new AddOperationContext( registries, configurationDn, entry
) );
+            serverEntry.put( SchemaConstants.OU_AT, "configuration" );
+            serverEntry.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
+            serverEntry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
+
+            partitionNexus.add( new AddOperationContext( registries, configurationDn, serverEntry
) );
         }
 
         // -------------------------------------------------------------------
@@ -1129,18 +1124,14 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
-            objectClass.add( SchemaConstants.TOP_OC );
-            objectClass.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
-            attributes.put( objectClass );
-
-            attributes.put( SchemaConstants.OU_AT, "partitions" );
-            attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
-            attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
+            ServerEntry serverEntry = new DefaultServerEntry( registries, partitionsDn );
+            serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC
);
+
+            serverEntry.put( SchemaConstants.OU_AT, "partitions" );
+            serverEntry.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
+            serverEntry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
 
-            ServerEntry entry = ServerEntryUtils.toServerEntry( attributes, partitionsDn,
registries );
-            partitionNexus.add( new AddOperationContext( registries, partitionsDn, entry
) );
+            partitionNexus.add( new AddOperationContext( registries, partitionsDn, serverEntry
) );
         }
 
         // -------------------------------------------------------------------
@@ -1154,18 +1145,14 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
-            objectClass.add( SchemaConstants.TOP_OC );
-            objectClass.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
-            attributes.put( objectClass );
-
-            attributes.put( SchemaConstants.OU_AT, "services" );
-            attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
-            attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
+            ServerEntry serverEntry = new DefaultServerEntry( registries, servicesDn );
+            serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC
);
+
+            serverEntry.put( SchemaConstants.OU_AT, "services" );
+            serverEntry.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
+            serverEntry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
 
-            ServerEntry entry = ServerEntryUtils.toServerEntry( attributes, servicesDn, registries
);
-            partitionNexus.add( new AddOperationContext( registries, servicesDn, entry )
);
+            partitionNexus.add( new AddOperationContext( registries, servicesDn, serverEntry
) );
         }
 
         // -------------------------------------------------------------------
@@ -1179,18 +1166,14 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
-            objectClass.add( SchemaConstants.TOP_OC );
-            objectClass.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
-            attributes.put( objectClass );
-
-            attributes.put( SchemaConstants.OU_AT, "interceptors" );
-            attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
-            attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
+            ServerEntry serverEntry = new DefaultServerEntry( registries, interceptorsDn
);
+            serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC
);
+
+            serverEntry.put( SchemaConstants.OU_AT, "interceptors" );
+            serverEntry.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
+            serverEntry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
 
-            ServerEntry entry = ServerEntryUtils.toServerEntry( attributes, interceptorsDn,
registries );
-            partitionNexus.add( new AddOperationContext( registries, interceptorsDn, entry
) );
+            partitionNexus.add( new AddOperationContext( registries, interceptorsDn, serverEntry
) );
         }
 
         // -------------------------------------------------------------------
@@ -1204,19 +1187,17 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
-            objectClass.add( SchemaConstants.TOP_OC );
-            objectClass.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
-            attributes.put( objectClass );
-
-            attributes.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.EXTENSIBLE_OBJECT_OC
);
-            attributes.put( "prefNodeName", "sysPrefRoot" );
-            attributes.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
-            attributes.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
+            ServerEntry serverEntry = new DefaultServerEntry( registries, sysPrefRootDn );
+            serverEntry.put( SchemaConstants.OBJECT_CLASS_AT, 
+                SchemaConstants.TOP_OC, 
+                SchemaConstants.ORGANIZATIONAL_UNIT_OC,
+                SchemaConstants.EXTENSIBLE_OBJECT_OC );
+
+            serverEntry.put( "prefNodeName", "sysPrefRoot" );
+            serverEntry.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
);
+            serverEntry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
 
-            ServerEntry entry = ServerEntryUtils.toServerEntry( attributes, sysPrefRootDn,
registries );
-            partitionNexus.add( new AddOperationContext( registries, sysPrefRootDn, entry
) );
+            partitionNexus.add( new AddOperationContext( registries, sysPrefRootDn, serverEntry
) );
         }
 
         return firstStart;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
Sun Jan 27 15:38:33 2008
@@ -53,7 +53,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.NoPermissionException;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
Sun Jan 27 15:38:33 2008
@@ -47,7 +47,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.SearchControls;
@@ -282,7 +281,7 @@
     }
 
 
-    public void subentryRenamed( Name oldName, Name newName )
+    public void subentryRenamed( LdapDN oldName, LdapDN newName )
     {
         tuples.put( newName.toString(), tuples.remove( oldName.toString() ) );
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
Sun Jan 27 15:38:33 2008
@@ -23,7 +23,6 @@
 import java.util.Collection;
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
 
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
Sun Jan 27 15:38:33 2008
@@ -51,7 +51,6 @@
 import org.slf4j.LoggerFactory;
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
 
 
 /**
@@ -127,11 +126,11 @@
     {
         // @todo make sure we're not putting in operational attributes that cannot be user
modified
         // must save the entry if change log is enabled
-        Attributes attributes = null;
+        ServerEntry serverEntry = null;
 
         if ( changeLog.isEnabled() && ! opContext.isCollateralOperation() )
         {
-            attributes = getAttributes( opContext );
+            serverEntry = getAttributes( opContext );
         }
 
         next.delete( opContext );
@@ -144,7 +143,7 @@
         Entry forward = new Entry();
         forward.setChangeType( ChangeType.Delete );
         forward.setDn( opContext.getDn().getUpName() );
-        Entry reverse = LdifUtils.reverseDel( opContext.getDn(), attributes );
+        Entry reverse = LdifUtils.reverseDel( opContext.getDn(), ServerEntryUtils.toAttributesImpl(
serverEntry ) );
         changeLog.log( getPrincipal(), forward, reverse );
     }
 
@@ -156,7 +155,7 @@
      * @return the entry's attributes (may be immutable if the schema subentry)
      * @throws NamingException on error accessing the entry's attributes
      */
-    private Attributes getAttributes( OperationContext opContext ) throws NamingException
+    private ServerEntry getAttributes( OperationContext opContext ) throws NamingException
     {
         LdapDN dn = opContext.getDn();
         ServerEntry serverEntry;
@@ -167,26 +166,26 @@
 
         if ( schemaService.isSchemaSubentry( dn.toNormName() ) )
         {
-            return ServerEntryUtils.toAttributesImpl( schemaService.getSubschemaEntryCloned()
);
+            return schemaService.getSubschemaEntryCloned();
         }
         else
         {
             serverEntry = proxy.lookup( new LookupOperationContext( opContext.getRegistries(),
dn ), PartitionNexusProxy.LOOKUP_BYPASS );
         }
 
-        return ServerEntryUtils.toAttributesImpl( serverEntry );
+        return serverEntry;
     }
 
 
     public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws NamingException
     {
-        Attributes attributes = null;
+        ServerEntry serverEntry = null;
         boolean isDelete = AttributeUtils.getAttribute( opContext.getModItems(), entryDeleted
) != null;
 
         if ( ! isDelete && ( changeLog.isEnabled() && ! opContext.isCollateralOperation()
) )
         {
             // @todo make sure we're not putting in operational attributes that cannot be
user modified
-            attributes = getAttributes( opContext );
+            serverEntry = getAttributes( opContext );
         }
 
         next.modify( opContext );
@@ -210,7 +209,7 @@
             forward.addModificationItem( modItem );
         }
 
-        Entry reverse = LdifUtils.reverseModify( opContext.getDn(), opContext.getModItems(),
attributes );
+        Entry reverse = LdifUtils.reverseModify( opContext.getDn(), opContext.getModItems(),
ServerEntryUtils.toAttributesImpl( serverEntry ) );
         changeLog.log( getPrincipal(), forward, reverse );
     }
 
@@ -222,11 +221,12 @@
 
     public void rename ( NextInterceptor next, RenameOperationContext renameContext ) throws
NamingException
     {
-        Attributes attributes = null;
+        ServerEntry serverEntry = null;
+        
         if ( changeLog.isEnabled() && ! renameContext.isCollateralOperation() )
         {
             // @todo make sure we're not putting in operational attributes that cannot be
user modified
-            attributes = getAttributes( renameContext );
+            serverEntry = getAttributes( renameContext );
         }
 
         next.rename( renameContext );
@@ -241,7 +241,7 @@
         forward.setDn( renameContext.getDn().getUpName() );
         forward.setDeleteOldRdn( renameContext.getDelOldDn() );
 
-        Entry reverse = LdifUtils.reverseModifyRdn( attributes, null, renameContext.getDn(),
+        Entry reverse = LdifUtils.reverseModifyRdn( ServerEntryUtils.toAttributesImpl( serverEntry
), null, renameContext.getDn(),
                 new Rdn( renameContext.getNewRdn() ) );
         changeLog.log( getPrincipal(), forward, reverse );
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
Sun Jan 27 15:38:33 2008
@@ -20,14 +20,11 @@
 
 package org.apache.directory.server.core.collective;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.ModificationItem;
 
@@ -81,21 +78,6 @@
                 ResultCodeEnum.OTHER);
         }
     }
-    
-    public void checkModify( Registries registries, LdapDN normName, int modOp, Attributes
mods ) throws NamingException
-    {
-        ArrayList<ModificationItemImpl> modsAsArray = new ArrayList<ModificationItemImpl>(
mods.size() );
-        NamingEnumeration<? extends Attribute> allAttrs = mods.getAll();
-        
-        while ( allAttrs.hasMoreElements() )
-        {
-            Attribute attr = allAttrs.nextElement();
-            modsAsArray.add( new ModificationItemImpl( modOp, attr ) );
-        }
-        
-        checkModify( registries, normName, modsAsArray );
-    }
-    
     
     public void checkModify( Registries registries, LdapDN normName, List<ModificationItemImpl>
mods ) throws NamingException
     {

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
Sun Jan 27 15:38:33 2008
@@ -63,7 +63,6 @@
 import org.slf4j.LoggerFactory;
 
 import javax.naming.Binding;
-import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.SearchControls;
 import javax.naming.event.EventContext;
@@ -116,7 +115,7 @@
      * @param namingListener the naming listener to register
      * @throws NamingException if there are failures adding the naming listener
      */
-    public void addNamingListener( EventContext ctx, Name name, ExprNode filter, SearchControls
searchControls,
+    public void addNamingListener( EventContext ctx, LdapDN name, ExprNode filter, SearchControls
searchControls,
         NamingListener namingListener ) throws NamingException
     {
         LdapDN normalizedBaseDn = new LdapDN( name );
@@ -460,14 +459,14 @@
 
     class EventSourceRecord
     {
-        private Name base;
+        private LdapDN base;
         private SearchControls controls;
         private ExprNode filter;
         private EventContext context;
         private NamingListener listener;
 
 
-        public EventSourceRecord(Name base, ExprNode filter, EventContext context, SearchControls
controls,
+        public EventSourceRecord( LdapDN base, ExprNode filter, EventContext context, SearchControls
controls,
             NamingListener listener)
         {
             this.filter = filter;
@@ -496,7 +495,7 @@
         }
 
 
-        public Name getBase()
+        public LdapDN getBase()
         {
             return base;
         }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
Sun Jan 27 15:38:33 2008
@@ -23,7 +23,6 @@
 import java.util.Comparator;
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
 
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
Sun Jan 27 15:38:33 2008
@@ -24,7 +24,6 @@
 import java.util.regex.PatternSyntaxException;
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
 
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?rev=615678&r1=615677&r2=615678&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
Sun Jan 27 15:38:33 2008
@@ -28,7 +28,6 @@
 import java.util.Set;
 
 import javax.naming.Context;
-import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.ServiceUnavailableException;
@@ -885,7 +884,7 @@
      * interceptor.
      */
 
-    public void addNamingListener( EventContext ctx, Name name, ExprNode filter, SearchControls
searchControls,
+    public void addNamingListener( EventContext ctx, LdapDN name, ExprNode filter, SearchControls
searchControls,
             NamingListener namingListener ) throws NamingException
     {
         InterceptorChain chain = service.getInterceptorChain();



Mime
View raw message