directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r937784 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry: AbstractEntry.java DefaultServerEntry.java client/DefaultClientEntry.java
Date Sun, 25 Apr 2010 11:55:45 GMT
Author: elecharny
Date: Sun Apr 25 11:55:45 2010
New Revision: 937784

URL: http://svn.apache.org/viewvc?rev=937784&view=rev
Log:
Preliminary changes in the Client/Server Entry API, before the big modifications.

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java?rev=937784&r1=937783&r2=937784&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java
Sun Apr 25 11:55:45 2010
@@ -24,6 +24,8 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 
 /**
@@ -41,6 +43,12 @@ public abstract class AbstractEntry<K> i
     /** A map containing all the attributes for this entry */
     protected Map<K, EntryAttribute> attributes = new HashMap<K, EntryAttribute>();
     
+    /** A speedup to get the ObjectClass attribute */
+    protected static transient AttributeType OBJECT_CLASS_AT;
+
+    /** The SchemaManager */
+    protected SchemaManager schemaManager;
+
     
     /**
      * Get this entry's DN.

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java?rev=937784&r1=937783&r2=937784&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java
Sun Apr 25 11:55:45 2010
@@ -60,15 +60,8 @@ public final class DefaultServerEntry ex
     /** The logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( DefaultServerEntry.class );
 
-    /** A speedup to get the ObjectClass attribute */
-    private static transient AttributeType OBJECT_CLASS_AT;
-    
     /** A mutex to manage synchronization*/
     private static transient Object MUTEX = new Object();
-    
-    /** The SchemaManager */
-    private SchemaManager schemaManager;
-
 
     //-------------------------------------------------------------------------
     // Helper methods

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java?rev=937784&r1=937783&r2=937784&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
Sun Apr 25 11:55:45 2010
@@ -40,6 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,7 +55,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public final class DefaultClientEntry extends AbstractEntry<String> //implements ClientEntry
+public final class DefaultClientEntry extends AbstractEntry<String>
 {
     /** Used for serialization */
     private static final long serialVersionUID = 2L;
@@ -927,12 +928,6 @@ public final class DefaultClientEntry ex
     }
 
 
-    public Iterator<EntryAttribute> iterator()
-    {
-        return Collections.unmodifiableMap( attributes ).values().iterator();
-    }
-
-
     /**
      * @see Externalizable#writeExternal(ObjectOutput)<p>
      * 



Mime
View raw message