directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1067040 - in /directory: apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/ apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/ shared/branches/m1/dsml-p...
Date Fri, 04 Feb 2011 00:00:05 GMT
Author: akarasulu
Date: Fri Feb  4 00:00:05 2011
New Revision: 1067040

URL: http://svn.apache.org/viewvc?rev=1067040&view=rev
Log:
DIRSHARED-81: making decorate() into newControl() overload to be consistent

Modified:
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
    directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.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/ILdapCodecService.java
    directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
    directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1067040&r1=1067039&r2=1067040&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
(original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
Fri Feb  4 00:00:05 2011
@@ -238,7 +238,7 @@ public class PasswordPolicyTest extends 
 
     private PasswordPolicy getPwdRespCtrl( Response resp ) throws Exception
     {
-        ICodecControl<? extends Control> ctrl = codec.decorate( resp.getControls().get(
PP_REQ_CTRL.getOid() ) );
+        ICodecControl<? extends Control> ctrl = codec.newControl( resp.getControls().get(
PP_REQ_CTRL.getOid() ) );
 
         if ( ctrl == null )
         {

Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=1067040&r1=1067039&r2=1067040&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
(original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
Fri Feb  4 00:00:05 2011
@@ -537,7 +537,7 @@ public class PersistentSearchIT extends 
         PSearchListener( PersistentSearch persistentSearch )
         {
             ICodecControl<? extends Control> wrapped = 
-                ldapServer.getDirectoryService().getLdapCodecService().decorate( persistentSearch
);
+                ldapServer.getDirectoryService().getLdapCodecService().newControl( persistentSearch
);
             this.persistentSearch = ( PersistentSearchDecorator ) wrapped;
         }
 

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java?rev=1067040&r1=1067039&r2=1067040&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
Fri Feb  4 00:00:05 2011
@@ -239,7 +239,7 @@ public final class ParserUtils
                 }
                 else
                 {
-                    value = codec.decorate( control ).getValue();
+                    value = codec.newControl( control ).getValue();
                 }
                 
                 if ( value != null )

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1067040&r1=1067039&r2=1067040&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
Fri Feb  4 00:00:05 2011
@@ -1214,7 +1214,7 @@ public final class Dsmlv2ResponseGrammar
                 throw new XmlPullParserException( I18n.err( I18n.ERR_03006 ), xpp, null );
             }
 
-            control = container.getLdapCodecService().decorate( new OpaqueControl( attributeValue
) );
+            control = container.getLdapCodecService().newControl( new OpaqueControl( attributeValue
) );
             parent.addControl( control );
         }
         else

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1067040&r1=1067039&r2=1067040&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
Fri Feb  4 00:00:05 2011
@@ -2747,7 +2747,7 @@ public final class Dsmlv2Grammar extends
                     throw new XmlPullParserException( I18n.err( I18n.ERR_03034 ), xpp, null
);
                 }
 
-                control = codec.decorate( codec.newControl( attributeValue ) );
+                control = codec.newControl( codec.newControl( attributeValue ) );
                 container.getBatchRequest().getCurrentRequest().addControl( control );
             }
             else

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=1067040&r1=1067039&r2=1067040&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
Fri Feb  4 00:00:05 2011
@@ -20,7 +20,6 @@
 package org.apache.directory.shared.ldap.codec;
 
 
-import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -47,7 +46,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory;
 import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.controls.AbstractControl;
 import org.apache.directory.shared.ldap.model.message.controls.Cascade;
 import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
@@ -158,7 +156,7 @@ public class DefaultLdapCodecService imp
     /**
      * {@inheritDoc}
      */
-    public Iterator<String> extendedResponseOids()
+    public Iterator<String> registeredExtendedResponses()
     {
         return extResFactories.keySet().iterator();
     }
@@ -191,7 +189,7 @@ public class DefaultLdapCodecService imp
             
             if ( factory == null )
             {
-                return new BasicControlDecorator( this, new OpaqueControl( oid ) );
+                return new BasicControlDecorator<Control>( this, new OpaqueControl(
oid ) );
             }
             
             return factory.newCodecControl();
@@ -205,7 +203,7 @@ public class DefaultLdapCodecService imp
     }
 
 
-    public ICodecControl<? extends Control> decorate( Control control )
+    public ICodecControl<? extends Control> newControl( Control control )
     {
         try
         {
@@ -213,7 +211,7 @@ public class DefaultLdapCodecService imp
             
             if ( factory == null )
             {
-                return new BasicControlDecorator( this, control ); 
+                return new BasicControlDecorator<Control>( this, control ); 
             }
             
             return factory.newCodecControl( control );
@@ -229,7 +227,7 @@ public class DefaultLdapCodecService imp
 
     public javax.naming.ldap.Control toJndiControl( Control control ) throws EncoderException
     {
-        ICodecControl<? extends Control> decorator = decorate( control );
+        ICodecControl<? extends Control> decorator = newControl( control );
         ByteBuffer bb = ByteBuffer.allocate( decorator.computeLength() );
         decorator.encode( bb );
         bb.flip();
@@ -247,7 +245,8 @@ public class DefaultLdapCodecService imp
         {
             OpaqueControl ourControl = new OpaqueControl( control.getID() );
             ourControl.setCritical( control.isCritical() );
-            BasicControlDecorator decorator = new BasicControlDecorator( this, ourControl
);
+            BasicControlDecorator<Control> decorator = 
+                new BasicControlDecorator<Control>( this, ourControl );
             decorator.setValue( control.getEncodedValue() );
             return decorator;
         }

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ILdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ILdapCodecService.java?rev=1067040&r1=1067039&r2=1067040&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ILdapCodecService.java
(original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ILdapCodecService.java
Fri Feb  4 00:00:05 2011
@@ -59,7 +59,7 @@ public interface ILdapCodecService
      *
      * @return The registered extended response OID Strings
      */
-    Iterator<String> extendedResponseOids();
+    Iterator<String> registeredExtendedResponses();
     
     
     /**
@@ -82,7 +82,7 @@ public interface ILdapCodecService
     ICodecControl<? extends Control> newControl( String oid );
     
 
-    ICodecControl<? extends Control> decorate( Control control );
+    ICodecControl<? extends Control> newControl( Control control );
     
     
     /**

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java?rev=1067040&r1=1067039&r2=1067040&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
(original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
Fri Feb  4 00:00:05 2011
@@ -309,7 +309,7 @@ public abstract class MessageDecorator<E
         }
         else
         {
-            controlDecorator = codec.decorate( control );
+            controlDecorator = codec.newControl( control );
             decorated = control;
         }
         

Modified: directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java?rev=1067040&r1=1067039&r2=1067040&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
(original)
+++ directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
Fri Feb  4 00:00:05 2011
@@ -376,7 +376,7 @@ public class CursorStudioNamingEnumerati
                 }
                 else
                 {
-                    wrapped = codec.decorate( control );
+                    wrapped = codec.newControl( control );
                 }
 
                 if ( PagedResultsResponseControl.OID.equals( control.getOid() ) )



Mime
View raw message