directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1066956 - 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 20:48:29 GMT
Author: akarasulu
Date: Thu Feb  3 20:48:29 2011
New Revision: 1066956

URL: http://svn.apache.org/viewvc?rev=1066956&view=rev
Log:
DIRSHARED-81: applying class/interface naming conventions to sync state value control

Added:
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java
      - copied, changed from r1066952, 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/SyncStateValueImpl.java
      - copied, changed from r1066952, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java
Removed:
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/ISyncStateValue.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/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/syncStateValue/SyncStateValueDecorator.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueFactory.java
    directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.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=1066956&r1=1066955&r2=1066956&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 20:48:29 2011
@@ -80,7 +80,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueDecorator;
 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.ISyncStateValue;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValue;
 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.codec.controls.search.entryChange.EntryChangeDecorator;
@@ -188,7 +188,7 @@ public abstract class ServerContext impl
         ADS_CONTROLS.put( SyncInfoValue.OID, ControlEnum.SYNC_INFO_VALUE_CONTROL );
         ADS_CONTROLS.put( SyncModifyDn.OID, ControlEnum.SYNC_MODIFY_DN_CONTROL );
         ADS_CONTROLS.put( SyncRequestValue.OID, ControlEnum.SYNC_REQUEST_VALUE_CONTROL );
-        ADS_CONTROLS.put( ISyncStateValue.OID, ControlEnum.SYNC_STATE_VALUE_CONTROL );
+        ADS_CONTROLS.put( SyncStateValue.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=1066956&r1=1066955&r2=1066956&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 20:48:29 2011
@@ -59,7 +59,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.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.syncStateValue.ISyncStateValue;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
@@ -179,7 +179,7 @@ public class DefaultPartitionNexus exten
             Cascade.OID, PagedResults.OID,
             // Replication controls
             SyncDoneValue.OID, SyncInfoValue.OID, SyncRequestValue.OID,
-            ISyncStateValue.OID );
+            SyncStateValue.OID );
 
         // Add the objectClasses
         rootDSE.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.EXTENSIBLE_OBJECT_OC
);

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=1066956&r1=1066955&r2=1066956&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 20:48:29 2011
@@ -60,7 +60,7 @@ import org.apache.directory.server.proto
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 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.syncStateValue.ISyncStateValue;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
@@ -247,7 +247,7 @@ public class LdapServer extends Director
         this.supportedControls.add( SyncDoneValue.OID );
         this.supportedControls.add( SyncInfoValue.OID );
         this.supportedControls.add( SyncRequestValue.OID );
-        this.supportedControls.add( ISyncStateValue.OID );
+        this.supportedControls.add( SyncStateValue.OID );
     }
 
 

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=1066956&r1=1066955&r2=1066956&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 20:48:29 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueFactory;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueFactory;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueFactory;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.ISyncStateValue;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueFactory;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnFactory;
 import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory;
@@ -113,7 +113,7 @@ public class DefaultLdapCodecService imp
         controlFactories.put( SyncRequestValue.OID, syncRequestValueFactory );
 
         SyncStateValueFactory syncStateValueFactory = new SyncStateValueFactory( this );
-        controlFactories.put( ISyncStateValue.OID, syncStateValueFactory );
+        controlFactories.put( SyncStateValue.OID, syncStateValueFactory );
         
         PasswordPolicyFactory passwordPolicyFactory = new PasswordPolicyFactory( this );
         controlFactories.put( PasswordPolicyImpl.OID, passwordPolicyFactory );

Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java
(from r1066952, 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/SyncStateValue.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/ISyncStateValue.java&r1=1066952&r2=1066956&rev=1066956&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/SyncStateValue.java
Thu Feb  3 20:48:29 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface ISyncStateValue extends Control
+public interface SyncStateValue extends Control
 {
     /** This control OID */
     public static final String OID = "1.3.6.1.4.1.4203.1.9.1.2";

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=1066956&r1=1066955&r2=1066956&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 20:48:29 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.util.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncStateValueDecorator extends ControlDecorator<ISyncStateValue> implements
ISyncStateValue
+public class SyncStateValueDecorator extends ControlDecorator<SyncStateValue> implements
SyncStateValue
 {
     /** Global length for the control */
     private int syncStateSeqLength;
@@ -53,11 +53,11 @@ public class SyncStateValueDecorator ext
     
     public SyncStateValueDecorator( ILdapCodecService codec )
     {
-        super( codec, new SyncStateValue() );
+        super( codec, new SyncStateValueImpl() );
     }
 
     
-    public SyncStateValueDecorator( ILdapCodecService codec, ISyncStateValue value )
+    public SyncStateValueDecorator( ILdapCodecService codec, SyncStateValue value )
     {
         super( codec, value );
     }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueFactory.java?rev=1066956&r1=1066955&r2=1066956&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueFactory.java
(original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueFactory.java
Thu Feb  3 20:48:29 2011
@@ -32,12 +32,12 @@ import org.apache.directory.shared.ldap.
 
 
 /**
- * A {@link IControlFactory} which creates {@link ISyncStateValue} controls.
+ * A {@link IControlFactory} which creates {@link SyncStateValue} controls.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SyncStateValueFactory implements IControlFactory<ISyncStateValue, SyncStateValueDecorator>
+public class SyncStateValueFactory implements IControlFactory<SyncStateValue, SyncStateValueDecorator>
 {
     private ILdapCodecService codec;
     
@@ -58,7 +58,7 @@ public class SyncStateValueFactory imple
      */
     public String getOid()
     {
-        return ISyncStateValue.OID;
+        return SyncStateValue.OID;
     }
 
     
@@ -72,7 +72,7 @@ public class SyncStateValueFactory imple
     }
     
 
-    public SyncStateValueDecorator decorate( ISyncStateValue control )
+    public SyncStateValueDecorator decorate( SyncStateValue control )
     {
         SyncStateValueDecorator decorator = null;
         
@@ -90,13 +90,13 @@ public class SyncStateValueFactory imple
     }
 
     
-    public ISyncStateValue newControl()
+    public SyncStateValue newControl()
     {
-        return new SyncStateValue();
+        return new SyncStateValueImpl();
     }
     
 
-    public Control toJndiControl( ISyncStateValue control ) throws EncoderException
+    public Control toJndiControl( SyncStateValue control ) throws EncoderException
     {
         SyncStateValueDecorator decorator = decorate( control );
         ByteBuffer bb = ByteBuffer.allocate( decorator.computeLength() );
@@ -106,7 +106,7 @@ public class SyncStateValueFactory imple
     }
 
     
-    public ISyncStateValue fromJndiControl( Control jndi ) throws DecoderException
+    public SyncStateValue fromJndiControl( Control jndi ) throws DecoderException
     {
         SyncStateValueDecorator decorator = newCodecControl();
         decorator.setCritical( jndi.isCritical() );

Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueImpl.java
(from r1066952, 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/SyncStateValueImpl.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueImpl.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValue.java&r1=1066952&r2=1066956&rev=1066956&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/SyncStateValueImpl.java
Thu Feb  3 20:48:29 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SyncStateValue implements ISyncStateValue
+public class SyncStateValueImpl implements SyncStateValue
 {
     /** The syncStateEnum type */
     private SyncStateTypeEnum type;

Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java?rev=1066956&r1=1066955&r2=1066956&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java
(original)
+++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java
Thu Feb  3 20:48:29 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.ISyncStateValue;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValue;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueDecorator;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
 import org.apache.directory.shared.util.Strings;
@@ -71,7 +71,7 @@ public class SyncStateValueControlTest
 
         SyncStateValueDecorator decorator = new SyncStateValueDecorator( codec );
 
-        ISyncStateValue syncStateValue = (ISyncStateValue)decorator.decode( bb.array() );
+        SyncStateValue syncStateValue = (SyncStateValue)decorator.decode( bb.array() );
 
         assertEquals( SyncStateTypeEnum.PRESENT, syncStateValue.getSyncStateType() );
         assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
@@ -108,7 +108,7 @@ public class SyncStateValueControlTest
 
         SyncStateValueDecorator decorator = new SyncStateValueDecorator( codec );
 
-        ISyncStateValue syncStateValue = (ISyncStateValue)decorator.decode( bb.array() );
+        SyncStateValue syncStateValue = (SyncStateValue)decorator.decode( bb.array() );
 
         assertEquals( SyncStateTypeEnum.ADD, syncStateValue.getSyncStateType() );
         assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
@@ -146,7 +146,7 @@ public class SyncStateValueControlTest
 
         SyncStateValueDecorator decorator = new SyncStateValueDecorator( codec );
 
-        ISyncStateValue syncStateValue = (ISyncStateValue)decorator.decode( bb.array() );
+        SyncStateValue syncStateValue = (SyncStateValue)decorator.decode( bb.array() );
 
         assertEquals( SyncStateTypeEnum.MODIFY, syncStateValue.getSyncStateType() );
         assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
@@ -257,7 +257,7 @@ public class SyncStateValueControlTest
 
         SyncStateValueDecorator decorator = new SyncStateValueDecorator( codec );
 
-        ISyncStateValue syncStateValue = (ISyncStateValue)decorator.decode( bb.array() );
+        SyncStateValue syncStateValue = (SyncStateValue)decorator.decode( bb.array() );
 
         assertEquals( SyncStateTypeEnum.MODDN, syncStateValue.getSyncStateType() );
         assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );



Mime
View raw message