directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1079045 [1/2] - in /directory/apacheds/branches/milestones: ./ all/ core-annotations/ core-api/ core-api/src/main/java/org/apache/directory/server/core/ core-api/src/main/java/org/apache/directory/server/core/changelog/ core-api/src/main/j...
Date Tue, 08 Mar 2011 00:15:48 GMT
Author: akarasulu
Date: Tue Mar  8 00:15:46 2011
New Revision: 1079045

URL: http://svn.apache.org/viewvc?rev=1079045&view=rev
Log:
merging in from trunks

Added:
    directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEventSerializer.java
      - copied unchanged from r1079041, directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEventSerializer.java
Modified:
    directory/apacheds/branches/milestones/   (props changed)
    directory/apacheds/branches/milestones/all/   (props changed)
    directory/apacheds/branches/milestones/core/   (props changed)
    directory/apacheds/branches/milestones/core-annotations/   (props changed)
    directory/apacheds/branches/milestones/core-api/   (props changed)
    directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
    directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipalSerializer.java
    directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java   (props changed)
    directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
    directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
    directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
    directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/branches/milestones/core-api/src/main/resources/directory-cacheservice.xml
    directory/apacheds/branches/milestones/core-avl/   (props changed)
    directory/apacheds/branches/milestones/core-constants/   (props changed)
    directory/apacheds/branches/milestones/core-integ/   (props changed)
    directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
    directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java   (props changed)
    directory/apacheds/branches/milestones/core-jndi/   (props changed)
    directory/apacheds/branches/milestones/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
    directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
    directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
    directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
    directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java
    directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/apacheds/branches/milestones/http-directory-bridge/pom.xml
    directory/apacheds/branches/milestones/http-integration/   (props changed)
    directory/apacheds/branches/milestones/i18n/   (props changed)
    directory/apacheds/branches/milestones/installers/   (props changed)
    directory/apacheds/branches/milestones/installers-maven-plugin/   (props changed)
    directory/apacheds/branches/milestones/installers-maven-plugin/pom.xml
    directory/apacheds/branches/milestones/installers/settings-hudson.xml
    directory/apacheds/branches/milestones/interceptor-kerberos/   (props changed)
    directory/apacheds/branches/milestones/jdbm/   (props changed)
    directory/apacheds/branches/milestones/jdbm-partition/   (props changed)
    directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/   (props changed)
    directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java   (props changed)
    directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/   (props changed)
    directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/branches/milestones/jdbm/pom.xml
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java   (props changed)
    directory/apacheds/branches/milestones/kerberos-codec/src/test/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/milestones/kerberos-test/   (props changed)
    directory/apacheds/branches/milestones/kerberos-test/src/test/resources/krb5.conf
    directory/apacheds/branches/milestones/ldif-partition/   (props changed)
    directory/apacheds/branches/milestones/osgi/src/main/filtered-resources/features.xml
    directory/apacheds/branches/milestones/osgi/src/main/resources/apacheds.xsd
    directory/apacheds/branches/milestones/pom.xml
    directory/apacheds/branches/milestones/protocol-changepw/   (props changed)
    directory/apacheds/branches/milestones/protocol-dhcp/   (props changed)
    directory/apacheds/branches/milestones/protocol-dns/   (props changed)
    directory/apacheds/branches/milestones/protocol-kerberos/   (props changed)
    directory/apacheds/branches/milestones/protocol-kerberos/src/test/resources/org/apache/directory/server/kerberos/kdc/krb5.conf
    directory/apacheds/branches/milestones/protocol-ldap/   (props changed)
    directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
    directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
    directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java   (props changed)
    directory/apacheds/branches/milestones/protocol-ntp/   (props changed)
    directory/apacheds/branches/milestones/protocol-shared/   (props changed)
    directory/apacheds/branches/milestones/server-annotations/   (props changed)
    directory/apacheds/branches/milestones/server-config/   (props changed)
    directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (props changed)
    directory/apacheds/branches/milestones/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (props changed)
    directory/apacheds/branches/milestones/server-integ/   (props changed)
    directory/apacheds/branches/milestones/server-jndi/   (props changed)
    directory/apacheds/branches/milestones/server-replication/   (props changed)
    directory/apacheds/branches/milestones/server-tools/   (props changed)
    directory/apacheds/branches/milestones/service-builder/   (props changed)
    directory/apacheds/branches/milestones/service/ApacheDS.launch
    directory/apacheds/branches/milestones/test-framework/   (props changed)
    directory/apacheds/branches/milestones/test-framework/pom.xml
    directory/apacheds/branches/milestones/xdbm-partition/   (props changed)
    directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java
    directory/apacheds/branches/milestones/xdbm-tools/   (props changed)

Propchange: directory/apacheds/branches/milestones/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree:965203-965686
 /directory/apacheds/branches/milestones:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk:1067786-1067997

Propchange: directory/apacheds/branches/milestones/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
 /directory/apacheds/branches/milestones/all:1072812-1075328
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/all:1067786-1067997

Propchange: directory/apacheds/branches/milestones/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
 /directory/apacheds/branches/milestones/core:1072812-1075328
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core:1067786-1067997

Propchange: directory/apacheds/branches/milestones/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
 /directory/apacheds/branches/milestones/core-annotations:1072812-1075328
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core-annotations:1067786-1067997

Propchange: directory/apacheds/branches/milestones/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
 /directory/apacheds/branches/milestones/core-api:1072812-1075328
-/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core-api:1067786-1067997

Modified: directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java (original)
+++ directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java Tue Mar  8 00:15:46 2011
@@ -20,17 +20,12 @@
 package org.apache.directory.server.core;
 
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.security.Principal;
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.name.DnSerializer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.util.Strings;
 
@@ -41,7 +36,7 @@ import org.apache.directory.shared.util.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public final class LdapPrincipal implements Principal, Cloneable, Externalizable
+public final class LdapPrincipal implements Principal, Cloneable
 {
     private static final long serialVersionUID = 3906650782395676720L;
 
@@ -126,24 +121,12 @@ public final class LdapPrincipal impleme
 
 
     /**
-     * Gets a reference to the distinguished name of this
-     * principal as a {@link org.apache.directory.shared.ldap.model.name.Dn}.
-     *
-     * @return the distinguished name of the principal as a {@link org.apache.directory.shared.ldap.model.name.Dn}
-     */
-    public Dn getDNRef()
-    {
-        return dn;
-    }
-
-
-    /**
      * Gets a cloned copy of the normalized distinguished name of this
      * principal as a {@link org.apache.directory.shared.ldap.model.name.Dn}.
      *
      * @return the cloned distinguished name of the principal as a {@link org.apache.directory.shared.ldap.model.name.Dn}
      */
-    public Dn getDN()
+    public Dn getDn()
     {
         return dn;
     }
@@ -200,65 +183,6 @@ public final class LdapPrincipal impleme
     
     
     /**
-     * @see Externalizable#readExternal(ObjectInput)
-     * 
-     * @param in The stream from which the LdapPrincipal is read
-     * @throws IOException If the stream can't be read
-     * @throws ClassNotFoundException If the LdapPrincipal can't be created 
-     */
-    public void readExternal( ObjectInput in ) throws IOException , ClassNotFoundException
-    {
-        // Read the name
-        try
-        {
-            dn = DnSerializer.deserialize( schemaManager, in );
-        }
-        catch ( LdapInvalidDnException lide )
-        {
-            throw new IOException( lide.getMessage() );
-        }
-        
-        // read the authentication level
-        int level = in.readInt();
-        
-        authenticationLevel = AuthenticationLevel.getLevel( level );
-    }
-
-
-    /**
-     * Note: The password won't be written !
-     * 
-     * @see Externalizable#readExternal(ObjectInput)
-     *
-     * @param out The stream in which the LdapPrincipal will be serialized. 
-     *
-     * @throws IOException If the serialization fail
-     */
-    public void writeExternal( ObjectOutput out ) throws IOException
-    {
-        // Write the name
-        if ( dn == null )
-        {
-            DnSerializer.serialize( Dn.EMPTY_DN, out );
-        }
-        else
-        {
-            DnSerializer.serialize( dn, out );
-        }
-        
-        // write the authentication level
-        if ( authenticationLevel == null )
-        {
-            out.writeInt( AuthenticationLevel.NONE.getLevel() );
-        }
-        else
-        {
-            out.writeInt( authenticationLevel.getLevel() );
-        }
-    }
-
-
-    /**
      * @return the schemaManager
      */
     public SchemaManager getSchemaManager()

Modified: directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipalSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipalSerializer.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipalSerializer.java (original)
+++ directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipalSerializer.java Tue Mar  8 00:15:46 2011
@@ -52,8 +52,8 @@ public final class LdapPrincipalSerializ
     /**
      * Serializes a LdapPrincipal instance.
      * 
-     * @param principal The LsapPrincipal instance to serialize
-     * @param out The stream into which we will write teh serialized instance
+     * @param principal The LdapPrincipal instance to serialize
+     * @param out The stream into which we will write the serialized instance
      * @throws IOException If the stream can't be written
      */
     public static void serialize( LdapPrincipal principal, ObjectOutput out ) throws IOException
@@ -62,13 +62,13 @@ public final class LdapPrincipalSerializ
         out.writeInt( principal.getAuthenticationLevel().getLevel() );
         
         // The principal's DN
-        if ( principal.getDN() == null )
+        if ( principal.getDn() == null )
         {
             DnSerializer.serialize( Dn.EMPTY_DN, out );
         }
         else
         {
-            DnSerializer.serialize( principal.getDN(), out );
+            DnSerializer.serialize( principal.getDn(), out );
         }
     }
     
@@ -77,8 +77,8 @@ public final class LdapPrincipalSerializ
      * Deserializes a LdapPrincipal instance.
      * 
      * @param schemaManager The SchemaManager (can be null)
-     * @param in The input stream from which the Rdn is read
-     * @return a deserialized Rdn
+     * @param in The input stream from which the LdapPrincipal is read
+     * @return a deserialized LdapPrincipal
      * @throws IOException If the stream can't be read
      */
     public static LdapPrincipal deserialize( SchemaManager schemaManager, ObjectInput in )

Propchange: directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-subtree/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:965203-965686
 /directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:945827-946347
-/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1067786-1067997

Modified: directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java (original)
+++ directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java Tue Mar  8 00:15:46 2011
@@ -20,17 +20,12 @@
 package org.apache.directory.server.core.changelog;
 
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
-import org.apache.directory.shared.util.Unicode;
 
 
 /**
@@ -38,25 +33,22 @@ import org.apache.directory.shared.util.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ChangeLogEvent implements Externalizable
+public class ChangeLogEvent
 {
-    private static final long serialVersionUID = 1L;
+    /** */
     private String zuluTime;
+    
+    /** The committer */
+    private LdapPrincipal committer;
+    
+    /** The revision number for this event */
     private long revision;
+    
+    /** The modification */
     private LdifEntry forwardLdif;
     
     /** The revert changes. Can contain more than one single change */
     private List<LdifEntry> reverseLdifs;
-    private LdapPrincipal committer;
-
-
-    /**
-     * Creates a new instance of ChangeLogEvent, used during the deserialization
-     * process
-     */
-    public ChangeLogEvent()
-    {
-    }
 
 
     /**
@@ -152,112 +144,6 @@ public class ChangeLogEvent implements E
     }
 
 
-    /**
-     * @see Externalizable#readExternal(ObjectInput)
-     * 
-     * @param in The stream from which the ChangeOlgEvent is read
-     * @throws IOException If the stream can't be read
-     * @throws ClassNotFoundException If the ChangeLogEvent can't be created 
-     */
-    public void readExternal( ObjectInput in ) throws IOException , ClassNotFoundException
-    {
-        // Read the committer
-        committer = (LdapPrincipal)in.readObject();
-        
-        // Read the revision
-        revision = in.readLong();
-        
-        // Read the time
-        boolean hasZuluTime = in.readBoolean();
-        
-        if ( hasZuluTime )
-        {
-            zuluTime = Unicode.readUTF(in);
-        }
-        
-        // Read the forward LDIF
-        boolean hasForwardLdif = in.readBoolean();
-        
-        if ( hasForwardLdif )
-        {
-            forwardLdif = (LdifEntry)in.readObject();
-        }
-        
-        // Read the reverse LDIF number
-        int nbReverseLdif = in.readInt();
-        
-        if ( nbReverseLdif > 0 )
-        {
-            // Read each reverse ldif
-            reverseLdifs = new ArrayList<LdifEntry>(nbReverseLdif);
-            
-            for ( int i = 0; i < nbReverseLdif; i++ )
-            {
-                reverseLdifs.add( (LdifEntry)in.readObject() ); 
-            }
-        }
-    }
-
-
-    /**
-     * @see Externalizable#readExternal(ObjectInput)
-     *
-     * @param out The stream in which the ChangeLogEvent will be serialized. 
-     *
-     * @throws IOException If the serialization fail
-     */
-    public void writeExternal( ObjectOutput out ) throws IOException
-    {
-        // Write the committer
-        out.writeObject( committer );
-        
-        // write the revision
-        out.writeLong( revision );
-        
-        // write the time
-        
-        if ( zuluTime != null )
-        {
-            out.writeBoolean( true );
-            Unicode.writeUTF(out, zuluTime);
-        }
-        else
-        {
-            out.writeBoolean( false );
-        }
-        
-        // write the forward LDIF
-        if ( forwardLdif != null )
-        {
-            out.writeBoolean( true );
-            out.writeObject( forwardLdif );
-        }
-        else
-        {
-            out.writeBoolean( false );
-        }
-        
-        // write the reverse LDIF
-        if ( reverseLdifs != null )
-        {
-            out.writeInt( reverseLdifs.size() );
-            
-            // write each reverse
-            for ( LdifEntry reverseLdif:reverseLdifs )
-            {
-                out.writeObject( reverseLdif );
-            }
-        }
-        else
-        {
-            out.writeBoolean( false );
-        }
-        
-        // and flush the result
-        out.flush();
-    }
-
-
     @Override
     public String toString()
     {

Modified: directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java Tue Mar  8 00:15:46 2011
@@ -38,13 +38,13 @@ public class UnbindOperationContext exte
      */
     public UnbindOperationContext( CoreSession session )
     {
-        super( session, session.getEffectivePrincipal().getDN() );
+        super( session, session.getEffectivePrincipal().getDn() );
     }
     
 
     public UnbindOperationContext( CoreSession session, UnbindRequest unbindRequest )
     {
-        super( session, session.getEffectivePrincipal().getDN() );
+        super( session, session.getEffectivePrincipal().getDn() );
         this.setRequestControls( unbindRequest.getControls() );
     }
 

Modified: directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Tue Mar  8 00:15:46 2011
@@ -1,3 +1,22 @@
+/*
+ *  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.core.schema;
 
 

Modified: directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Tue Mar  8 00:15:46 2011
@@ -1,3 +1,22 @@
+/*
+ *  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.core.schema;
 
 

Modified: directory/apacheds/branches/milestones/core-api/src/main/resources/directory-cacheservice.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-api/src/main/resources/directory-cacheservice.xml?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-api/src/main/resources/directory-cacheservice.xml (original)
+++ directory/apacheds/branches/milestones/core-api/src/main/resources/directory-cacheservice.xml Tue Mar  8 00:15:46 2011
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
 <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="ehcache.xsd" updateCheck="false"
 	monitoring="autodetect" dynamicConfig="true">

Propchange: directory/apacheds/branches/milestones/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-avl:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
 /directory/apacheds/branches/milestones/core-avl:1072812-1075328
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core-avl:1067786-1067997

Propchange: directory/apacheds/branches/milestones/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-constants:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
 /directory/apacheds/branches/milestones/core-constants:1072812-1075328
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core-constants:1067786-1067997

Propchange: directory/apacheds/branches/milestones/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
 /directory/apacheds/branches/milestones/core-integ:1072812-1075328
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core-integ:1067786-1067997

Modified: directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original)
+++ directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Tue Mar  8 00:15:46 2011
@@ -39,7 +39,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -188,7 +187,6 @@ public class AddAuthorizationIT extends 
      * @throws Exception if the test encounters an error
      */
     @Test
-    @Ignore
     public void testGrantAddByName() throws Exception
     {
         // create the non-admin user
@@ -227,7 +225,6 @@ public class AddAuthorizationIT extends 
      * @throws Exception if the test encounters an error
      */
     @Test
-    @Ignore
     public void testGrantAddBySubtree() throws Exception
     {
         // create the non-admin user
@@ -269,7 +266,6 @@ public class AddAuthorizationIT extends 
      * @throws Exception if the test encounters an error
      */
     @Test
-    @Ignore
     public void testGrantAddAllUsers() throws Exception
     {
         // create the non-admin user

Propchange: directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
 /directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
 /directory/apacheds/branches/milestones/core-jndi:1072812-1075328
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/core-jndi:1067786-1067997

Modified: directory/apacheds/branches/milestones/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/apacheds/branches/milestones/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Tue Mar  8 00:15:46 2011
@@ -101,6 +101,7 @@ class JavaLdapSupport
         {
             byte[] data = ( byte[] ) serverEntry.get( JSERIALDATA_ATTR ).getBytes();
             in = new ObjectInputStream( new ByteArrayInputStream( data ) );
+            
             return in.readObject();
         }
         catch ( Exception e )

Modified: directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Tue Mar  8 00:15:46 2011
@@ -816,7 +816,7 @@ public class DefaultCoreSession implemen
 
     public boolean isAnonymous()
     {
-        return getEffectivePrincipal().getDNRef().isEmpty();
+        return getEffectivePrincipal().getDn().isEmpty();
     }
 
 

Modified: directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Tue Mar  8 00:15:46 2011
@@ -512,7 +512,7 @@ public class AuthenticationInterceptor e
         PasswordPolicyConfiguration policyConfig = directoryService.getPwdPolicy( modifyContext.getOriginalEntry() );
         
         boolean isPPolicyReqCtrlPresent = modifyContext.hasRequestControl( PasswordPolicy.OID );
-        Dn userDn = modifyContext.getSession().getAuthenticatedPrincipal().getDN();
+        Dn userDn = modifyContext.getSession().getAuthenticatedPrincipal().getDn();
 
         PwdModDetailsHolder pwdModDetails = null;
         if ( policyConfig.isPwdSafeModify() || pwdResetSet.contains( userDn ) || ( policyConfig.getPwdMinAge() > 0 ) )
@@ -1380,7 +1380,7 @@ public class AuthenticationInterceptor e
         {
             CoreSession session = opContext.getSession();
 
-            Dn userDn = session.getAuthenticatedPrincipal().getDN();
+            Dn userDn = session.getAuthenticatedPrincipal().getDn();
 
             if ( pwdResetSet.contains( userDn ) )
             {

Modified: directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Tue Mar  8 00:15:46 2011
@@ -304,7 +304,7 @@ public class AciAuthorizationInterceptor
 
     private void protectCriticalEntries( Dn dn ) throws LdapException
     {
-        Dn principalDn = getPrincipal().getDNRef();
+        Dn principalDn = getPrincipal().getDn();
 
         if ( dn.isEmpty() )
         {
@@ -508,7 +508,7 @@ public class AciAuthorizationInterceptor
 
         // Access the principal requesting the operation, and bypass checks if it is the admin
         LdapPrincipal principal = addContext.getSession().getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
 
         Entry serverEntry = addContext.getEntry();
 
@@ -605,7 +605,7 @@ public class AciAuthorizationInterceptor
 
         Dn dn = deleteContext.getDn();
         LdapPrincipal principal = session.getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
 
         Entry entry = deleteContext.getEntry();
 
@@ -656,7 +656,7 @@ public class AciAuthorizationInterceptor
         Entry entry = modifyContext.getEntry();
 
         LdapPrincipal principal = modifyContext.getSession().getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
 
         // bypass authz code if we are disabled
         if ( !modifyContext.getSession().getDirectoryService().isAccessControlEnabled() )
@@ -824,7 +824,7 @@ public class AciAuthorizationInterceptor
 
         // TODO - eventually replace this with a check on session.isAnAdministrator()
         LdapPrincipal principal = hasEntryContext.getSession().getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
 
         if ( isPrincipalAnAdministrator( principalDn ) )
         {
@@ -880,7 +880,7 @@ public class AciAuthorizationInterceptor
         }
 
         LdapPrincipal principal = lookupContext.getSession().getEffectivePrincipal();
-        Dn userName = principal.getDN();
+        Dn userName = principal.getDn();
         Set<Dn> userGroups = groupCache.getGroups( userName.getNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( lookupContext, tuples, dn, entry );
@@ -931,7 +931,7 @@ public class AciAuthorizationInterceptor
         DirectoryService directoryService = session.getDirectoryService();
 
         LdapPrincipal principal = session.getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
 
         if ( !principalDn.isNormalized() )
         {
@@ -964,7 +964,7 @@ public class AciAuthorizationInterceptor
         }
 
         LdapPrincipal principal = renameContext.getSession().getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
         Dn newName = renameContext.getNewDn();
 
         // bypass authz code if we are disabled
@@ -1019,7 +1019,7 @@ public class AciAuthorizationInterceptor
         Entry entry = moveAndRenameContext.getOriginalEntry();
 
         LdapPrincipal principal = moveAndRenameContext.getSession().getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
         Dn newDn = moveAndRenameContext.getNewDn();
 
         // bypass authz code if we are disabled
@@ -1116,7 +1116,7 @@ public class AciAuthorizationInterceptor
         Dn newDn = moveContext.getNewDn();
 
         LdapPrincipal principal = moveContext.getSession().getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
 
         // bypass authz code if we are disabled
         if ( !moveContext.getSession().getDirectoryService().isAccessControlEnabled() )
@@ -1202,7 +1202,7 @@ public class AciAuthorizationInterceptor
         LdapPrincipal user = listContext.getSession().getEffectivePrincipal();
         EntryFilteringCursor cursor = next.list( listContext );
 
-        if ( isPrincipalAnAdministrator( user.getDNRef() )
+        if ( isPrincipalAnAdministrator( user.getDn() )
             || !listContext.getSession().getDirectoryService().isAccessControlEnabled() )
         {
             return cursor;
@@ -1217,7 +1217,7 @@ public class AciAuthorizationInterceptor
     public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext searchContext ) throws LdapException
     {
         LdapPrincipal user = searchContext.getSession().getEffectivePrincipal();
-        Dn principalDn = user.getDN();
+        Dn principalDn = user.getDn();
         EntryFilteringCursor cursor = next.search( searchContext );
 
         boolean isSubschemaSubentryLookup = subschemaSubentryDn.equals( searchContext.getDn().getNormName() );
@@ -1256,7 +1256,7 @@ public class AciAuthorizationInterceptor
         Entry entry = compareContext.getOriginalEntry();
 
         LdapPrincipal principal = session.getEffectivePrincipal();
-        Dn principalDn = principal.getDN();
+        Dn principalDn = principal.getDn();
 
         if ( isPrincipalAnAdministrator( principalDn ) || !session.getDirectoryService().isAccessControlEnabled() )
         {
@@ -1313,7 +1313,7 @@ public class AciAuthorizationInterceptor
          */
 
         LdapPrincipal principal = opContext.getSession().getEffectivePrincipal();
-        Dn userDn = principal.getDN();
+        Dn userDn = principal.getDn();
         Set<Dn> userGroups = groupCache.getGroups( userDn.getNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( opContext, tuples, normName, clonedEntry );

Modified: directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Tue Mar  8 00:15:46 2011
@@ -166,7 +166,7 @@ public class DefaultAuthorizationInterce
             throw new LdapNoPermissionException( msg );
         }
 
-        Dn principalDn = getPrincipal().getDNRef();
+        Dn principalDn = getPrincipal().getDn();
 
         if ( dn.equals( ADMIN_SYSTEM_DN ) )
         {
@@ -242,7 +242,7 @@ public class DefaultAuthorizationInterce
 
     private void protectModifyAlterations( Dn dn ) throws LdapException
     {
-        Dn principalDn = getPrincipal().getDN();
+        Dn principalDn = getPrincipal().getDn();
 
         if ( dn.isEmpty() )
         {
@@ -334,7 +334,7 @@ public class DefaultAuthorizationInterce
 
     private void protectDnAlterations( Dn dn ) throws LdapException
     {
-        Dn principalDn = getPrincipal().getDN();
+        Dn principalDn = getPrincipal().getDn();
 
         if ( dn.isEmpty() )
         {
@@ -383,7 +383,7 @@ public class DefaultAuthorizationInterce
             return entry;
         }
 
-        protectLookUp( session.getEffectivePrincipal().getDNRef(), lookupContext.getDn() );
+        protectLookUp( session.getEffectivePrincipal().getDn(), lookupContext.getDn() );
 
         return entry;
     }
@@ -484,7 +484,7 @@ public class DefaultAuthorizationInterce
     @SuppressWarnings("PMD.CollapsibleIfStatements")
     private boolean isSearchable( OperationContext opContext, ClonedServerEntry result ) throws Exception
     {
-        Dn principalDn = opContext.getSession().getEffectivePrincipal().getDN();
+        Dn principalDn = opContext.getSession().getEffectivePrincipal().getDn();
         Dn dn = result.getDn();
 
         if ( !dn.isNormalized() )

Modified: directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Tue Mar  8 00:15:46 2011
@@ -348,7 +348,7 @@ public class MemoryChangeLogStore implem
 
                 for ( int i = 0; i < size; i++ )
                 {
-                    ChangeLogEvent event = ( ChangeLogEvent ) in.readObject();
+                    ChangeLogEvent event = ChangeLogEventSerializer.deserialize( directoryService.getSchemaManager(), in );
                     event.getCommitterPrincipal().setSchemaManager( directoryService.getSchemaManager() );
                     changeLogEvents.add( event );
                 }
@@ -412,7 +412,7 @@ public class MemoryChangeLogStore implem
             
             for ( ChangeLogEvent event : events )
             {
-                out.writeObject( event );
+                ChangeLogEventSerializer.serialize( event, out  );
             }
 
             out.flush();

Modified: directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Tue Mar  8 00:15:46 2011
@@ -237,7 +237,7 @@ public class OperationalAttributeInterce
         // otherwise, inject those values into the list of modifications
         List<Modification> mods = modifyContext.getModItems();
 
-        boolean isAdmin = modifyContext.getSession().getAuthenticatedPrincipal().getDN().equals( adminDn );
+        boolean isAdmin = modifyContext.getSession().getAuthenticatedPrincipal().getDn().equals( adminDn );
 
         boolean modifierAtPresent = false;
         boolean modifiedTimeAtPresent = false;

Modified: directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java (original)
+++ directory/apacheds/branches/milestones/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java Tue Mar  8 00:15:46 2011
@@ -44,7 +44,7 @@ public class SimpleTriggerExecutionAutho
     
     public boolean hasPermission( OperationContext opContext ) throws LdapException
     {
-        Dn principalName = opContext.getSession().getEffectivePrincipal().getDN();
-        return principalName.equals( opContext.getSession().getDirectoryService().getAdminSession().getAuthenticatedPrincipal().getDN() );
+        Dn principalName = opContext.getSession().getEffectivePrincipal().getDn();
+        return principalName.equals( opContext.getSession().getDirectoryService().getAdminSession().getAuthenticatedPrincipal().getDn() );
     }
 }

Modified: directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java (original)
+++ directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java Tue Mar  8 00:15:46 2011
@@ -27,6 +27,12 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
 import org.apache.directory.server.core.LdapPrincipal;
+import org.apache.directory.server.core.LdapPrincipalSerializer;
+import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -44,6 +50,16 @@ import com.mycila.junit.concurrent.Concu
 @Concurrency()
 public class LdapPrincipalTest
 {
+    /** The schema manager instance */
+    private static SchemaManager schemaManager;
+
+    @BeforeClass
+    public static void setUp() throws Exception
+    {
+        schemaManager = new DefaultSchemaManager();
+    }
+
+
     /**
      * Test the serialization of an empty LdapPrincipal
      */
@@ -55,12 +71,36 @@ public class LdapPrincipalTest
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
 
-        out.writeObject( principal );
+        LdapPrincipalSerializer.serialize( principal, out );
+        out.flush();
+
+        byte[] data = baos.toByteArray();
+        ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
+
+        LdapPrincipal readPrincipal = LdapPrincipalSerializer.deserialize( null, in );
+        assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
+        assertEquals( principal.getName(), readPrincipal.getName() );
+    }
+    
+    
+    /**
+     * Test the serialization of an empty LdapPrincipal
+     */
+    @Test
+    public void testStaticSerializeLdapPrincipalWithSchemaManager() throws Exception
+    {
+        LdapPrincipal principal = new LdapPrincipal( schemaManager, new Dn( schemaManager, "uid=admin,ou=system" ), AuthenticationLevel.STRONG );
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream out = new ObjectOutputStream( baos );
+
+        LdapPrincipalSerializer.serialize( principal, out );
+        out.flush();
 
         byte[] data = baos.toByteArray();
         ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        LdapPrincipal readPrincipal = (LdapPrincipal)in.readObject();
+        LdapPrincipal readPrincipal = LdapPrincipalSerializer.deserialize( null, in );
         assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
         assertEquals( principal.getName(), readPrincipal.getName() );
     }

Modified: directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original)
+++ directory/apacheds/branches/milestones/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Tue Mar  8 00:15:46 2011
@@ -125,12 +125,12 @@ public class MemoryChangeLogStoreTest
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
 
-        out.writeObject( event );
+        ChangeLogEventSerializer.serialize( event, out );
         
         byte[] data = baos.toByteArray();
         ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
         
-        ChangeLogEvent read = (ChangeLogEvent)in.readObject(); 
+        ChangeLogEvent read = ChangeLogEventSerializer.deserialize( schemaManager, in ); 
         
         // The read event should not be equal to the written event, as
         // the principal's password has not been stored
@@ -140,7 +140,7 @@ public class MemoryChangeLogStoreTest
         
         assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
         assertEquals( principal.getName(), readPrincipal.getName() );
-        assertEquals( principal.getDN(), readPrincipal.getDN() );
+        assertEquals( principal.getDn(), readPrincipal.getDn() );
         assertNull( readPrincipal.getUserPassword() );
         
         assertEquals( zuluTime, read.getZuluTime() );

Modified: directory/apacheds/branches/milestones/http-directory-bridge/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/http-directory-bridge/pom.xml?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/http-directory-bridge/pom.xml (original)
+++ directory/apacheds/branches/milestones/http-directory-bridge/pom.xml Tue Mar  8 00:15:46 2011
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>

Propchange: directory/apacheds/branches/milestones/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765
 /directory/apacheds/branches/milestones/http-integration:1072812-1075328
-/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/http-integration:1067786-1067997

Propchange: directory/apacheds/branches/milestones/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765
 /directory/apacheds/branches/milestones/i18n:1072812-1075328
-/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/i18n:1067786-1067997

Propchange: directory/apacheds/branches/milestones/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -1,6 +1,6 @@
 /directory/apacheds/branches/apacheds-config/installers:1023442-1029077
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
 /directory/apacheds/branches/milestones/installers:1072812-1075328
-/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/installers/branches/installers-schema/apacheds:806631-896441
 /directory/studio/trunk/installers:1067786-1067997

Propchange: directory/apacheds/branches/milestones/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -1,6 +1,6 @@
 /directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765
 /directory/apacheds/branches/milestones/installers-maven-plugin:1072812-1075328
-/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/daemon/branches/daemon-schema/plugin:806630-896441
 /directory/studio/trunk/installers-maven-plugin:1067786-1067997

Modified: directory/apacheds/branches/milestones/installers-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/installers-maven-plugin/pom.xml?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/installers-maven-plugin/pom.xml (original)
+++ directory/apacheds/branches/milestones/installers-maven-plugin/pom.xml Tue Mar  8 00:15:46 2011
@@ -60,7 +60,42 @@
     </dependency>
   </dependencies>
 
-  <build>
+  <build><pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludeSubProjects>false</excludeSubProjects>
+            <excludes>
+              <!-- MAVEN_DEFAULT_EXCLUDES -->
+              <exclude>**/target/**/*</exclude>
+              <exclude>**/cobertura.ser</exclude>
+              <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+              <exclude>**/.classpath</exclude>
+              <exclude>**/.project</exclude>
+              <exclude>**/.settings/**/*</exclude>
+              <!-- IDEA_DEFAULT_EXCLUDES -->
+              <exclude>**/*.iml</exclude>
+              <exclude>**/*.ipr</exclude>
+              <exclude>**/*.iws</exclude>
+              <!-- MANIFEST_MF_EXCLUDES -->
+              <exclude>**/MANIFEST.MF</exclude>
+              <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+              <exclude>**/dependency-reduced-pom.xml</exclude>
+              <!-- LDIF_FILES_EXCLUDES -->
+              <exclude>**/*.ldif</exclude>
+              <!-- INSTALLERS_FILES_EXCLUDES -->
+              <exclude>src/main/resources/org/apache/directory/server/installers/deb/control</exclude>
+              <exclude>src/main/resources/org/apache/directory/server/installers/macosxpkg/License.rtf</exclude>
+              <exclude>src/main/resources/org/apache/directory/server/installers/solarispkg/pkginfo</exclude>
+              <exclude>src/main/resources/org/apache/directory/server/installers/solarispkg/Prototype</exclude>
+            </excludes>
+          </configuration>
+         </plugin>
+      </plugins>
+    </pluginManagement>
+    
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: directory/apacheds/branches/milestones/installers/settings-hudson.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/installers/settings-hudson.xml?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/installers/settings-hudson.xml (original)
+++ directory/apacheds/branches/milestones/installers/settings-hudson.xml Tue Mar  8 00:15:46 2011
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
 <settings>
   <!-- These settings are used on Hudson OSX slave to build installers -->
   <profiles>

Propchange: directory/apacheds/branches/milestones/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
 /directory/apacheds/branches/milestones/interceptor-kerberos:1072812-1075328
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/interceptor-kerberos:1067786-1067997

Propchange: directory/apacheds/branches/milestones/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm:1072812-1075328
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/jdbm:1067786-1067997

Propchange: directory/apacheds/branches/milestones/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm-partition:1072812-1075328
-/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/jdbm-partition:1067786-1067997

Propchange: directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1067786-1067997

Propchange: directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:1067786-1067997

Propchange: directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997

Modified: directory/apacheds/branches/milestones/jdbm/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/jdbm/pom.xml?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/jdbm/pom.xml (original)
+++ directory/apacheds/branches/milestones/jdbm/pom.xml Tue Mar  8 00:15:46 2011
@@ -42,4 +42,21 @@
       <artifactId>apacheds-i18n</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <configuration>
+            <excludeSubProjects>false</excludeSubProjects>
+            <excludes>
+              <exclude>**/*</exclude>
+            </excludes>
+          </configuration>
+         </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997

Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:15:46 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:965203-965686
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:945827-946347
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997



Mime
View raw message