directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1066851 - in /directory: apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/ apacheds/branches/m1/protocol-ldap/src/main/ja...
Date Thu, 03 Feb 2011 16:15:06 GMT
Author: elecharny
Date: Thu Feb  3 16:15:05 2011
New Revision: 1066851

URL: http://svn.apache.org/viewvc?rev=1066851&view=rev
Log:
Moved the replication controls

Added:
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValue.java
      - copied, changed from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/ISyncInfoValue.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValueImpl.java
      - copied, changed from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValue.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncModifyDnType.java
      - copied, changed from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncModifyDnType.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncStateTypeEnum.java
      - copied, changed from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationInfoEnum.java
      - copied, changed from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SynchronizationInfoEnum.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationModeEnum.java
      - copied, changed from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SynchronizationModeEnum.java
Removed:
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/ISyncInfoValue.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValue.java
Modified:
    directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
    directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
    directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
    directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueFactory.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/ISyncRequestValue.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValue.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueGrammar.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/ISyncStateValue.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueGrammar.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/ISyncModifyDn.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDn.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnGrammar.java

Modified: directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Feb  3 16:15:05 2011
@@ -83,7 +83,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.ppolicy.PasswordPolicyResponse;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.ISyncDoneValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueDecorator;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.ISyncInfoValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueDecorator;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.ISyncRequestValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueDecorator;
@@ -120,6 +119,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValue;
 import org.apache.directory.shared.ldap.model.name.Ava;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
@@ -185,7 +185,7 @@ public abstract class ServerContext impl
         ADS_CONTROLS.put( PersistentSearch.OID, ControlEnum.PERSISTENT_SEARCH_CONTROL );
         ADS_CONTROLS.put( Subentries.OID, ControlEnum.SUBENTRIES_CONTROL );
         ADS_CONTROLS.put( ISyncDoneValue.OID, ControlEnum.SYNC_DONE_VALUE_CONTROL );
-        ADS_CONTROLS.put( ISyncInfoValue.OID, ControlEnum.SYNC_INFO_VALUE_CONTROL );
+        ADS_CONTROLS.put( SyncInfoValue.OID, ControlEnum.SYNC_INFO_VALUE_CONTROL );
         ADS_CONTROLS.put( ISyncModifyDn.OID, ControlEnum.SYNC_MODIFY_DN_CONTROL );
         ADS_CONTROLS.put( ISyncRequestValue.OID, ControlEnum.SYNC_REQUEST_VALUE_CONTROL );
         ADS_CONTROLS.put( ISyncStateValue.OID, ControlEnum.SYNC_STATE_VALUE_CONTROL );

Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Thu Feb  3 16:15:05 2011
@@ -60,13 +60,13 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.model.message.controls.Cascade;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.ISyncDoneValue;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.ISyncInfoValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.ISyncRequestValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.ISyncStateValue;
 import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
 import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValue;
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
@@ -178,7 +178,7 @@ public class DefaultPartitionNexus exten
             EntryChange.OID, Subentries.OID, ManageDsaIT.OID,
             Cascade.OID, PagedResults.OID,
             // Replication controls
-            ISyncDoneValue.OID, ISyncInfoValue.OID, ISyncRequestValue.OID,
+            ISyncDoneValue.OID, SyncInfoValue.OID, ISyncRequestValue.OID,
             ISyncStateValue.OID );
 
         // Add the objectClasses

Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Thu Feb  3 16:15:05 2011
@@ -61,7 +61,6 @@ import org.apache.directory.server.proto
 import org.apache.directory.server.protocol.shared.transport.Transport;
 import org.apache.directory.server.protocol.shared.transport.UdpTransport;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.ISyncDoneValue;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.ISyncInfoValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.ISyncRequestValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.ISyncStateValue;
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
@@ -83,6 +82,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValue;
 import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
 import org.apache.mina.core.filterchain.IoFilterAdapter;
@@ -245,7 +245,7 @@ public class LdapServer extends Director
         this.supportedControls.add( PagedResults.OID );
         // Replication controls
         this.supportedControls.add( ISyncDoneValue.OID );
-        this.supportedControls.add( ISyncInfoValue.OID );
+        this.supportedControls.add( SyncInfoValue.OID );
         this.supportedControls.add( ISyncRequestValue.OID );
         this.supportedControls.add( ISyncStateValue.OID );
     }

Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java Thu Feb  3 16:15:05 2011
@@ -34,9 +34,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnDecorator;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.message.controls.SyncModifyDnType;
 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.AttributeType;

Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Thu Feb  3 16:15:05 2011
@@ -41,15 +41,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.ISyncDoneValue;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.ISyncInfoValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueDecorator;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueDecorator;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueDecorator;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.ISyncModifyDn;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnDecorator;
-import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
-import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
@@ -79,6 +75,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.model.message.SearchResultReference;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaITImpl;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValue;
+import org.apache.directory.shared.ldap.model.message.controls.SyncModifyDnType;
+import org.apache.directory.shared.ldap.model.message.controls.SyncStateTypeEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -398,7 +398,7 @@ public class SyncReplConsumer implements
             SyncInfoValueDecorator decorator = new SyncInfoValueDecorator( directoryService.getLdapCodecService() );
             byte[] syncinfo = syncInfoResp.getResponseValue();
             decorator.setValue( syncinfo );
-            ISyncInfoValue syncInfoValue = decorator.getDecorated();
+            SyncInfoValue syncInfoValue = decorator.getDecorated();
 
             byte[] cookie = syncInfoValue.getCookie();
 

Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Thu Feb  3 16:15:05 2011
@@ -49,14 +49,10 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.handlers.SearchTimeLimitingMonitor;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.ISyncDoneValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueDecorator;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.ISyncInfoValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueDecorator;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.ISyncRequestValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueDecorator;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnDecorator;
-import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.csn.Csn;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -87,6 +83,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.SearchResultReference;
 import org.apache.directory.shared.ldap.model.message.SearchResultReferenceImpl;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValue;
+import org.apache.directory.shared.ldap.model.message.controls.SyncStateTypeEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SynchronizationInfoEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
@@ -327,7 +327,7 @@ public class SyncReplProvider implements
         if ( refreshNPersist )
         {
             IntermediateResponse intermResp = new IntermediateResponseImpl( req.getMessageId() );
-            intermResp.setResponseName( ISyncInfoValue.OID );
+            intermResp.setResponseName( SyncInfoValue.OID );
 
             SyncInfoValueDecorator syncInfo = new SyncInfoValueDecorator( ldapServer.getDirectoryService()
                 .getLdapCodecService(),
@@ -423,7 +423,7 @@ public class SyncReplProvider implements
                 cookie = Strings.getBytesUtf8(replicaLog.getId() + REPLICA_ID_DELIM + contextCsn);
 
                 IntermediateResponse intermResp = new IntermediateResponseImpl( req.getMessageId() );
-                intermResp.setResponseName( ISyncInfoValue.OID );
+                intermResp.setResponseName( SyncInfoValue.OID );
 
                 SyncInfoValueDecorator syncInfo = new SyncInfoValueDecorator( 
                     ldapServer.getDirectoryService().getLdapCodecService(), SynchronizationInfoEnum.NEW_COOKIE );

Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java Thu Feb  3 16:15:05 2011
@@ -32,8 +32,6 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueDecorator;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnDecorator;
-import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
-import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -42,6 +40,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.SearchRequest;
 import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.model.message.SearchResultEntryImpl;
+import org.apache.directory.shared.ldap.model.message.controls.SyncModifyDnType;
+import org.apache.directory.shared.ldap.model.message.controls.SyncStateTypeEnum;
 import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.future.WriteFuture;
 import org.slf4j.Logger;

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java Thu Feb  3 16:15:05 2011
@@ -34,7 +34,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.ppolicy.PasswordPolicyFactory;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.ISyncDoneValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueFactory;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.ISyncInfoValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueFactory;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.ISyncRequestValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueFactory;
@@ -55,6 +54,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValue;
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
 
 
@@ -104,7 +104,7 @@ public class DefaultLdapCodecService imp
         controlFactories.put( ISyncDoneValue.OID, syncDoneValueFactory );
         
         SyncInfoValueFactory syncInfoValueFactory = new SyncInfoValueFactory( this );
-        controlFactories.put( ISyncInfoValue.OID, syncInfoValueFactory );
+        controlFactories.put( SyncInfoValue.OID, syncInfoValueFactory );
         
         SyncModifyDnFactory syncModifyDnFactory = new SyncModifyDnFactory( this );
         controlFactories.put( ISyncModifyDn.OID, syncModifyDnFactory );

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueDecorator.java Thu Feb  3 16:15:05 2011
@@ -6,23 +6,22 @@
  *  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. 
- *  
+ *  under the License.
+ *
  */
 package org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue;
 
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.apache.directory.shared.asn1.Asn1Object;
@@ -35,45 +34,47 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecorator;
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValue;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValueImpl;
+import org.apache.directory.shared.ldap.model.message.controls.SynchronizationInfoEnum;
 import org.apache.directory.shared.util.Strings;
 
 
 /**
  * A syncInfoValue object, as defined in RFC 4533
- * 
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncInfoValueDecorator extends ControlDecorator<ISyncInfoValue> implements ISyncInfoValue
+public class SyncInfoValueDecorator extends ControlDecorator<SyncInfoValue> implements SyncInfoValue
 {
     /** The syncUUIDs cumulative length */
     private int syncUUIDsLength;
-    
+
     /** An instance of this decoder */
     private static final Asn1Decoder decoder = new Asn1Decoder();
 
-    
+
     /**
      * The constructor for this codec. Dont't forget to set the type.
      */
     public SyncInfoValueDecorator( ILdapCodecService codec )
     {
-        super( codec, new SyncInfoValue() );
+        super( codec, new SyncInfoValueImpl() );
     }
 
-    
+
     /**
      * The constructor for this codec. Dont't forget to set the type.
      */
-    public SyncInfoValueDecorator( ILdapCodecService codec, ISyncInfoValue control )
+    public SyncInfoValueDecorator( ILdapCodecService codec, SyncInfoValue control )
     {
         super( codec, control );
     }
-    
-    
+
+
     /**
      * The constructor for this codec.
-     * @param type The kind of syncInfo we will store. Can be newCookie, 
+     * @param type The kind of syncInfo we will store. Can be newCookie,
      * refreshPresent, refreshDelete or syncIdSet
      */
     public SyncInfoValueDecorator( ILdapCodecService codec, SynchronizationInfoEnum type )
@@ -82,8 +83,8 @@ public class SyncInfoValueDecorator exte
 
         setType( type);
     }
-    
-    
+
+
     /** The global length for this control */
     private int syncInfoValueLength;
 
@@ -95,7 +96,7 @@ public class SyncInfoValueDecorator exte
         return getDecorated().getType();
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -110,7 +111,7 @@ public class SyncInfoValueDecorator exte
         }
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -119,7 +120,7 @@ public class SyncInfoValueDecorator exte
         return getDecorated().getCookie();
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -191,8 +192,8 @@ public class SyncInfoValueDecorator exte
     {
         getDecorated().setSyncUUIDs( syncUUIDs );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -201,12 +202,12 @@ public class SyncInfoValueDecorator exte
         getDecorated().addSyncUUID( syncUUID );
     }
 
-    
+
     /**
      * Compute the SyncInfoValue length.
-     * 
+     *
      * SyncInfoValue :
-     * 
+     *
      * 0xA0 L1 abcd                   // newCookie
      * 0xA1 L2                        // refreshDelete
      *   |
@@ -231,11 +232,12 @@ public class SyncInfoValueDecorator exte
     public static final int BIND_REQUEST_SASL_TAG = 0xA3;
 
      */
+    @Override
     public int computeLength()
     {
         // The mode length
         syncInfoValueLength = 0;
-        
+
         switch ( getType() )
         {
             case NEW_COOKIE :
@@ -247,36 +249,36 @@ public class SyncInfoValueDecorator exte
                 {
                     syncInfoValueLength = 1 + 1;
                 }
-                
+
                 valueLength = syncInfoValueLength;
 
                 // Call the super class to compute the global control length
                 return valueLength;
-                
+
             case REFRESH_DELETE :
             case REFRESH_PRESENT :
                 if ( getCookie() != null )
                 {
                     syncInfoValueLength = 1 + TLV.getNbBytes( getCookie().length ) + getCookie().length;
                 }
-                
+
                 // The refreshDone flag, only if not true, as it default to true
                 if ( ! isRefreshDone() )
                 {
                     syncInfoValueLength += 1 + 1 + 1;
                 }
-                
+
                 valueLength = 1 + TLV.getNbBytes( syncInfoValueLength ) + syncInfoValueLength;
-                
+
                 // Call the super class to compute the global control length
                 return valueLength;
-                
+
             case SYNC_ID_SET :
                 if ( getCookie() != null )
                 {
                     syncInfoValueLength = 1 + TLV.getNbBytes( getCookie().length ) + getCookie().length;
                 }
-                
+
                 // The refreshDeletes flag, default to false
                 if ( isRefreshDeletes() )
                 {
@@ -291,32 +293,33 @@ public class SyncInfoValueDecorator exte
                     for ( byte[] syncUUID: getSyncUUIDs() )
                     {
                         int uuidLength = 1 + TLV.getNbBytes( syncUUID.length ) + syncUUID.length;
-                        
+
                         syncUUIDsLength += uuidLength;
                     }
                 }
-                
+
                 syncInfoValueLength += 1 + TLV.getNbBytes( syncUUIDsLength ) + syncUUIDsLength;
                 valueLength = 1 + TLV.getNbBytes( syncInfoValueLength ) + syncInfoValueLength;
 
                 // Call the super class to compute the global control length
                 return valueLength;
-                
+
             default :
-                
+
         }
-        
+
         return 1 + TLV.getNbBytes( syncInfoValueLength ) + syncInfoValueLength;
     }
-    
-    
+
+
     /**
      * Encode the SyncInfoValue control
-     * 
+     *
      * @param buffer The encoded sink
      * @return A ByteBuffer that contains the encoded PDU
      * @throws EncoderException If anything goes wrong.
      */
+    @Override
     public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
     {
         if ( buffer == null )
@@ -343,7 +346,7 @@ public class SyncInfoValueDecorator exte
                 }
 
                 break;
-                
+
             case REFRESH_DELETE :
                 // The second case : refreshDelete
                 buffer.put( (byte)SyncInfoValueTags.REFRESH_DELETE_TAG.getValue() );
@@ -354,15 +357,15 @@ public class SyncInfoValueDecorator exte
                 {
                     Value.encode( buffer, getCookie() );
                 }
-                
+
                 // The refreshDone flag
                 if ( ! isRefreshDone() )
                 {
                     Value.encode( buffer, isRefreshDone() );
                 }
-                
+
                 break;
-                
+
             case REFRESH_PRESENT :
                 // The third case : refreshPresent
                 buffer.put( (byte)SyncInfoValueTags.REFRESH_PRESENT_TAG.getValue() );
@@ -373,7 +376,7 @@ public class SyncInfoValueDecorator exte
                 {
                     Value.encode( buffer, getCookie() );
                 }
-                
+
                 // The refreshDone flag
                 if ( ! isRefreshDone() )
                 {
@@ -381,7 +384,7 @@ public class SyncInfoValueDecorator exte
                 }
 
                 break;
-                
+
             case SYNC_ID_SET :
                 // The last case : syncIdSet
                 buffer.put( (byte)SyncInfoValueTags.SYNC_ID_SET_TAG.getValue() );
@@ -392,17 +395,17 @@ public class SyncInfoValueDecorator exte
                 {
                     Value.encode( buffer, getCookie() );
                 }
-                
+
                 // The refreshDeletes flag if not false
                 if ( isRefreshDeletes() )
                 {
                     Value.encode( buffer, isRefreshDeletes() );
                 }
-                
+
                 // The syncUUIDs
                 buffer.put( UniversalTag.SET.getValue() );
                 buffer.put( TLV.getBytes( syncUUIDsLength ) );
-                
+
                 // Loop on the UUIDs if any
                 if ( getSyncUUIDs().size() != 0 )
                 {
@@ -415,20 +418,21 @@ public class SyncInfoValueDecorator exte
 
         return buffer;
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
+    @Override
     public byte[] getValue()
     {
         if ( value == null )
         {
             try
-            { 
+            {
                 computeLength();
                 ByteBuffer buffer = ByteBuffer.allocate( valueLength );
-                
+
                 switch ( getType() )
                 {
                     case NEW_COOKIE :
@@ -448,7 +452,7 @@ public class SyncInfoValueDecorator exte
                         }
 
                         break;
-                        
+
                     case REFRESH_DELETE :
                         // The second case : refreshDelete
                         buffer.put( (byte)SyncInfoValueTags.REFRESH_DELETE_TAG.getValue() );
@@ -459,15 +463,15 @@ public class SyncInfoValueDecorator exte
                         {
                             Value.encode( buffer, getCookie() );
                         }
-                        
+
                         // The refreshDone flag
                         if ( ! isRefreshDone() )
                         {
                             Value.encode( buffer, isRefreshDone() );
                         }
-                        
+
                         break;
-                        
+
                     case REFRESH_PRESENT :
                         // The third case : refreshPresent
                         buffer.put( (byte)SyncInfoValueTags.REFRESH_PRESENT_TAG.getValue() );
@@ -478,7 +482,7 @@ public class SyncInfoValueDecorator exte
                         {
                             Value.encode( buffer, getCookie() );
                         }
-                        
+
                         // The refreshDone flag
                         if ( ! isRefreshDone() )
                         {
@@ -486,7 +490,7 @@ public class SyncInfoValueDecorator exte
                         }
 
                         break;
-                        
+
                     case SYNC_ID_SET :
                         // The last case : syncIdSet
                         buffer.put( (byte)SyncInfoValueTags.SYNC_ID_SET_TAG.getValue() );
@@ -497,17 +501,17 @@ public class SyncInfoValueDecorator exte
                         {
                             Value.encode( buffer, getCookie() );
                         }
-                        
+
                         // The refreshDeletes flag if not false
                         if ( isRefreshDeletes() )
                         {
                             Value.encode( buffer, isRefreshDeletes() );
                         }
-                        
+
                         // The syncUUIDs
                         buffer.put( UniversalTag.SET.getValue() );
                         buffer.put( TLV.getBytes( syncUUIDsLength ) );
-                        
+
                         // Loop on the UUIDs if any
                         if ( getSyncUUIDs().size() != 0 )
                         {
@@ -517,7 +521,7 @@ public class SyncInfoValueDecorator exte
                             }
                         }
                 }
-                
+
                 value = buffer.array();
             }
             catch ( Exception e )
@@ -525,135 +529,8 @@ public class SyncInfoValueDecorator exte
                 return null;
             }
         }
-        
-        return value;
-    }
 
-    
-    /**
-     * @see Object#equals(Object)
-     */
-    public boolean equals( Object o )
-    {
-        if ( !super.equals( o ) )
-        {
-            return false;
-        }
-
-        SyncInfoValueDecorator otherControl = ( SyncInfoValueDecorator ) o;
-
-        if ( getSyncUUIDs() != null )
-        {
-            if ( otherControl.getSyncUUIDs() == null )
-            {
-                return false;
-            }
-            
-            // @TODO : check the UUIDs
-            for ( @SuppressWarnings("unused") byte[] syncUuid : getSyncUUIDs() )
-            {
-            }
-        }
-        else
-        {
-            if ( otherControl.getSyncUUIDs() != null )
-            {
-                return false;
-            }
-        }
-        
-        return ( isRefreshDeletes() == otherControl.isRefreshDeletes() ) &&
-            ( isRefreshDone() == otherControl.isRefreshDone() ) &&
-            ( getType() == otherControl.getType() ) &&
-            ( Arrays.equals( getCookie(), otherControl.getCookie() ) );
-    }
-
-
-
-    
-    /**
-     * @see Object#toString()
-     */
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        
-        sb.append( "    SyncInfoValue control :\n" );
-        sb.append( "        oid : " ).append( getOid() ).append( '\n' );
-        sb.append( "        critical : " ).append( isCritical() ).append( '\n' );
-
-        switch ( getType() )
-        {
-            case NEW_COOKIE :
-                sb.append( "        newCookie : '" ).
-                    append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
-                break;
-                
-            case REFRESH_DELETE :
-                sb.append( "        refreshDelete : \n" );
-                
-                if ( getCookie() != null )
-                {
-                    sb.append( "            cookie : '" ).
-                        append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
-                }
-                
-                sb.append( "            refreshDone : " ).append(  isRefreshDone() ).append( '\n' );
-                break;
-                
-            case REFRESH_PRESENT :
-                sb.append( "        refreshPresent : \n" );
-                
-                if ( getCookie() != null )
-                {
-                    sb.append( "            cookie : '" ).
-                        append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
-                }
-                
-                sb.append( "            refreshDone : " ).append(  isRefreshDone() ).append( '\n' );
-                break;
-                
-            case SYNC_ID_SET :
-                sb.append( "        syncIdSet : \n" );
-                
-                if ( getCookie() != null )
-                {
-                    sb.append( "            cookie : '" ).
-                        append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
-                }
-                
-                sb.append( "            refreshDeletes : " ).append(  isRefreshDeletes() ).append( '\n' );
-                sb.append(  "            syncUUIDS : " );
-
-                if ( getSyncUUIDs().size() != 0 )
-                {
-                    boolean isFirst = true;
-                    
-                    for ( byte[] syncUUID: getSyncUUIDs() )
-                    {
-                        if ( isFirst )
-                        {
-                            isFirst = false;
-                        }
-                        else
-                        {
-                            sb.append( ", " );
-                        }
-                        
-                        sb.append( Arrays.toString ( syncUUID ) );
-                    }
-                    
-                    sb.append( '\n' );
-                }
-                else
-                {
-                    sb.append(  "empty\n" );
-                }
-                
-                break;
-        }
-        
-        return sb.toString();
+        return value;
     }
 
 

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueFactory.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueFactory.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueFactory.java Thu Feb  3 16:15:05 2011
@@ -29,15 +29,17 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.codec.IControlFactory;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValue;
+import org.apache.directory.shared.ldap.model.message.controls.SyncInfoValueImpl;
 
 
 /**
- * A {@link IControlFactory} which creates {@link ISyncInfoValue} controls.
+ * A {@link IControlFactory} which creates {@link SyncInfoValue} controls.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SyncInfoValueFactory implements IControlFactory<ISyncInfoValue, SyncInfoValueDecorator>
+public class SyncInfoValueFactory implements IControlFactory<SyncInfoValue, SyncInfoValueDecorator>
 {
     
     private ILdapCodecService codec;
@@ -59,7 +61,7 @@ public class SyncInfoValueFactory implem
      */
     public String getOid()
     {
-        return ISyncInfoValue.OID;
+        return SyncInfoValue.OID;
     }
 
     
@@ -73,7 +75,7 @@ public class SyncInfoValueFactory implem
     }
     
 
-    public SyncInfoValueDecorator decorate( ISyncInfoValue control )
+    public SyncInfoValueDecorator decorate( SyncInfoValue control )
     {
         SyncInfoValueDecorator decorator = null;
         
@@ -91,13 +93,13 @@ public class SyncInfoValueFactory implem
     }
 
     
-    public ISyncInfoValue newControl()
+    public SyncInfoValue newControl()
     {
-        return new SyncInfoValue();
+        return new SyncInfoValueImpl();
     }
     
 
-    public Control toJndiControl( ISyncInfoValue control ) throws EncoderException
+    public Control toJndiControl( SyncInfoValue control ) throws EncoderException
     {
         SyncInfoValueDecorator decorator = decorate( control );
         ByteBuffer bb = ByteBuffer.allocate( decorator.computeLength() );
@@ -107,7 +109,7 @@ public class SyncInfoValueFactory implem
     }
 
     
-    public ISyncInfoValue fromJndiControl( Control jndi ) throws DecoderException
+    public SyncInfoValue fromJndiControl( Control jndi ) throws DecoderException
     {
         SyncInfoValueDecorator decorator = newCodecControl();
         decorator.setCritical( jndi.isCritical() );

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/ISyncRequestValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/ISyncRequestValue.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/ISyncRequestValue.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/ISyncRequestValue.java Thu Feb  3 16:15:05 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue;
 
 
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.shared.ldap.model.message.controls.SynchronizationModeEnum;
 
 
 /**

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValue.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValue.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValue.java Thu Feb  3 16:15:05 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue;
 
 
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SynchronizationModeEnum;
 
 
 /**

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueDecorator.java Thu Feb  3 16:15:05 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecorator;
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SynchronizationModeEnum;
 import org.apache.directory.shared.util.Strings;
 
 

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueGrammar.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueGrammar.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueGrammar.java Thu Feb  3 16:15:05 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SynchronizationModeEnum;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/ISyncStateValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/ISyncStateValue.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/ISyncStateValue.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/ISyncStateValue.java Thu Feb  3 16:15:05 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue;
 
 
-import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.shared.ldap.model.message.controls.SyncStateTypeEnum;
 
 
 /**

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java Thu Feb  3 16:15:05 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue;
 
 
-import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.shared.ldap.model.message.controls.SyncStateTypeEnum;
 
 
 /**

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueDecorator.java Thu Feb  3 16:15:05 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecorator;
-import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SyncStateTypeEnum;
 import org.apache.directory.shared.util.Strings;
 
 

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueGrammar.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueGrammar.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueGrammar.java Thu Feb  3 16:15:05 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
+import org.apache.directory.shared.ldap.model.message.controls.SyncStateTypeEnum;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/ISyncModifyDn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/ISyncModifyDn.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/ISyncModifyDn.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/ISyncModifyDn.java Thu Feb  3 16:15:05 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn;
 
 
-import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
 import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.shared.ldap.model.message.controls.SyncModifyDnType;
 
 
 /**

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDn.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDn.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDn.java Thu Feb  3 16:15:05 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn;
 
 
-import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
+import org.apache.directory.shared.ldap.model.message.controls.SyncModifyDnType;
 
 
 /**

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnDecorator.java Thu Feb  3 16:15:05 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
 import org.apache.directory.shared.ldap.codec.controls.ControlDecorator;
-import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
+import org.apache.directory.shared.ldap.model.message.controls.SyncModifyDnType;
 
 
 /**

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnGrammar.java?rev=1066851&r1=1066850&r2=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnGrammar.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnGrammar.java Thu Feb  3 16:15:05 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
-import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
+import org.apache.directory.shared.ldap.model.message.controls.SyncModifyDnType;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValue.java (from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/ISyncInfoValue.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValue.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValue.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/ISyncInfoValue.java&r1=1066814&r2=1066851&rev=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/ISyncInfoValue.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValue.java Thu Feb  3 16:15:05 2011
@@ -17,12 +17,11 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue;
+package org.apache.directory.shared.ldap.model.message.controls;
 
 
 import java.util.List;
 
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
 import org.apache.directory.shared.ldap.model.message.Control;
 
 
@@ -31,7 +30,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface ISyncInfoValue extends Control
+public interface SyncInfoValue extends Control
 {
 
     /** This control OID */

Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValueImpl.java (from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValue.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValueImpl.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValueImpl.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValue.java&r1=1066814&r2=1066851&rev=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValue.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncInfoValueImpl.java Thu Feb  3 16:15:05 2011
@@ -17,40 +17,62 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue;
+package org.apache.directory.shared.ldap.model.message.controls;
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueDecorator;
+import org.apache.directory.shared.util.Strings;
+
 
 
 /**
- * A simple {@link ISyncInfoValue} implementation to store control properties.
+ * A simple {@link SyncInfoValue} implementation to store control properties.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SyncInfoValue implements ISyncInfoValue
+public class SyncInfoValueImpl extends AbstractControl implements SyncInfoValue
 {
     /** The kind of syncInfoValue we are dealing with */
     private SynchronizationInfoEnum type;
-    
+
     /** The cookie */
     private byte[] cookie;
-    
+
     /** The refreshDone flag if we are dealing with refreshXXX syncInfo. Default to true */
     private boolean refreshDone = true;
-    
+
     /** The refreshDeletes flag if we are dealing with syncIdSet syncInfo. Defaults to false */
     private boolean refreshDeletes = false;
-    
+
     /** The list of UUIDs if we are dealing with syncIdSet syncInfo */
     private List<byte[]> syncUUIDs;
-    
-    private boolean isCritical;
-    
+
+
+    /**
+     * Creates a new instance of SyncInfoValueImpl.
+     */
+    public SyncInfoValueImpl()
+    {
+        super( OID );
+    }
+
+
+    /**
+     *
+     * Creates a new instance of SyncInfoValueImpl.
+     *
+     * @param isCritical The critical flag
+     */
+    public SyncInfoValueImpl( boolean isCritical )
+    {
+        super( OID, isCritical );
+    }
+
 
     /**
      * {@inheritDoc}
@@ -151,25 +173,179 @@ public class SyncInfoValue implements IS
         {
             syncUUIDs = new ArrayList<byte[]>();
         }
-        
+
         syncUUIDs.add( syncUUID );
     }
 
 
-    public String getOid()
+    /**
+     * @see Object#hashCode()
+     */
+    @Override
+    public int hashCode()
     {
-        return OID;
+        int h = 37;
+
+        h = h*17 + super.hashCode();
+        h = h*17 + type.getValue();
+        h = h*17 + ( refreshDone ? 1 : 0 );
+        h = h*17 + ( refreshDeletes ? 1 : 0 );
+
+        if ( cookie != null )
+        {
+            for ( byte b : cookie )
+            {
+                h = h*17 + b;
+            }
+        }
+
+        if ( syncUUIDs != null )
+        {
+            for ( byte[] bytes : syncUUIDs )
+            {
+                if ( bytes != null )
+                {
+                    for ( byte b : bytes )
+                    {
+                        h = h*17 + b;
+                    }
+                }
+            }
+        }
+
+        return h;
     }
 
 
-    public boolean isCritical()
+    /**
+     * @see Object#equals(Object)
+     */
+    @Override
+    public boolean equals( Object o )
     {
-        return isCritical;
+        if ( this == o)
+        {
+            return true;
+        }
+
+        if ( !( o instanceof SyncInfoValue ) )
+        {
+            return false;
+        }
+
+
+        SyncInfoValueDecorator otherControl = ( SyncInfoValueDecorator ) o;
+
+        if ( getSyncUUIDs() != null )
+        {
+            if ( otherControl.getSyncUUIDs() == null )
+            {
+                return false;
+            }
+
+            // @TODO : check the UUIDs
+            for ( @SuppressWarnings("unused") byte[] syncUuid : getSyncUUIDs() )
+            {
+            }
+        }
+        else
+        {
+            if ( otherControl.getSyncUUIDs() != null )
+            {
+                return false;
+            }
+        }
+
+        return ( isRefreshDeletes() == otherControl.isRefreshDeletes() ) &&
+            ( isRefreshDone() == otherControl.isRefreshDone() ) &&
+            ( getType() == otherControl.getType() ) &&
+            ( Arrays.equals( getCookie(), otherControl.getCookie() ) );
     }
 
 
-    public void setCritical( boolean isCritical )
+    /**
+     * @see Object#toString()
+     */
+    @Override
+    public String toString()
     {
-        this.isCritical = isCritical;
+        StringBuilder sb = new StringBuilder();
+
+        sb.append( "    SyncInfoValue control :\n" );
+        sb.append( "        oid : " ).append( getOid() ).append( '\n' );
+        sb.append( "        critical : " ).append( isCritical() ).append( '\n' );
+
+        switch ( getType() )
+        {
+            case NEW_COOKIE :
+                sb.append( "        newCookie : '" ).
+                    append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
+                break;
+
+            case REFRESH_DELETE :
+                sb.append( "        refreshDelete : \n" );
+
+                if ( getCookie() != null )
+                {
+                    sb.append( "            cookie : '" ).
+                        append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
+                }
+
+                sb.append( "            refreshDone : " ).append(  isRefreshDone() ).append( '\n' );
+                break;
+
+            case REFRESH_PRESENT :
+                sb.append( "        refreshPresent : \n" );
+
+                if ( getCookie() != null )
+                {
+                    sb.append( "            cookie : '" ).
+                        append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
+                }
+
+                sb.append( "            refreshDone : " ).append(  isRefreshDone() ).append( '\n' );
+                break;
+
+            case SYNC_ID_SET :
+                sb.append( "        syncIdSet : \n" );
+
+                if ( getCookie() != null )
+                {
+                    sb.append( "            cookie : '" ).
+                        append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
+                }
+
+                sb.append( "            refreshDeletes : " ).append(  isRefreshDeletes() ).append( '\n' );
+                sb.append(  "            syncUUIDS : " );
+
+                if ( getSyncUUIDs().size() != 0 )
+                {
+                    boolean isFirst = true;
+
+                    for ( byte[] syncUUID: getSyncUUIDs() )
+                    {
+                        if ( isFirst )
+                        {
+                            isFirst = false;
+                        }
+                        else
+                        {
+                            sb.append( ", " );
+                        }
+
+                        sb.append( Arrays.toString ( syncUUID ) );
+                    }
+
+                    sb.append( '\n' );
+                }
+                else
+                {
+                    sb.append(  "empty\n" );
+                }
+
+                break;
+        }
+
+        return sb.toString();
     }
 }

Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncModifyDnType.java (from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncModifyDnType.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncModifyDnType.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncModifyDnType.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncModifyDnType.java&r1=1066814&r2=1066851&rev=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncModifyDnType.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncModifyDnType.java Thu Feb  3 16:15:05 2011
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.directory.shared.ldap.message.control.replication;
+package org.apache.directory.shared.ldap.model.message.controls;
 
 /**
  * TODO SyncModifyDnControlEnum.

Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncStateTypeEnum.java (from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncStateTypeEnum.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncStateTypeEnum.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java&r1=1066814&r2=1066851&rev=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SyncStateTypeEnum.java Thu Feb  3 16:15:05 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.message.control.replication;
+package org.apache.directory.shared.ldap.model.message.controls;
 
 import org.apache.directory.shared.i18n.I18n;
 

Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationInfoEnum.java (from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SynchronizationInfoEnum.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationInfoEnum.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationInfoEnum.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SynchronizationInfoEnum.java&r1=1066814&r2=1066851&rev=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SynchronizationInfoEnum.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationInfoEnum.java Thu Feb  3 16:15:05 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.message.control.replication;
+package org.apache.directory.shared.ldap.model.message.controls;
 
 /**
  * This class describes the four possible Info values :

Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationModeEnum.java (from r1066814, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SynchronizationModeEnum.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationModeEnum.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationModeEnum.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SynchronizationModeEnum.java&r1=1066814&r2=1066851&rev=1066851&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SynchronizationModeEnum.java (original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/SynchronizationModeEnum.java Thu Feb  3 16:15:05 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.message.control.replication;
+package org.apache.directory.shared.ldap.model.message.controls;
 
 /**
  * This class describes the four possible synchronization mode, out of



Mime
View raw message