directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r584670 - in /directory: apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/ apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/ apacheds/branches/bigbang/core...
Date Mon, 15 Oct 2007 04:45:15 GMT
Author: akarasulu
Date: Sun Oct 14 21:44:58 2007
New Revision: 584670

URL: http://svn.apache.org/viewvc?rev=584670&view=rev
Log:
renaming DerefAliasesEnum to more descripted AliasDerefMode

Added:
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AliasDerefMode.java   (contents, props changed)
      - copied, changed from r584667, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java
Removed:
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java
Modified:
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER759ITest.java Sun Oct 14 21:44:58 2007
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 
 
 /**
@@ -157,7 +157,7 @@
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
 
         try
         {

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java Sun Oct 14 21:44:58 2007
@@ -39,7 +39,7 @@
 import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 
 
 /**
@@ -164,7 +164,7 @@
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String,Attributes> map = new HashMap<String,Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
@@ -187,7 +187,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
 
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
@@ -213,7 +213,7 @@
         controls.setReturningAttributes( new String[]{ "1.1" } );
         
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
 
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(ou=testing02)", controls );
@@ -237,7 +237,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
 
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(objectClass=organ*)", controls );
@@ -263,7 +263,7 @@
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(|(ou={0})(ou={1}))", new Object[]
@@ -287,7 +287,7 @@
         controls.setDerefLinkFlag( false );
         controls.setCountLimit( 7 );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
 
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
@@ -315,7 +315,7 @@
         controls.setDerefLinkFlag( false );
         controls.setTimeLimit( 200 );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
 
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
@@ -359,7 +359,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(name=testing00)", controls );
@@ -379,7 +379,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(name=*)", controls );
@@ -412,7 +412,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(|(name=testing00)(name=testing01))", controls );
@@ -433,7 +433,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration list = sysRoot.search( "", "(name=testing*)", controls );
@@ -455,7 +455,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         String filter = "(|(2.5.4.11.1=testing*)(2.5.4.54=testing*)(2.5.4.10=testing*)" +
@@ -483,7 +483,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "creatorsName" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing00)", controls );
@@ -508,7 +508,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "creatorsName" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing00)", controls );
@@ -584,7 +584,7 @@
 //        SearchControls controls = new SearchControls();
 //        controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 //        controls.setDerefLinkFlag( false );
-//        sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, DerefAliasesEnum.NEVER_DEREF_ALIASES );
+//        sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES );
 //        
 //        List map = new ArrayList();
 //        NamingEnumeration list = sysRoot.search( "", "(name=*)", controls );

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java Sun Oct 14 21:44:58 2007
@@ -34,7 +34,7 @@
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 
 
 /**
@@ -177,7 +177,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "+" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
@@ -204,7 +204,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
@@ -231,7 +231,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "*", "creatorsName" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
@@ -258,7 +258,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "1.1", "ou" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
@@ -285,7 +285,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "1.1" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
@@ -312,7 +312,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "+", "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberITest.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberITest.java Sun Oct 14 21:44:58 2007
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -271,7 +271,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(uniqueMember=cn = kevin spacey, dc=example, dc=org)", controls );
@@ -319,7 +319,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(uniqueMember=cn = Kevin  Spacey , dc = example , dc = ORG)", controls );
@@ -367,7 +367,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
 
         NamingEnumeration list = sysRoot.search( "", "(uniqueMember=cn=cevin spacey,dc=example,dc=org)", controls );
         
@@ -402,7 +402,7 @@
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
 
         NamingEnumeration list = sysRoot.search( "", "(uniqueMember=cn= Kevin Spacey, dc=example, dc=org #'010101'B)", controls );

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java Sun Oct 14 21:44:58 2007
@@ -37,7 +37,7 @@
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.junit.Test;
 
@@ -116,7 +116,7 @@
             { "ou", "createTimestamp", "creatorsName" } );
 
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES,
-                DerefAliasesEnum.NEVER_DEREF_ALIASES.getJndiValue() );
+                AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
         NamingEnumeration<SearchResult> list;
         list = sysRoot.search( "", "(ou=testing00)", ctls );
         SearchResult result = list.next();

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Sun Oct 14 21:44:58 2007
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.OrNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -128,7 +128,7 @@
             SearchControls ctls = new SearchControls();
             ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             NamingEnumeration<SearchResult> results = nexus.search(
-                    new SearchOperationContext( baseDn, DerefAliasesEnum.DEREF_ALWAYS, filter, ctls ) );
+                    new SearchOperationContext( baseDn, AliasDerefMode.DEREF_ALWAYS, filter, ctls ) );
 
             while ( results.hasMore() )
             {

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Sun Oct 14 21:44:58 2007
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -127,7 +127,7 @@
             SearchControls ctls = new SearchControls();
             ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             NamingEnumeration<SearchResult> results = nexus.search( new SearchOperationContext( baseDn,
-                    DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, ctls ) );
+                    AliasDerefMode.NEVER_DEREF_ALIASES, filter, ctls ) );
             
             while ( results.hasMore() )
             {

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Sun Oct 14 21:44:58 2007
@@ -37,7 +37,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 import javax.naming.Name;
@@ -164,7 +164,7 @@
         try
         {
             e = proxy.search( new SearchOperationContext( ( LdapDN ) entryName.getPrefix( 1 ),
-                    DerefAliasesEnum.DEREF_ALWAYS, childrenFilter, childrenSearchControls ), SEARCH_BYPASS );
+                    AliasDerefMode.DEREF_ALWAYS, childrenFilter, childrenSearchControls ), SEARCH_BYPASS );
 
             while ( e.hasMore() )
             {

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Sun Oct 14 21:44:58 2007
@@ -33,7 +33,7 @@
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.filter.*;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
@@ -142,7 +142,7 @@
         }
         
         
-        ScopeNode scope = new ScopeNode( DerefAliasesEnum.NEVER_DEREF_ALIASES, normalizedBaseDn.toNormName(), 
+        ScopeNode scope = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, normalizedBaseDn.toNormName(),
             searchControls.getSearchScope() );
         
         if ( filter != null )

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java Sun Oct 14 21:44:58 2007
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.interceptor.context;
 
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 
 /**
  * A ListContext context used for Interceptors. It contains all the informations
@@ -31,7 +31,7 @@
  */
 public class ListOperationContext  extends AbstractOperationContext
 {
-    private DerefAliasesEnum aliasDerefMode = DerefAliasesEnum.DEREF_ALWAYS;
+    private AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
 
 
     /**
@@ -60,7 +60,7 @@
      * @param dn The DN to get the suffix from
      * @param aliasDerefMode the alias dereferencing mode to use
      */
-    public ListOperationContext( LdapDN dn, DerefAliasesEnum aliasDerefMode )
+    public ListOperationContext( LdapDN dn, AliasDerefMode aliasDerefMode )
     {
         super( dn );
         this.aliasDerefMode = aliasDerefMode;
@@ -76,7 +76,7 @@
     }
 
 
-    public DerefAliasesEnum getAliasDerefMode()
+    public AliasDerefMode getAliasDerefMode()
     {
         return aliasDerefMode;
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Sun Oct 14 21:44:58 2007
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 import javax.naming.directory.SearchControls;
@@ -42,7 +42,7 @@
     /** The controls */
     private SearchControls searchControls;
 
-    private DerefAliasesEnum aliasDerefMode;
+    private AliasDerefMode aliasDerefMode;
 
 
     /**
@@ -61,7 +61,7 @@
      * @param filter the filter AST to use for the search
      * @param searchControls the search controls
      */
-    public SearchOperationContext( LdapDN dn, DerefAliasesEnum aliasDerefMode, ExprNode filter,
+    public SearchOperationContext( LdapDN dn, AliasDerefMode aliasDerefMode, ExprNode filter,
                                    SearchControls searchControls )
     {
         super( dn );
@@ -105,13 +105,13 @@
     }
 
 
-    public DerefAliasesEnum getAliasDerefMode()
+    public AliasDerefMode getAliasDerefMode()
     {
         return aliasDerefMode;
     }
 
 
-    public void setAliasDerefMode( DerefAliasesEnum aliasDerefMode )
+    public void setAliasDerefMode( AliasDerefMode aliasDerefMode )
     {
         this.aliasDerefMode = aliasDerefMode;
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Oct 14 21:44:58 2007
@@ -214,7 +214,7 @@
      * @param searchControls
      * @return
      */
-    protected NamingEnumeration<SearchResult> doSearchOperation( LdapDN dn, DerefAliasesEnum aliasDerefMode,
+    protected NamingEnumeration<SearchResult> doSearchOperation( LdapDN dn, AliasDerefMode aliasDerefMode,
                                                                  ExprNode filter, SearchControls searchControls )
         throws NamingException
     {
@@ -1005,7 +1005,7 @@
         PresenceNode filter = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT );
         SearchControls ctls = new SearchControls();
         ctls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
-        DerefAliasesEnum aliasDerefMode = DerefAliasesEnum.getEnum( getEnvironment() );
+        AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
         return doSearchOperation( base, aliasDerefMode, filter, ctls );
     }
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sun Oct 14 21:44:58 2007
@@ -26,7 +26,7 @@
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.*;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -527,7 +527,7 @@
         if ( ( null == matchingAttributes ) || ( matchingAttributes.size() <= 0 ) )
         {
             PresenceNode filter = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT );
-            DerefAliasesEnum aliasDerefMode = DerefAliasesEnum.getEnum( getEnvironment() );
+            AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
             return doSearchOperation( target, aliasDerefMode, filter, ctls );
         }
 
@@ -552,7 +552,7 @@
                     node = new EqualityNode( attr.getID(), ( String ) value );
                 }
 
-                DerefAliasesEnum aliasDerefMode = DerefAliasesEnum.getEnum( getEnvironment() );
+                AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
                 return doSearchOperation( target, aliasDerefMode, node, ctls );
             }
         }
@@ -599,7 +599,7 @@
             }
         }
 
-        DerefAliasesEnum aliasDerefMode = DerefAliasesEnum.getEnum( getEnvironment() );
+        AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
         return doSearchOperation( target, aliasDerefMode, filter, ctls );
     }
 
@@ -628,7 +628,7 @@
     public NamingEnumeration<SearchResult> search( Name name, ExprNode filter, SearchControls cons ) throws NamingException
     {
         LdapDN target = buildTarget( name );
-        DerefAliasesEnum aliasDerefMode = DerefAliasesEnum.getEnum( getEnvironment() );
+        AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
         return doSearchOperation( target, aliasDerefMode, filter, cons );
     }
 
@@ -654,7 +654,7 @@
             throw isfe;
         }
 
-        DerefAliasesEnum aliasDerefMode = DerefAliasesEnum.getEnum( getEnvironment() );
+        AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
         return doSearchOperation( target, aliasDerefMode, filterNode, cons );
     }
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java Sun Oct 14 21:44:58 2007
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.ScopeNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -85,7 +85,7 @@
     }
 
 
-    public NamingEnumeration search( Name base, DerefAliasesEnum aliasDerefMode, ExprNode filter, SearchControls searchCtls )
+    public NamingEnumeration search( Name base, AliasDerefMode aliasDerefMode, ExprNode filter, SearchControls searchCtls )
         throws NamingException
     {
         Name effectiveBase;

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java Sun Oct 14 21:44:58 2007
@@ -25,7 +25,7 @@
 
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.ScopeNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 
 
 /**
@@ -89,7 +89,7 @@
     public boolean assertSubtreeScope( final ScopeNode node, final Long id ) throws NamingException
     {
         String dn = db.getEntryDn( id );
-        DerefAliasesEnum mode = node.getDerefAliases();
+        AliasDerefMode mode = node.getDerefAliases();
         Object baseId = db.getEntryId( node.getBaseDn() );
         boolean isDescendant = dn.endsWith( node.getBaseDn() );
 
@@ -155,7 +155,7 @@
      */
     public boolean assertOneLevelScope( final ScopeNode node, final Long id ) throws NamingException
     {
-        DerefAliasesEnum mode = node.getDerefAliases();
+        AliasDerefMode mode = node.getDerefAliases();
         Object baseId = db.getEntryId( node.getBaseDn() );
         Index idx = db.getHierarchyIndex();
         boolean isChild = idx.hasValue( baseId, id );

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SearchEngine.java Sun Oct 14 21:44:58 2007
@@ -22,7 +22,7 @@
 
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 
 import javax.naming.Name;
 import javax.naming.NamingEnumeration;
@@ -84,7 +84,7 @@
      * @return enumeration over SearchResults
      * @throws NamingException if the search fails
      */
-    NamingEnumeration search( Name base, DerefAliasesEnum aliasDerefMode, ExprNode filter,
+    NamingEnumeration search( Name base, AliasDerefMode aliasDerefMode, ExprNode filter,
                               SearchControls searchCtls ) throws NamingException;
 
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Sun Oct 14 21:44:58 2007
@@ -30,7 +30,6 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Stack;
@@ -68,12 +67,11 @@
 import org.apache.directory.server.core.partition.impl.btree.IndexRecord;
 import org.apache.directory.server.core.partition.impl.btree.SearchEngine;
 
-import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -645,7 +643,7 @@
             limitMax = Integer.parseInt( limit );
         }
 
-        NamingEnumeration cursor = eng.search( new LdapDN( base ), DerefAliasesEnum.DEREF_ALWAYS, root, ctls );
+        NamingEnumeration cursor = eng.search( new LdapDN( base ), AliasDerefMode.DEREF_ALWAYS, root, ctls );
         String[] cols = new String[2];
         cols[0] = "id";
         cols[1] = "dn";

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Sun Oct 14 21:44:58 2007
@@ -52,7 +52,7 @@
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -270,7 +270,7 @@
         {
             LdapDN suffix = new LdapDN( suffixes.next() );
             addReferrals( nexus.search( new SearchOperationContext(
-                    suffix, DerefAliasesEnum.DEREF_ALWAYS, getReferralFilter(), getControls() ) ), suffix );
+                    suffix, AliasDerefMode.DEREF_ALWAYS, getReferralFilter(), getControls() ) ), suffix );
         }
     }
 
@@ -876,7 +876,7 @@
         LdapDN suffix = partition.getSuffixDn();
         Invocation invocation = InvocationStack.getInstance().peek();
         NamingEnumeration<SearchResult> list = invocation.getProxy().search( new SearchOperationContext( suffix,
-                DerefAliasesEnum.DEREF_ALWAYS, getReferralFilter(), getControls() ), SEARCH_BYPASS );
+                AliasDerefMode.DEREF_ALWAYS, getReferralFilter(), getControls() ), SEARCH_BYPASS );
         addReferrals( list, suffix );
     }
 
@@ -886,7 +886,7 @@
         // remove referrals immediately before removing the partition
         Invocation invocation = InvocationStack.getInstance().peek();
         NamingEnumeration<SearchResult> list = invocation.getProxy().search( 
-            new SearchOperationContext( opContext.getDn(), DerefAliasesEnum.DEREF_ALWAYS,
+            new SearchOperationContext( opContext.getDn(), AliasDerefMode.DEREF_ALWAYS,
                     getReferralFilter(), getControls() ), SEARCH_BYPASS );
         
         deleteReferrals( list, opContext.getDn() );

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Sun Oct 14 21:44:58 2007
@@ -33,7 +33,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.*;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -178,7 +178,7 @@
         searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         searchControls.setReturningAttributes( SCHEMA_ATTRIBUTES );
         return partition.search( 
-            new SearchOperationContext( base, DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+            new SearchOperationContext( base, AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
     }
 
 
@@ -211,7 +211,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                    DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             
             if ( ! ne.hasMore() )
             {
@@ -257,7 +257,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext(
-                    partition.getSuffixDn(), DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    partition.getSuffixDn(), AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             
             if ( ! ne.hasMore() )
             {
@@ -303,7 +303,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                    DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             
             if ( ! ne.hasMore() )
             {
@@ -349,7 +349,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                    DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             
             if ( ! ne.hasMore() )
             {
@@ -394,7 +394,7 @@
 
         try
         {
-            ne = partition.search( new SearchOperationContext( partition.getSuffixDn(), DerefAliasesEnum.DEREF_ALWAYS,
+            ne = partition.search( new SearchOperationContext( partition.getSuffixDn(), AliasDerefMode.DEREF_ALWAYS,
                         filter, searchControls ) );
             
             if ( ! ne.hasMore() )
@@ -490,7 +490,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                    DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             
             if ( ! ne.hasMore() )
             {
@@ -609,7 +609,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                    DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             while( ne.hasMore() )
             {
                 set.add( ne.next() );
@@ -658,7 +658,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                     DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                     AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             while( ne.hasMore() )
             {
                 set.add( ne.next() );
@@ -686,7 +686,7 @@
         filter.addNode( new PresenceNode( M_OID_OID ) );
         filter.addNode( new PresenceNode( M_NAME_OID ) );
         return partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                 DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                 AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
     }
 
 
@@ -735,7 +735,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                    DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             while( ne.hasMore() )
             {
                 set.add( ne.next() );
@@ -783,7 +783,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                    DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             while( ne.hasMore() )
             {
                 set.add( ne.next() );
@@ -825,7 +825,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                     DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                     AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             while( ne.hasMore() )
             {
                 SearchResult sr = ne.next();
@@ -905,7 +905,7 @@
         try
         {
             ne = partition.search( new SearchOperationContext( partition.getSuffixDn(),
-                    DerefAliasesEnum.DEREF_ALWAYS, filter, searchControls ) );
+                    AliasDerefMode.DEREF_ALWAYS, filter, searchControls ) );
             while( ne.hasMore() )
             {
                 set.add( ne.next() );

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sun Oct 14 21:44:58 2007
@@ -145,7 +145,7 @@
             //suffix = LdapDN.normalize( suffix, registry.getNormalizerMapping() );
             suffix.normalize( attrRegistry.getNormalizerMapping() );
             NamingEnumeration<SearchResult> subentries = nexus.search( 
-                new SearchOperationContext( suffix, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                new SearchOperationContext( suffix, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
             
             while ( subentries.hasMore() )
             {
@@ -441,7 +441,7 @@
                 { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
 
             NamingEnumeration<SearchResult> subentries = nexus.search(
-                    new SearchOperationContext( baseDn, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                    new SearchOperationContext( baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
 
             while ( subentries.hasMore() )
             {
@@ -567,7 +567,7 @@
                 { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
 
             NamingEnumeration<SearchResult> subentries = nexus.search(
-                    new SearchOperationContext( baseDn, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                    new SearchOperationContext( baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
             
             while ( subentries.hasMore() )
             {
@@ -608,7 +608,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         NamingEnumeration<SearchResult> aps = nexus.search(
-                new SearchOperationContext( name, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                new SearchOperationContext( name, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
 
         if ( aps.hasMore() )
         {
@@ -727,7 +727,7 @@
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             controls.setReturningAttributes( new String[] { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
             NamingEnumeration<SearchResult> subentries = nexus.search(
-                    new SearchOperationContext( baseDn, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                    new SearchOperationContext( baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
             
             while ( subentries.hasMore() )
             {
@@ -807,7 +807,7 @@
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             controls.setReturningAttributes( new String[] { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
             NamingEnumeration<SearchResult> subentries = nexus.search(
-                    new SearchOperationContext( baseDn, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                    new SearchOperationContext( baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
             
             while ( subentries.hasMore() )
             {
@@ -881,7 +881,7 @@
             controls.setReturningAttributes( new String[]
                 { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
             NamingEnumeration<SearchResult> subentries = nexus.search(
-                    new SearchOperationContext( baseDn, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                    new SearchOperationContext( baseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
             
             while ( subentries.hasMore() )
             {
@@ -1012,7 +1012,7 @@
             controls.setReturningAttributes( new String[]
                 { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
             NamingEnumeration<SearchResult> subentries = nexus.search(
-                    new SearchOperationContext( oldBaseDn, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                    new SearchOperationContext( oldBaseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
             
             while ( subentries.hasMore() )
             {
@@ -1033,7 +1033,7 @@
             LdapDN newBaseDn = ( LdapDN ) apName.clone();
             newBaseDn.addAll( ssNew.getBase() );
             subentries = nexus.search(
-                    new SearchOperationContext( newBaseDn, DerefAliasesEnum.NEVER_DEREF_ALIASES, filter, controls ) );
+                    new SearchOperationContext( newBaseDn, AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
             while ( subentries.hasMore() )
             {
                 SearchResult result = subentries.next();

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Sun Oct 14 21:44:58 2007
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
@@ -109,7 +109,7 @@
             SearchControls ctls = new SearchControls();
             ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             NamingEnumeration results = 
-                nexus.search( new SearchOperationContext( baseDn, DerefAliasesEnum.DEREF_ALWAYS, filter, ctls ) );
+                nexus.search( new SearchOperationContext( baseDn, AliasDerefMode.DEREF_ALWAYS, filter, ctls ) );
             
             while ( results.hasMore() )
             {

Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java Sun Oct 14 21:44:58 2007
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
@@ -238,7 +238,7 @@
         SearchControls ctrl = new SearchControls();
         ctrl.setSearchScope( SearchControls.SUBTREE_SCOPE );
         NamingEnumeration<SearchResult> e = nexus.search( 
-            new SearchOperationContext( oldName, DerefAliasesEnum.DEREF_ALWAYS,
+            new SearchOperationContext( oldName, AliasDerefMode.DEREF_ALWAYS,
                     new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), ctrl ) );
 
         while ( e.hasMore() )

Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java Sun Oct 14 21:44:58 2007
@@ -43,7 +43,7 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.filter.LoggingFilter;
@@ -337,7 +337,7 @@
         ctrl.setReturningAttributes( new String[] { "entryCSN", "entryDeleted" } );
 
         NamingEnumeration<SearchResult> e = nexus.search(
-            new SearchOperationContext( contextName, DerefAliasesEnum.DEREF_ALWAYS, filter, ctrl ) );
+            new SearchOperationContext( contextName, AliasDerefMode.DEREF_ALWAYS, filter, ctrl ) );
 
         List<LdapDN> names = new ArrayList<LdapDN>();
         try

Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java Sun Oct 14 21:44:58 2007
@@ -33,7 +33,7 @@
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.OidNormalizer;
 import org.apache.mina.common.IdleStatus;
@@ -378,7 +378,7 @@
         SearchControls ctrl = new SearchControls();
         ctrl.setSearchScope( SearchControls.SUBTREE_SCOPE );
         NamingEnumeration e = ctx.getDirectoryService().getPartitionNexus().search(
-            new SearchOperationContext( contextName, DerefAliasesEnum.DEREF_ALWAYS,
+            new SearchOperationContext( contextName, AliasDerefMode.DEREF_ALWAYS,
             new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), ctrl ) );
 
         try

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=584670&r1=584669&r2=584670&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 Oct 14 21:44:58 2007
@@ -78,37 +78,8 @@
 import org.apache.directory.shared.ldap.filter.OrNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
-import org.apache.directory.shared.ldap.message.AbandonRequestImpl;
-import org.apache.directory.shared.ldap.message.AddRequestImpl;
-import org.apache.directory.shared.ldap.message.AddResponseImpl;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.BindRequestImpl;
-import org.apache.directory.shared.ldap.message.BindResponseImpl;
-import org.apache.directory.shared.ldap.message.CascadeControl;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
-import org.apache.directory.shared.ldap.message.CompareResponseImpl;
-import org.apache.directory.shared.ldap.message.AbstractMutableControlImpl;
-import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
-import org.apache.directory.shared.ldap.message.DeleteResponseImpl;
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.message.LdapResultImpl;
-import org.apache.directory.shared.ldap.message.Message;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
-import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
-import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
-import org.apache.directory.shared.ldap.message.PersistentSearchControl;
-import org.apache.directory.shared.ldap.message.Referral;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
-import org.apache.directory.shared.ldap.message.SearchResponseDoneImpl;
-import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
-import org.apache.directory.shared.ldap.message.SearchResponseReferenceImpl;
-import org.apache.directory.shared.ldap.message.SubentriesControl;
-import org.apache.directory.shared.ldap.message.UnbindRequestImpl;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
+import org.apache.directory.shared.ldap.message.*;
 import org.apache.directory.shared.ldap.message.extended.GracefulShutdownRequest;
 import org.apache.directory.shared.ldap.message.spi.Provider;
 import org.apache.directory.shared.ldap.message.spi.TransformerSpi;
@@ -595,23 +566,23 @@
         // Twix : int scope -> Snickers : ScopeEnum scope
         snickersMessage.setScope( searchRequest.getScope() );
 
-        // Twix : int derefAliases -> Snickers : DerefAliasesEnum derefAliases
+        // Twix : int derefAliases -> Snickers : AliasDerefMode derefAliases
         switch ( searchRequest.getDerefAliases() )
         {
             case LdapConstants.DEREF_ALWAYS:
-                snickersMessage.setDerefAliases( DerefAliasesEnum.DEREF_ALWAYS );
+                snickersMessage.setDerefAliases( AliasDerefMode.DEREF_ALWAYS );
                 break;
 
             case LdapConstants.DEREF_FINDING_BASE_OBJ:
-                snickersMessage.setDerefAliases( DerefAliasesEnum.DEREF_FINDING_BASE_OBJ );
+                snickersMessage.setDerefAliases( AliasDerefMode.DEREF_FINDING_BASE_OBJ );
                 break;
 
             case LdapConstants.DEREF_IN_SEARCHING:
-                snickersMessage.setDerefAliases( DerefAliasesEnum.DEREF_IN_SEARCHING );
+                snickersMessage.setDerefAliases( AliasDerefMode.DEREF_IN_SEARCHING );
                 break;
 
             case LdapConstants.NEVER_DEREF_ALIASES:
-                snickersMessage.setDerefAliases( DerefAliasesEnum.NEVER_DEREF_ALIASES );
+                snickersMessage.setDerefAliases( AliasDerefMode.NEVER_DEREF_ALIASES );
                 break;
         }
 

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java Sun Oct 14 21:44:58 2007
@@ -22,7 +22,7 @@
 
 import javax.naming.directory.SearchControls;
 
-import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
 
 
 /**
@@ -41,22 +41,22 @@
     private final String baseDn;
 
     /** the alias dereferencing mode */
-    private final DerefAliasesEnum derefAliases;
+    private final AliasDerefMode aliasDerefAliases;
 
 
     /**
      * Creates a new ScopeNode object.
      * 
-     * @param derefAliases the alias dereferencing mode
+     * @param aliasDerefAliases the alias dereferencing mode
      * @param baseDn the search base
      * @param scope the search scope
      */
-    public ScopeNode( DerefAliasesEnum derefAliases, String baseDn, int scope )
+    public ScopeNode( AliasDerefMode aliasDerefAliases, String baseDn, int scope )
     {
         super();
         this.scope = scope;
         this.baseDn = baseDn;
-        this.derefAliases = derefAliases;
+        this.aliasDerefAliases = aliasDerefAliases;
     }
 
 
@@ -101,9 +101,9 @@
      * 
      * @return the alias dereferencing enumeration constant.
      */
-    public DerefAliasesEnum getDerefAliases()
+    public AliasDerefMode getDerefAliases()
     {
-        return derefAliases;
+        return aliasDerefAliases;
     }
 
 
@@ -165,7 +165,7 @@
     	buf.append( ", '" );
     	buf.append( baseDn );
     	buf.append( "', " );
-    	buf.append( derefAliases );
+    	buf.append( aliasDerefAliases );
     	buf.append( "}" );
     	buf.append( super.toString() );
     	buf.append( ')' );

Copied: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AliasDerefMode.java (from r584667, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AliasDerefMode.java?p2=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AliasDerefMode.java&p1=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java&r1=584667&r2=584670&rev=584670&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AliasDerefMode.java Sun Oct 14 21:44:58 2007
@@ -27,13 +27,15 @@
 
 /**
  * Type-safe derefAliases search parameter enumeration which determines the mode
- * of alias handling. Note that the names of these ValuedEnums correspond to the
- * value for the java.naming.ldap.derefAliases JNDI LDAP specific property.
+ * of alias handling. Note that the jndi values of these ValuedEnums correspond
+ * to the string value for the java.naming.ldap.derefAliases JNDI LDAP specific
+ * property.  The integer value represents the values used in the LDAP ASN.1 for
+ * different settings.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Revision$
  */
-public enum DerefAliasesEnum
+public enum AliasDerefMode
 {
     /** Alias handling mode value that treats aliases like entries */
     NEVER_DEREF_ALIASES( 0, "never" ),
@@ -60,7 +62,7 @@
      * 
      * @param value the integer value of the enumeration.
      */
-    private DerefAliasesEnum( int value, String jndiValue )
+    private AliasDerefMode( int value, String jndiValue )
     {
        this.value = value;
        this.jndiValue = jndiValue;
@@ -85,7 +87,7 @@
      *            java.naming.ldap.derefAliases property
      * @return the enumeration for the environment
      */
-    public static DerefAliasesEnum getEnum( Map<String, Object> env )
+    public static AliasDerefMode getEnum( Map<String, Object> env )
     {
         String property = ( String ) env.get( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES );
         

Propchange: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AliasDerefMode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AliasDerefMode.java
------------------------------------------------------------------------------
    svn:eol-styles = native

Propchange: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AliasDerefMode.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Oct 14 21:44:58 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java Sun Oct 14 21:44:58 2007
@@ -93,16 +93,16 @@
      * 
      * @return the alias handling parameter enumeration.
      */
-    DerefAliasesEnum getDerefAliases();
+    AliasDerefMode getDerefAliases();
 
 
     /**
      * Sets the alias handling parameter.
      * 
-     * @param derefAliases
+     * @param aliasDerefAliases
      *            the alias handling parameter enumeration.
      */
-    void setDerefAliases( DerefAliasesEnum derefAliases );
+    void setDerefAliases( AliasDerefMode aliasDerefAliases );
 
 
     /**

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java?rev=584670&r1=584669&r2=584670&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java Sun Oct 14 21:44:58 2007
@@ -61,7 +61,7 @@
     private int timeLimit;
 
     /** Alias dereferencing mode enumeration value */
-    private DerefAliasesEnum derefAliases;
+    private AliasDerefMode aliasDerefMode;
 
     /** Attributes to return */
     private List<String> attributes = new ArrayList<String>();
@@ -147,21 +147,21 @@
      * 
      * @return the alias handling parameter enumeration.
      */
-    public DerefAliasesEnum getDerefAliases()
+    public AliasDerefMode getDerefAliases()
     {
-        return derefAliases;
+        return aliasDerefMode;
     }
 
 
     /**
      * Sets the alias handling parameter.
      * 
-     * @param derefAliases
+     * @param aliasDerefAliases
      *            the alias handling parameter enumeration.
      */
-    public void setDerefAliases( DerefAliasesEnum derefAliases )
+    public void setDerefAliases( AliasDerefMode aliasDerefAliases )
     {
-        this.derefAliases = derefAliases;
+        this.aliasDerefMode = aliasDerefAliases;
     }
 
 
@@ -381,7 +381,7 @@
             return false;
         }
 
-        if ( req.getDerefAliases() != derefAliases )
+        if ( req.getDerefAliases() != aliasDerefMode )
         {
             return false;
         }
@@ -513,7 +513,7 @@
 
         sb.append( "        Deref Aliases : " );
 
-        switch ( derefAliases.getValue() )
+        switch ( aliasDerefMode.getValue() )
         {
             case LdapConstants.NEVER_DEREF_ALIASES:
                 sb.append( "never Deref Aliases" );



Mime
View raw message