directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r602753 [2/2] - in /directory: apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/ apacheds/b...
Date Sun, 09 Dec 2007 23:39:25 GMT
Modified: directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/storedprocedurecmd/StoredProcedureCommandExecutor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/storedprocedurecmd/StoredProcedureCommandExecutor.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/storedprocedurecmd/StoredProcedureCommandExecutor.java
(original)
+++ directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/storedprocedurecmd/StoredProcedureCommandExecutor.java
Sun Dec  9 15:39:07 2007
@@ -20,6 +20,7 @@
 package org.apache.directory.server.tools.commands.storedprocedurecmd;
 
 import org.apache.directory.server.configuration.ApacheDS;
+import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.tools.ToolCommandListener;
 import org.apache.directory.server.tools.execution.BaseToolCommandExecutor;
 import org.apache.directory.server.tools.util.ListenerParameter;
@@ -105,7 +106,7 @@
         Hashtable<String, Object> env = new Hashtable<String, Object>();
         env.put( JndiPropertyConstants.JNDI_FACTORY_INITIAL, "com.sun.jndi.ldap.LdapCtxFactory"
);
         env.put( JndiPropertyConstants.JNDI_PROVIDER_URL, "ldap://" + host + ":" + port );
-        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+        env.put( "java.naming.security.principal", ServerDNConstants.ADMIN_SYSTEM_DN );
         env.put( JndiPropertyConstants.JNDI_SECURITY_CREDENTIALS, password );
         env.put( JndiPropertyConstants.JNDI_SECURITY_AUTHENTICATION, "simple" );
 

Modified: directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
(original)
+++ directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
Sun Dec  9 15:39:07 2007
@@ -23,12 +23,12 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 import org.apache.commons.io.FileUtils;
+import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.jndi.CoreContextFactory;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.protocol.shared.SocketAcceptor;
-import org.apache.directory.shared.ldap.constants.ServerDNConstants;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
@@ -170,7 +170,7 @@
      */
     protected LdapContext getWiredContext() throws NamingException
     {
-        return getWiredContext( "uid=admin,ou=system", "secret" );
+        return getWiredContext( ServerDNConstants.ADMIN_SYSTEM_DN, "secret" );
     }
     
     

Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java
(original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ChangeListener.java
Sun Dec  9 15:39:07 2007
@@ -29,7 +29,7 @@
 import javax.naming.ldap.HasControls;
 import javax.naming.ldap.InitialLdapContext;
 
-import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl;
+import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec;
 import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlDecoder;
 import org.apache.directory.shared.ldap.message.PersistentSearchControl;
 
@@ -65,7 +65,7 @@
         {
             Control[] respCtls;
             ctx.setRequestControls( ctxCtls );
-            EntryChangeControl ecCtl = null;
+            EntryChangeControlCodec ecCtl = null;
             NamingEnumeration list = ctx.search( "", "objectClass=*", null );
             while ( list.hasMore() )
             {
@@ -81,7 +81,7 @@
                                 org.apache.directory.shared.ldap.message.EntryChangeControl.CONTROL_OID
) )
                             {
                                 EntryChangeControlDecoder decoder = new EntryChangeControlDecoder();
-                                ecCtl = ( EntryChangeControl ) decoder.decode( respCtls[ii].getEncodedValue()
);
+                                ecCtl = ( EntryChangeControlCodec ) decoder.decode( respCtls[ii].getEncodedValue()
);
                             }
                         }
                     }

Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
(original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
Sun Dec  9 15:39:07 2007
@@ -43,7 +43,7 @@
 
 import org.apache.directory.server.unit.AbstractServerTest;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
-import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl;
+import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec;
 import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlDecoder;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -691,7 +691,7 @@
                 ctx.setRequestControls( ctxCtls );
                 isReady = true;
                 list = ctx.search( "", "objectClass=*", null );
-                EntryChangeControl ecControl = null;
+                EntryChangeControlCodec ecControl = null;
 
                 while ( list.hasMore() )
                 {
@@ -709,7 +709,7 @@
                                     org.apache.directory.shared.ldap.message.EntryChangeControl.CONTROL_OID
) )
                                 {
                                     EntryChangeControlDecoder decoder = new EntryChangeControlDecoder();
-                                    ecControl = ( EntryChangeControl ) decoder.decode( controls[ii].getEncodedValue()
);
+                                    ecControl = ( EntryChangeControlCodec ) decoder.decode(
controls[ii].getEncodedValue() );
                                 }
                             }
                         }
@@ -742,10 +742,10 @@
     class PSearchNotification extends SearchResult
     {
         private static final long serialVersionUID = 1L;
-        final EntryChangeControl control;
+        final EntryChangeControlCodec control;
 
 
-        public PSearchNotification(SearchResult result, EntryChangeControl control)
+        public PSearchNotification(SearchResult result, EntryChangeControlCodec control)
         {
             super( result.getName(), result.getClassName(), result.getObject(), result.getAttributes(),
result
                 .isRelative() );

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
Sun Dec  9 15:39:07 2007
@@ -61,8 +61,8 @@
 import org.apache.directory.shared.ldap.codec.search.SearchResultEntry;
 import org.apache.directory.shared.ldap.codec.search.SearchResultReference;
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
-import org.apache.directory.shared.ldap.codec.search.controls.PSearchControl;
-import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControl;
+import org.apache.directory.shared.ldap.codec.search.controls.PSearchControlCodec;
+import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControlCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURL;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.filter.AndNode;
@@ -731,25 +731,25 @@
                 final org.apache.directory.shared.ldap.codec.Control twixControl = controls.next();
 
                 if ( twixControl.getControlValue() instanceof 
-                    org.apache.directory.shared.ldap.codec.controls.CascadeControl )
+                    org.apache.directory.shared.ldap.codec.controls.CascadeControlCodec )
                 {
                     neutralControl = new CascadeControl();
                     neutralControl.setCritical( twixControl.getCriticality() );
                 }
-                else if ( twixControl.getControlValue() instanceof PSearchControl )
+                else if ( twixControl.getControlValue() instanceof PSearchControlCodec )
                 {
                     PersistentSearchControl neutralPsearch = new PersistentSearchControl();
                     neutralControl = neutralPsearch;
-                    PSearchControl twixPsearch = ( PSearchControl ) twixControl.getControlValue();
+                    PSearchControlCodec twixPsearch = ( PSearchControlCodec ) twixControl.getControlValue();
                     neutralPsearch.setChangeTypes( twixPsearch.getChangeTypes() );
                     neutralPsearch.setChangesOnly( twixPsearch.isChangesOnly() );
                     neutralPsearch.setReturnECs( twixPsearch.isReturnECs() );
                     neutralPsearch.setCritical( twixControl.getCriticality() );
                 }
-                else if ( twixControl.getControlValue() instanceof SubEntryControl )
+                else if ( twixControl.getControlValue() instanceof SubEntryControlCodec )
                 {
                     SubentriesControl neutralSubentriesControl = new SubentriesControl();
-                    SubEntryControl twixSubentriesControl = ( SubEntryControl ) twixControl.getControlValue();
+                    SubEntryControlCodec twixSubentriesControl = ( SubEntryControlCodec )
twixControl.getControlValue();
                     neutralControl = neutralSubentriesControl;
                     neutralSubentriesControl.setVisibility( twixSubentriesControl.isVisible()
);
                     neutralSubentriesControl.setCritical( twixControl.getCriticality() );

Copied: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java
(from r602656, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java?p2=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java&p1=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControl.java&r1=602656&r2=602753&rev=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlCodec.java
Sun Dec  9 15:39:07 2007
@@ -31,7 +31,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class CascadeControl extends AbstractAsn1Object
+public class CascadeControlCodec extends AbstractAsn1Object
 {
     private static final ByteBuffer EMPTY_BUFFER = ByteBuffer.allocate( 0 );
 
@@ -39,7 +39,7 @@
      * Default constructor
      *
      */
-    public CascadeControl()
+    public CascadeControlCodec()
     {
         super();
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java
Sun Dec  9 15:39:07 2007
@@ -40,6 +40,6 @@
 
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
-        return new org.apache.directory.shared.ldap.codec.controls.CascadeControl();
+        return new org.apache.directory.shared.ldap.codec.controls.CascadeControlCodec();
     }
 }

Copied: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java
(from r602656, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java?p2=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java&p1=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControl.java&r1=602656&r2=602753&rev=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlCodec.java
Sun Dec  9 15:39:07 2007
@@ -64,7 +64,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ManageDsaITControl extends AbstractAsn1Object
+public class ManageDsaITControlCodec extends AbstractAsn1Object
 {
     private static final ByteBuffer EMPTY_BUFFER = ByteBuffer.allocate( 0 );
 
@@ -72,7 +72,7 @@
      * Default constructor
      *
      */
-    public ManageDsaITControl()
+    public ManageDsaITControlCodec()
     {
         super();
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java
Sun Dec  9 15:39:07 2007
@@ -41,6 +41,6 @@
 
     public Asn1Object decode( byte[] controlBytes ) throws DecoderException
     {
-        return new org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl();
+        return new org.apache.directory.shared.ldap.codec.controls.ManageDsaITControlCodec();
     }
 }

Copied: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java
(from r602656, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java?p2=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java&p1=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java&r1=602656&r2=602753&rev=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java
Sun Dec  9 15:39:07 2007
@@ -78,7 +78,7 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class EntryChangeControl extends AbstractAsn1Object
+public class EntryChangeControlCodec extends AbstractAsn1Object
 {
     public static final int UNDEFINED_CHANGE_NUMBER = -1;
 
@@ -99,7 +99,7 @@
     /**
      * @see Asn1Object#Asn1Object
      */
-    public EntryChangeControl()
+    public EntryChangeControlCodec()
     {
         super();
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java
Sun Dec  9 15:39:07 2007
@@ -30,7 +30,7 @@
 public class EntryChangeControlContainer extends AbstractContainer implements IAsn1Container
 {
     /** EntryChangeControl */
-    private EntryChangeControl control;
+    private EntryChangeControlCodec control;
 
 
     /**
@@ -49,7 +49,7 @@
     /**
      * @return Returns the EntryChangeControl.
      */
-    public EntryChangeControl getEntryChangeControl()
+    public EntryChangeControlCodec getEntryChangeControl()
     {
         return control;
     }
@@ -61,7 +61,7 @@
      * 
      * @param control the EntryChangeControl to set.
      */
-    public void setEntryChangeControl( EntryChangeControl control )
+    public void setEntryChangeControl( EntryChangeControlCodec control )
     {
         this.control = control;
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java
Sun Dec  9 15:39:07 2007
@@ -83,7 +83,7 @@
                 public void action( IAsn1Container container )
                 {
                     EntryChangeControlContainer entryChangeContainer = ( EntryChangeControlContainer
) container;
-                    EntryChangeControl control = new EntryChangeControl();
+                    EntryChangeControlCodec control = new EntryChangeControlCodec();
                     entryChangeContainer.setEntryChangeControl( control );
                 }
             } );

Copied: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java
(from r602656, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java?p2=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java&p1=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControl.java&r1=602656&r2=602753&rev=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java
Sun Dec  9 15:39:07 2007
@@ -34,7 +34,7 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class PSearchControl extends AbstractAsn1Object
+public class PSearchControlCodec extends AbstractAsn1Object
 {
     /**
      * If changesOnly is TRUE, the server MUST NOT return any existing entries
@@ -78,7 +78,7 @@
      * Default constructor
      *
      */
-    public PSearchControl()
+    public PSearchControlCodec()
     {
         super();
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java
Sun Dec  9 15:39:07 2007
@@ -30,7 +30,7 @@
 public class PSearchControlContainer extends AbstractContainer implements IAsn1Container
 {
     /** PSearchControl */
-    private PSearchControl control;
+    private PSearchControlCodec control;
 
 
     /**
@@ -49,7 +49,7 @@
     /**
      * @return Returns the persistent search control.
      */
-    public PSearchControl getPSearchControl()
+    public PSearchControlCodec getPSearchControl()
     {
 
         return control;
@@ -62,7 +62,7 @@
      * 
      * @param control the PSearchControl to set.
      */
-    public void setPSearchControl( PSearchControl control )
+    public void setPSearchControl( PSearchControlCodec control )
     {
         this.control = control;
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java
Sun Dec  9 15:39:07 2007
@@ -96,7 +96,7 @@
                 public void action( IAsn1Container container )
                 {
                     PSearchControlContainer psearchContainer = ( PSearchControlContainer
) container;
-                    PSearchControl control = new PSearchControl();
+                    PSearchControlCodec control = new PSearchControlCodec();
                     psearchContainer.setPSearchControl( control );
                 }
             } );
@@ -122,7 +122,7 @@
                     try
                     {
                         // Check that the value is into the allowed interval
-                        int changeTypes = IntegerDecoder.parse( value, PSearchControl.CHANGE_TYPES_MIN,
PSearchControl.CHANGE_TYPES_MAX );
+                        int changeTypes = IntegerDecoder.parse( value, PSearchControlCodec.CHANGE_TYPES_MIN,
PSearchControlCodec.CHANGE_TYPES_MAX );
                         
                         if ( IS_DEBUG )
                         {

Copied: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlCodec.java
(from r602656, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlCodec.java?p2=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlCodec.java&p1=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControl.java&r1=602656&r2=602753&rev=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlCodec.java
Sun Dec  9 15:39:07 2007
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubEntryControl extends AbstractAsn1Object
+public class SubEntryControlCodec extends AbstractAsn1Object
 {
     private boolean visibility = false;
 
@@ -41,7 +41,7 @@
      * Default constructor
      *
      */
-    public SubEntryControl()
+    public SubEntryControlCodec()
     {
         super();
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java
Sun Dec  9 15:39:07 2007
@@ -30,7 +30,7 @@
 public class SubEntryControlContainer extends AbstractContainer implements IAsn1Container
 {
     /** PSearchControl */
-    private SubEntryControl control;
+    private SubEntryControlCodec control;
 
 
     /**
@@ -48,7 +48,7 @@
     /**
      * @return Returns the persistent search control.
      */
-    public SubEntryControl getSubEntryControl()
+    public SubEntryControlCodec getSubEntryControl()
     {
         return control;
     }
@@ -60,7 +60,7 @@
      * 
      * @param control the SubEntryControl to set.
      */
-    public void setSubEntryControl( SubEntryControl control )
+    public void setSubEntryControl( SubEntryControlCodec control )
     {
         this.control = control;
     }

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java
Sun Dec  9 15:39:07 2007
@@ -69,7 +69,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     SubEntryControlContainer subEntryContainer = ( SubEntryControlContainer
) container;
-                    SubEntryControl control = new SubEntryControl();
+                    SubEntryControlCodec control = new SubEntryControlCodec();
                     subEntryContainer.setSubEntryControl( control );
 
                     TLV tlv = subEntryContainer.getCurrentTLV();

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/EntryChangeControl.java
Sun Dec  9 15:39:07 2007
@@ -82,7 +82,7 @@
 
     public static final String CONTROL_OID = "2.16.840.1.113730.3.4.7";
 
-    public static final int UNDEFINED_CHANGE_NUMBER = org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl.UNDEFINED_CHANGE_NUMBER;
+    public static final int UNDEFINED_CHANGE_NUMBER = org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec.UNDEFINED_CHANGE_NUMBER;
 
     private ChangeType changeType = ChangeType.ADD;
 
@@ -137,7 +137,7 @@
     public byte[] getEncodedValue() 
     {
         // should call this codec or something
-        org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl ecc = new
org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl();
+        org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec ecc
= new org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec();
         ecc.setChangeNumber( changeNumber );
         ecc.setChangeType( changeType );
         ecc.setPreviousDn( previousDn );

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/PersistentSearchControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/PersistentSearchControl.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/PersistentSearchControl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/PersistentSearchControl.java
Sun Dec  9 15:39:07 2007
@@ -22,7 +22,7 @@
 
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
-import org.apache.directory.shared.ldap.codec.search.controls.PSearchControl;
+import org.apache.directory.shared.ldap.codec.search.controls.PSearchControlCodec;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -126,7 +126,7 @@
 
     public byte[] getEncodedValue()
     {
-        PSearchControl psearchCtl = new PSearchControl();
+        PSearchControlCodec psearchCtl = new PSearchControlCodec();
         psearchCtl.setChangesOnly( isChangesOnly() );
         psearchCtl.setChangeTypes( getChangeTypes() );
         psearchCtl.setReturnECs( isReturnECs() );

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SubentriesControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SubentriesControl.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SubentriesControl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SubentriesControl.java
Sun Dec  9 15:39:07 2007
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControl;
+import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControlCodec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -100,7 +100,7 @@
 
     public byte[] getEncodedValue()
     {
-        SubEntryControl ctl = new SubEntryControl();
+        SubEntryControlCodec ctl = new SubEntryControlCodec();
         ctl.setVisibility( isVisible() );
 
         try

Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
Sun Dec  9 15:39:07 2007
@@ -45,7 +45,7 @@
 import org.apache.directory.shared.ldap.codec.search.OrFilter;
 import org.apache.directory.shared.ldap.codec.search.PresentFilter;
 import org.apache.directory.shared.ldap.codec.search.SearchRequest;
-import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControl;
+import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControlCodec;
 import org.apache.directory.shared.ldap.message.Message;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.ScopeEnum;
@@ -1322,7 +1322,7 @@
         Control subEntryControl = message.getControls( 0 );
         assertEquals( subEntryControlOID, subEntryControl.getControlType() );
         assertTrue( subEntryControl.getCriticality() );
-        assertTrue( ( ( SubEntryControl ) subEntryControl.getControlValue() ).isVisible()
);
+        assertTrue( ( ( SubEntryControlCodec ) subEntryControl.getControlValue() ).isVisible()
);
 
         SearchRequest sr = message.getSearchRequest();
         assertEquals( "dc=my-domain,dc=com", sr.getBaseObject().toString() );

Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
Sun Dec  9 15:39:07 2007
@@ -25,7 +25,7 @@
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
-import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControl;
+import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlCodec;
 import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.EntryChangeControlDecoder;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -71,7 +71,7 @@
             Assert.fail( de.getMessage() );
         }
 
-        EntryChangeControl entryChange = container.getEntryChangeControl();
+        EntryChangeControlCodec entryChange = container.getEntryChangeControl();
         assertEquals( ChangeType.MODDN, entryChange.getChangeType() );
         assertEquals( "a=b", entryChange.getPreviousDn().toString() );
         assertEquals( 16, entryChange.getChangeNumber() );
@@ -107,7 +107,7 @@
             Assert.fail( de.getMessage() );
         }
 
-        EntryChangeControl entryChange = container.getEntryChangeControl();
+        EntryChangeControlCodec entryChange = container.getEntryChangeControl();
         assertEquals( ChangeType.ADD, entryChange.getChangeType() );
         assertNull( entryChange.getPreviousDn() );
         assertEquals( 16, entryChange.getChangeNumber() );
@@ -181,10 +181,10 @@
             Assert.fail( de.getMessage() );
         }
 
-        EntryChangeControl entryChange = container.getEntryChangeControl();
+        EntryChangeControlCodec entryChange = container.getEntryChangeControl();
         assertEquals( ChangeType.ADD, entryChange.getChangeType() );
         assertNull( entryChange.getPreviousDn() );
-        assertEquals( EntryChangeControl.UNDEFINED_CHANGE_NUMBER, entryChange.getChangeNumber()
);
+        assertEquals( EntryChangeControlCodec.UNDEFINED_CHANGE_NUMBER, entryChange.getChangeNumber()
);
     }
 
 
@@ -242,7 +242,7 @@
         String expected = StringTools.dumpBytes( bb.array() );
         bb.flip();
 
-        EntryChangeControl entry = new EntryChangeControl();
+        EntryChangeControlCodec entry = new EntryChangeControlCodec();
         entry.setChangeType( ChangeType.MODDN );
         entry.setChangeNumber( 16 );
         entry.setPreviousDn( new LdapDN( "a=b" ) );

Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
Sun Dec  9 15:39:07 2007
@@ -24,7 +24,7 @@
 
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.search.controls.PSearchControl;
+import org.apache.directory.shared.ldap.codec.search.controls.PSearchControlCodec;
 import org.apache.directory.shared.ldap.codec.search.controls.PSearchControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.PSearchControlDecoder;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -57,7 +57,7 @@
         String expected = StringTools.dumpBytes( bb.array() );
         bb.flip();
 
-        PSearchControl ctrl = new PSearchControl();
+        PSearchControlCodec ctrl = new PSearchControlCodec();
         ctrl.setChangesOnly( false );
         ctrl.setReturnECs( false );
         ctrl.setChangeTypes( 1 );
@@ -92,10 +92,10 @@
             Assert.fail( de.getMessage() );
         }
 
-        PSearchControl control = container.getPSearchControl();
+        PSearchControlCodec control = container.getPSearchControl();
         int changeTypes = control.getChangeTypes();
-        assertEquals( PSearchControl.CHANGE_TYPE_ADD, changeTypes & PSearchControl.CHANGE_TYPE_ADD
);
-        assertEquals( PSearchControl.CHANGE_TYPE_MODDN, changeTypes & PSearchControl.CHANGE_TYPE_MODDN
);
+        assertEquals( PSearchControlCodec.CHANGE_TYPE_ADD, changeTypes & PSearchControlCodec.CHANGE_TYPE_ADD
);
+        assertEquals( PSearchControlCodec.CHANGE_TYPE_MODDN, changeTypes & PSearchControlCodec.CHANGE_TYPE_MODDN
);
         assertEquals( false, control.isChangesOnly() );
         assertEquals( false, control.isReturnECs() );
     }

Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java?rev=602753&r1=602752&r2=602753&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
Sun Dec  9 15:39:07 2007
@@ -25,7 +25,7 @@
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.IAsn1Container;
 import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControl;
+import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControlCodec;
 import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.SubEntryControlDecoder;
 
@@ -63,7 +63,7 @@
             Assert.fail( de.getMessage() );
         }
 
-        SubEntryControl control = container.getSubEntryControl();
+        SubEntryControlCodec control = container.getSubEntryControl();
         assertTrue( control.isVisible() );
     }
 
@@ -91,7 +91,7 @@
             Assert.fail( de.getMessage() );
         }
 
-        SubEntryControl control = container.getSubEntryControl();
+        SubEntryControlCodec control = container.getSubEntryControl();
         assertFalse( control.isVisible() );
     }
 



Mime
View raw message