directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r474613 [1/2] - in /directory/branches/apacheds-schema/apacheds: core-plugin/src/main/antlr/ core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-shared/src/main/java/org/apache/directory/server/core/schema/bootstra...
Date Tue, 14 Nov 2006 00:54:05 GMT
Author: elecharny
Date: Mon Nov 13 16:54:03 2006
New Revision: 474613

URL: http://svn.apache.org/viewvc?view=rev&rev=474613
Log:
Remove almost all old TypeSafe enums and replaced them by enum.
It still don't compile, because of ProducersTypeEnum.

Modified:
    directory/branches/apacheds-schema/apacheds/core-plugin/src/main/antlr/openldap.g
    directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java
    directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
    directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java
    directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java
    directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java
    directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java
    directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
    directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaFromFileConverter.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
    directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
    directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/CompareHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DeleteHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ExtendedHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/PersistentSearchListener.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
    directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
    directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java
    directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java

Modified: directory/branches/apacheds-schema/apacheds/core-plugin/src/main/antlr/openldap.g
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-plugin/src/main/antlr/openldap.g?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-plugin/src/main/antlr/openldap.g (original)
+++ directory/branches/apacheds-schema/apacheds/core-plugin/src/main/antlr/openldap.g Mon Nov 13 16:54:03 2006
@@ -547,8 +547,8 @@
     :
     "USAGE"
     (
-        "userApplications" { type.setUsage( UsageEnum.USERAPPLICATIONS ); } |
-        "directoryOperation" { type.setUsage( UsageEnum.DIRECTORYOPERATION ); } |
-        "distributedOperation" { type.setUsage( UsageEnum.DISTRIBUTEDOPERATION ); } |
-        "dSAOperation" { type.setUsage( UsageEnum.DSAOPERATION ); }
+        "userApplications" { type.setUsage( UsageEnum.USER_APPLICATIONS ); } |
+        "directoryOperation" { type.setUsage( UsageEnum.DIRECTORY_OPERATION ); } |
+        "distributedOperation" { type.setUsage( UsageEnum.DISTRIBUTED_OPERATION ); } |
+        "dSAOperation" { type.setUsage( UsageEnum.DSA_OPERATION ); }
     );

Modified: directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java (original)
+++ directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/AttributeTypeLiteral.java Mon Nov 13 16:54:03 2006
@@ -46,7 +46,7 @@
     private String substr;
     private String syntax;
 
-    private UsageEnum usage = UsageEnum.USERAPPLICATIONS;
+    private UsageEnum usage = UsageEnum.USER_APPLICATIONS;
 
     private String[] names = ArrayUtils.EMPTY_STRING_ARRAY;
 

Modified: directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java (original)
+++ directory/branches/apacheds-schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java Mon Nov 13 16:54:03 2006
@@ -163,10 +163,10 @@
             context.put( "classname", schema.getUnqualifiedClassName( type ) );
             context.put( "schema", schema.getSchemaName() );
             context.put( "owner", schema.getOwner() );
-            context.put( "type", type.getName().substring( 0, type.getName().length() - 8 ) );
+            context.put( "type", type.toString().substring( 0, type.toString().length() - 8 ) );
 
             String typeName = null;
-            switch ( type.getValue() )
+            switch ( type )
             {
                 case ( ProducerTypeEnum.COMPARATOR_PRODUCER_VAL  ):
                     typeName = "ProducerTypeEnum.COMPARATOR_PRODUCER";

Modified: directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java (original)
+++ directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java Mon Nov 13 16:54:03 2006
@@ -165,19 +165,19 @@
 
     public String getFullClassName( ProducerTypeEnum type )
     {
-        return baseName + type.getName();
+        return baseName + type;
     }
 
 
     public String getFullDefaultBaseClassName( ProducerTypeEnum type )
     {
-        return defaultBaseName + type.getName();
+        return defaultBaseName + type;
     }
 
 
     public String getUnqualifiedClassName( ProducerTypeEnum type )
     {
-        return schemaNameCapped + type.getName();
+        return schemaNameCapped + type;
     }
 
 

Modified: directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java (original)
+++ directory/branches/apacheds-schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java Mon Nov 13 16:54:03 2006
@@ -47,7 +47,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ProducerTypeEnum extends ValuedEnum
+public enum ProducerTypeEnum
 {
     private static final long serialVersionUID = 3257284725524475954L;
 
@@ -200,27 +200,5 @@
         }
 
         throw new IllegalArgumentException( "Unknown ProducerTypeEnum string" + producerType );
-    }
-
-
-    /**
-     * Gets a List of the enumerations.
-     * 
-     * @return the List of enumerations in creation order for ProducerTypes
-     */
-    public static List list()
-    {
-        return EnumUtils.getEnumList( ProducerTypeEnum.class );
-    }
-
-
-    /**
-     * Gets the Map of ProducerTypeEnum objects by name.
-     * 
-     * @return the Map by name of ProducerTypeEnum
-     */
-    public static Map map()
-    {
-        return EnumUtils.getEnumMap( ProducerTypeEnum.class );
     }
 }

Modified: directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java (original)
+++ directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java Mon Nov 13 16:54:03 2006
@@ -67,7 +67,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 
@@ -110,7 +110,7 @@
         catch ( LdapNameAlreadyBoundException e )
         {
             assertEquals( "ou=users,ou=groups,ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.ENTRYALREADYEXISTS, e.getResultCode() );
+            assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
         }
 
         try
@@ -124,7 +124,7 @@
         catch ( LdapNameAlreadyBoundException e )
         {
             assertEquals( "ou=uzerz,ou=groups,ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.ENTRYALREADYEXISTS, e.getResultCode() );
+            assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
         }
     }
 
@@ -142,7 +142,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
 
         try
@@ -155,7 +155,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 
@@ -199,7 +199,7 @@
         catch ( LdapNameAlreadyBoundException e )
         {
             assertEquals( "ou=groups,ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.ENTRYALREADYEXISTS, e.getResultCode() );
+            assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
         }
     }
 
@@ -217,7 +217,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 
@@ -267,7 +267,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
 
         ModificationItem[] mods = new ModificationItem[]
@@ -281,7 +281,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 
@@ -331,7 +331,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 
@@ -365,7 +365,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 
@@ -415,7 +415,7 @@
         catch ( LdapNamingException e )
         {
             assertEquals( "cn=toanother,ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.ALIASPROBLEM, e.getResultCode() );
+            assertEquals( ResultCodeEnum.ALIAS_PROBLEM, e.getResultCode() );
         }
     }
 
@@ -434,7 +434,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 
@@ -454,7 +454,7 @@
         catch ( LdapNameAlreadyBoundException e )
         {
             assertEquals( "ou=blah,ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.ENTRYALREADYEXISTS, e.getResultCode() );
+            assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
         }
     }
 
@@ -491,7 +491,7 @@
         catch ( LdapContextNotEmptyException e )
         {
             assertEquals( "ou=blah,ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOTALLOWEDONNONLEAF, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF, e.getResultCode() );
         }
     }
 
@@ -510,7 +510,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 
@@ -533,7 +533,7 @@
         catch ( LdapNameNotFoundException e )
         {
             assertEquals( "ou=system", e.getResolvedName().toString() );
-            assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
         }
     }
 }

Modified: directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java (original)
+++ directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java Mon Nov 13 16:54:03 2006
@@ -702,7 +702,7 @@
         }
         catch ( LdapNamingException e )
         {
-            assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+            assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
         }
     }
 
@@ -731,7 +731,7 @@
         }
         catch ( LdapNamingException e )
         {
-            assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+            assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
         }
     }
 
@@ -760,7 +760,7 @@
         }
         catch ( LdapNamingException e )
         {
-            assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+            assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
         }
     }
 
@@ -789,7 +789,7 @@
         }
         catch ( LdapNamingException e )
         {
-            assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+            assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
         }
     }
 

Modified: directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java (original)
+++ directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java Mon Nov 13 16:54:03 2006
@@ -162,7 +162,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         HashMap map = new HashMap();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
@@ -184,7 +184,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
 
         HashMap map = new HashMap();
         NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
@@ -208,7 +208,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
 
         HashMap map = new HashMap();
         NamingEnumeration list = sysRoot.search( "", "(objectClass=organ*)", controls );
@@ -233,7 +233,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         HashMap map = new HashMap();
 
         NamingEnumeration list = sysRoot.search( "", "(| (ou={0}) (ou={1}))", new Object[]
@@ -256,7 +256,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         controls.setCountLimit( 7 );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
 
         HashMap map = new HashMap();
         NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
@@ -283,7 +283,7 @@
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
         controls.setTimeLimit( 200 );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
 
         HashMap map = new HashMap();
         NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
@@ -326,7 +326,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         
         HashMap map = new HashMap();
         NamingEnumeration list = sysRoot.search( "", "(name=testing00)", controls );
@@ -345,7 +345,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         
         HashMap map = new HashMap();
         NamingEnumeration list = sysRoot.search( "", "(name=*)", controls );
@@ -377,7 +377,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         
         HashMap map = new HashMap();
         NamingEnumeration list = sysRoot.search( "", "(| (name=testing00)(name=testing01))", controls );
@@ -397,7 +397,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         
         HashMap map = new HashMap();
         NamingEnumeration list = sysRoot.search( "", "(name=testing*)", controls );
@@ -418,7 +418,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         
         HashMap map = new HashMap();
         String filter = "(|(2.5.4.11.1=testing*)(2.5.4.54=testing*)(2.5.4.10=testing*)" +
@@ -445,7 +445,7 @@
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "creatorsName" } );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         HashMap map = new HashMap();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing00)", controls );
@@ -469,7 +469,7 @@
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[] { "creatorsName" } );
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVER_DEREF_ALIASES );
         HashMap map = new HashMap();
 
         NamingEnumeration list = sysRoot.search( "", "(ou=testing00)", controls );

Modified: directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java (original)
+++ directory/branches/apacheds-schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java Mon Nov 13 16:54:03 2006
@@ -78,7 +78,7 @@
         ctls.setReturningAttributes( new String[]
             { "ou", "createTimestamp", "creatorsName" } );
 
-        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES_NAME );
+        sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.NEVERDEREFALIASES_NAME );
         NamingEnumeration list;
         list = sysRoot.search( "", "(ou=testing00)", ctls );
         SearchResult result = ( SearchResult ) list.next();

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Nov 13 16:54:03 2006
@@ -398,7 +398,7 @@
              * complain because SASL is not a supported auth method yet
              */
             throw new LdapAuthenticationNotSupportedException( "Unknown authentication type: '" + authentication + "'",
-                ResultCodeEnum.AUTHMETHODNOTSUPPORTED );
+                ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
         }
     }
 

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java Mon Nov 13 16:54:03 2006
@@ -274,7 +274,7 @@
             {
                 String msg = "failed to parse entryACI: " + aciString;
                 log.error( msg, e );
-                throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONSERROR );
+                throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONS_ERROR );
             }
 
             tuples.addAll( item.toTuples() );
@@ -326,7 +326,7 @@
             {
                 String msg = "failed to parse subentryACI: " + aciString;
                 log.error( msg, e );
-                throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONSERROR );
+                throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONS_ERROR );
             }
 
             tuples.addAll( item.toTuples() );

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Mon Nov 13 16:54:03 2006
@@ -151,7 +151,7 @@
             // should not be necessary because of schema interceptor but schema checking
             // can be turned off and in this case we must protect against being able to
             // add access control information to anything other than an AC subentry
-            throw new LdapSchemaViolationException( "", ResultCodeEnum.OBJECTCLASSVIOLATION );
+            throw new LdapSchemaViolationException( "", ResultCodeEnum.OBJECT_CLASS_VIOLATION );
         }
         else if ( aci == null )
         {

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java Mon Nov 13 16:54:03 2006
@@ -144,7 +144,7 @@
         }
         
         
-        ScopeNode scope = new ScopeNode( DerefAliasesEnum.NEVERDEREFALIASES, normalizedBaseDn.toNormName(), 
+        ScopeNode scope = new ScopeNode( DerefAliasesEnum.NEVER_DEREF_ALIASES, normalizedBaseDn.toNormName(), 
             searchControls.getSearchScope() );
         
         if ( filter != null )

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Mon Nov 13 16:54:03 2006
@@ -120,7 +120,7 @@
         if ( objectClass.contains( "alias" ) )
         {
             String msg = "Attempt to add entry to alias '" + normName.getUpName() + "' not allowed.";
-            ResultCodeEnum rc = ResultCodeEnum.ALIASPROBLEM;
+            ResultCodeEnum rc = ResultCodeEnum.ALIAS_PROBLEM;
             NamingException e = new LdapNamingException( msg, rc );
             e.setResolvedName( new LdapDN( parentDn.getUpName() ) );
             throw e;

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Mon Nov 13 16:54:03 2006
@@ -321,7 +321,7 @@
                 type = registry.lookup( attrId );
             }
 
-            if ( type != null && type.getUsage() != UsageEnum.USERAPPLICATIONS )
+            if ( type != null && type.getUsage() != UsageEnum.USER_APPLICATIONS )
             {
                 attributes.remove( attrId );
             }

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Nov 13 16:54:03 2006
@@ -809,7 +809,7 @@
                         // add all user attribute
                         Attribute attr = ( Attribute ) ii.next();
                         AttributeType type = attrRegistry.lookup( attr.getID() );
-                        if ( type.getUsage() == UsageEnum.USERAPPLICATIONS )
+                        if ( type.getUsage() == UsageEnum.USER_APPLICATIONS )
                         {
                             attrs.put( attr );
                         }
@@ -827,7 +827,7 @@
                         // add all operational attributes
                         Attribute attr = ( Attribute ) ii.next();
                         AttributeType type = attrRegistry.lookup( attr.getID() );
-                        if ( type.getUsage() != UsageEnum.USERAPPLICATIONS )
+                        if ( type.getUsage() != UsageEnum.USER_APPLICATIONS )
                         {
                             attrs.put( attr );
                         }

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Mon Nov 13 16:54:03 2006
@@ -144,7 +144,7 @@
             {
                 String attrId = ( String ) list.next();
                 AttributeType attrType = registry.lookup( attrId );
-                if ( attrType.getUsage() == UsageEnum.USERAPPLICATIONS )
+                if ( attrType.getUsage() == UsageEnum.USER_APPLICATIONS )
                 {
                     continue;
                 }
@@ -181,7 +181,7 @@
             {
                 String attrId = ( String ) list.next();
                 AttributeType attrType = registry.lookup( attrId );
-                if ( attrType.getUsage() == UsageEnum.USERAPPLICATIONS )
+                if ( attrType.getUsage() == UsageEnum.USER_APPLICATIONS )
                 {
                     Attribute attr = ( Attribute ) rec.getAttributes().get( attrId ).clone();
                     entry.put( attr );

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java Mon Nov 13 16:54:03 2006
@@ -104,7 +104,7 @@
          * occur on finding the base then we set the effective base to the
          * given base.
          */
-        if ( null == aliasedBase || !mode.derefFindingBase() )
+        if ( null == aliasedBase || ( mode != DerefAliasesEnum.DEREF_FINDING_BASE_OBJ ) )
         {
             effectiveBase = base;
         }

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java Mon Nov 13 16:54:03 2006
@@ -28,6 +28,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.util.SingletonEnumeration;
 
 
@@ -73,8 +74,10 @@
                 record.setEntryId( id );
                 record.setIndexKey( snode.getBaseDn() );
                 return new SingletonEnumeration( record );
+                
             case ( SearchControls.ONELEVEL_SCOPE  ):
-                return enumerateChildren( snode.getBaseDn(), snode.getDerefAliases().derefInSearching() );
+                return enumerateChildren( snode.getBaseDn(), snode.getDerefAliases() == DerefAliasesEnum.DEREF_IN_SEARCHING );
+            
             case ( SearchControls.SUBTREE_SCOPE  ):
                 return enumerateDescendants( snode );
             default:
@@ -152,7 +155,7 @@
          * If we do not dereference while searching then we simply return any
          * entry that is not a descendant of the base.
          */
-        if ( !node.getDerefAliases().derefInSearching() )
+        if ( node.getDerefAliases() != DerefAliasesEnum.DEREF_IN_SEARCHING )
         {
             // Gets a NamingEnumeration over all elements
             idx = db.getNdnIndex();

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java Mon Nov 13 16:54:03 2006
@@ -97,7 +97,7 @@
          * dereferencing is not enabled then we return the results of the 
          * descendant test.
          */
-        if ( !mode.derefInSearching() )
+        if ( mode != DerefAliasesEnum.DEREF_IN_SEARCHING )
         {
             return isDescendant;
         }
@@ -162,7 +162,7 @@
          * dereferencing is not enabled then we return the results of the child 
          * test. 
          */
-        if ( !mode.derefInSearching() )
+        if ( mode != DerefAliasesEnum.DEREF_IN_SEARCHING )
         {
             return isChild;
         }

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Mon Nov 13 16:54:03 2006
@@ -647,7 +647,7 @@
 
         Hashtable env = new Hashtable();
 
-        env.put( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.DEREFALWAYS_NAME );
+        env.put( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.DEREFALWAYS_NAME );
 
         NamingEnumeration cursor = eng.search( new LdapDN( base ), env, root, ctls );
         String[] cols = new String[2];

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Mon Nov 13 16:54:03 2006
@@ -829,7 +829,7 @@
         if ( objectClass == null )
         {
             String msg = "Entry " + normName.getUpName() + " contains no objectClass attribute: " + entry;
-            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSVIOLATION );
+            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
         }
 
         // Start adding the system indices
@@ -1689,7 +1689,7 @@
         throw new LdapAuthenticationNotSupportedException(
             "Bind requests only tunnel down into partitions if there are no authenticators to handle the mechanism.\n"
                 + "Check to see if you have correctly configured authenticators for the server.",
-            ResultCodeEnum.AUTHMETHODNOTSUPPORTED );
+            ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
     }
 
 

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Mon Nov 13 16:54:03 2006
@@ -441,13 +441,13 @@
             else if ( farthestDst != null )
             {
                 throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName
-                    + " so it affects multiple DSAs", ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+                    + " so it affects multiple DSAs", ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
             }
             else if ( lut.isReferral( newName ) )
             {
                 throw new LdapNamingException( newName
                     + " exists and is a referral for modifyDn destination so it affects multiple DSAs",
-                    ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+                    ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
             }
 
             throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a "
@@ -508,13 +508,13 @@
             else if ( farthestDst != null )
             {
                 throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName
-                    + " so it affects multiple DSAs", ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+                    + " so it affects multiple DSAs", ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
             }
             else if ( lut.isReferral( newName ) )
             {
                 throw new LdapNamingException( newName
                     + " exists and is a referral for modifyDn destination so it affects multiple DSAs",
-                    ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+                    ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
             }
 
             throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a "
@@ -579,13 +579,13 @@
             else if ( farthestDst != null )
             {
                 throw new LdapNamingException( farthestDst + " ancestor is a referral for modifyDn on " + newName
-                    + " so it affects multiple DSAs", ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+                    + " so it affects multiple DSAs", ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
             }
             else if ( lut.isReferral( newName ) )
             {
                 throw new LdapNamingException( newName
                     + " exists and is a referral for modifyDn destination so it affects multiple DSAs",
-                    ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+                    ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
             }
 
             throw new IllegalStateException( "If you get this exception the server's logic was flawed in handling a "

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Mon Nov 13 16:54:03 2006
@@ -87,7 +87,7 @@
             {
                 log.info( msg + ".  Raising LdapSchemaViolationException." );
             }
-            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
 
         // check that there is at least one structural objectClass in the replacement set
@@ -107,7 +107,7 @@
         {
             log.info( msg + ".  Raising LdapSchemaViolationException." );
         }
-        throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+        throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
     }
 
 
@@ -147,7 +147,7 @@
             {
                 log.info( msg + ".  Raising LdapSchemaViolationException." );
             }
-            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
 
         // check that there is at least one structural objectClass in the replacement set
@@ -167,7 +167,7 @@
         {
             log.info( msg + ".  Raising LdapSchemaViolationException." );
         }
-        throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+        throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
     }
 
 
@@ -218,7 +218,7 @@
             {
                 log.info( msg + ".  Raising LdapSchemaViolationException." );
             }
-            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
 
         // remove all the objectClass attribute values from a cloned copy and then
@@ -248,7 +248,7 @@
         {
             log.info( msg + ".  Raising LdapSchemaViolationException." );
         }
-        throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+        throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
     }
 
 
@@ -300,7 +300,7 @@
             {
                 log.info( msg + ".  Raising LdapSchemaViolationException." );
             }
-            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
 
         // remove all the objectClass attribute values from a cloned copy and then
@@ -330,7 +330,7 @@
         {
             log.info( msg + ".  Raising LdapSchemaViolationException." );
         }
-        throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+        throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
     }
 
 
@@ -381,7 +381,7 @@
             {
                 log.info( msg + ". SchemaChecker is throwing a schema violation exception." );
             }
-            throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+            throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
         }
 
         // from here on the modify operation replaces specific values
@@ -401,7 +401,7 @@
                 {
                     log.info( msg + ". SchemaChecker is throwing a schema violation exception." );
                 }
-                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
             }
         }
     }
@@ -454,7 +454,7 @@
                     {
                         log.info( msg + ". SchemaChecker is throwing a schema violation exception." );
                     }
-                    throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                    throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
                 }
 
                 // from here on the modify operation replaces specific values
@@ -475,7 +475,7 @@
                         {
                             log.info( msg + ". SchemaChecker is throwing a schema violation exception." );
                         }
-                        throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                        throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
                     }
                 }
             }
@@ -530,7 +530,7 @@
             {
                 log.info( msg + ". SchemaChecker is throwing a schema violation exception." );
             }
-            throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+            throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
         }
 
         // from here on the modify operation only deletes specific values
@@ -548,7 +548,7 @@
                 {
                     log.info( msg + ". SchemaChecker is throwing a schema violation exception." );
                 }
-                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
             }
         }
     }
@@ -601,7 +601,7 @@
                     {
                         log.info( msg + ". SchemaChecker is throwing a schema violation exception." );
                     }
-                    throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                    throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
                 }
 
                 // from here on the modify operation only deletes specific values
@@ -620,7 +620,7 @@
                         {
                             log.info( msg + ". SchemaChecker is throwing a schema violation exception." );
                         }
-                        throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                        throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
                     }
                 }
             }

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaFromFileConverter.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaFromFileConverter.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaFromFileConverter.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaFromFileConverter.java Mon Nov 13 16:54:03 2006
@@ -255,7 +255,7 @@
      */
     private void register( ProducerTypeEnum type, String id, Object schemaObject ) throws NamingException
     {
-        switch ( type.getValue() )
+        switch ( type )
         {
             case ( ProducerTypeEnum.NORMALIZER_PRODUCER_VAL    ):
                 Normalizer normalizer = ( Normalizer ) schemaObject;

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Nov 13 16:54:03 2006
@@ -591,7 +591,7 @@
         if ( !objectClassAttr.getID().equalsIgnoreCase( "objectClass" ) )
         {
             throw new LdapNamingException( "Expecting an objectClass attribute but got " + objectClassAttr.getID(),
-                ResultCodeEnum.OPERATIONSERROR );
+                ResultCodeEnum.OPERATIONS_ERROR );
         }
 
         Set objectClasses = new HashSet();
@@ -686,7 +686,7 @@
                 {
                     // not ok for add but ok for replace and delete
                     throw new LdapInvalidAttributeValueException( "No value is not a valid value for an attribute.", 
-                        ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
+                        ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
                 }
             }
 
@@ -700,7 +700,7 @@
             if ( modOp == DirContext.REMOVE_ATTRIBUTE && isRequired( change.getID(), objectClass )
                 && isCompleteRemoval( change, entry ) )
             {
-                throw new LdapSchemaViolationException( ResultCodeEnum.OBJECTCLASSVIOLATION );
+                throw new LdapSchemaViolationException( ResultCodeEnum.OBJECT_CLASS_VIOLATION );
             }
         }
 
@@ -814,7 +814,7 @@
                 if ( mods[ii].getModificationOp() == DirContext.ADD_ATTRIBUTE )
                 {
                     throw new LdapInvalidAttributeValueException( "No value is not a valid value for an attribute.", 
-                        ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
+                        ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
                 }
             }
 
@@ -916,7 +916,7 @@
                     if ( isRequired( change.getID(), objectClass ) && isCompleteRemoval( change, entry ) )
                     {
                         log.error( "Trying to remove a required attribute" );
-                        throw new LdapSchemaViolationException( ResultCodeEnum.OBJECTCLASSVIOLATION );
+                        throw new LdapSchemaViolationException( ResultCodeEnum.OBJECT_CLASS_VIOLATION );
                     }
                     
                     tmpEntry.remove( change.getID() );
@@ -1170,7 +1170,7 @@
         if ( attribute.size() > 1 && registry.lookup( attribute.getID() ).isSingleValue() )
         {                
             throw new LdapInvalidAttributeValueException( "More than one value has been provided " +
-                "for the single-valued attribute: " + attribute.getID(), ResultCodeEnum.CONSTRAINTVIOLATION );
+                "for the single-valued attribute: " + attribute.getID(), ResultCodeEnum.CONSTRAINT_VIOLATION );
         }
     }
 
@@ -1199,7 +1199,7 @@
             {
                 throw new LdapSchemaViolationException( "Required attribute " + 
                     required[ii].getName() + " not found within entry.", 
-                    ResultCodeEnum.OBJECTCLASSVIOLATION );
+                    ResultCodeEnum.OBJECT_CLASS_VIOLATION );
             }
         }
     }

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java Mon Nov 13 16:54:03 2006
@@ -209,7 +209,7 @@
         for ( int ii = 0; ii < producers.size(); ii++ )
         {
             ProducerTypeEnum producerType = ( ProducerTypeEnum ) producers.get( ii );
-            BootstrapProducer producer = getProducer( schema, producerType.getName() );
+            BootstrapProducer producer = getProducer( schema, producerType );
             producer.produce( registries, cb );
         }
     }
@@ -233,7 +233,7 @@
         BootstrapSchema schema = ( BootstrapSchema ) this.schemas.get();
         BootstrapRegistries registries = ( BootstrapRegistries ) this.registries.get();
 
-        switch ( type.getValue() )
+        switch ( type )
         {
             case ( ProducerTypeEnum.NORMALIZER_PRODUCER_VAL  ):
                 Normalizer normalizer = ( Normalizer ) schemaObject;

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Mon Nov 13 16:54:03 2006
@@ -180,7 +180,7 @@
         if ( oc == null )
         {
             throw new LdapSchemaViolationException( "A subentry must have an objectClass attribute", 
-                ResultCodeEnum.OBJECTCLASSVIOLATION );
+                ResultCodeEnum.OBJECT_CLASS_VIOLATION );
         }
         
         if ( oc.contains( "accessControlSubentry" ) )
@@ -411,7 +411,7 @@
             {
                 String msg = "Failed while parsing subtreeSpecification for " + normName.getUpName();
                 log.warn( msg );
-                throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
+                throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
             }
             subentryCache.setSubentry( normName.toString(), ss, getSubentryTypes( entry ) );
             next.add(normName, entry );
@@ -718,7 +718,7 @@
             {
                 String msg = "Will not allow rename operation on entries with administrative descendants.";
                 log.warn( msg );
-                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
             }
             next.modifyRn( name, newRn, deleteOldRn );
 
@@ -791,7 +791,7 @@
             {
                 String msg = "Will not allow rename operation on entries with administrative descendants.";
                 log.warn( msg );
-                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
             }
             next.move( oriChildName, newParentName, newRn, deleteOldRn );
 
@@ -859,7 +859,7 @@
             {
                 String msg = "Will not allow rename operation on entries with administrative descendants.";
                 log.warn( msg );
-                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOTALLOWEDONRDN );
+                throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
             }
             next.move( oriChildName, newParentName );
 
@@ -971,7 +971,7 @@
             {
                 String msg = "failed to parse the new subtreeSpecification";
                 log.error( msg, e );
-                throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
+                throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
             }
 
             subentryCache.setSubentry( name.toNormName(), ssNew, getSubentryTypes( entry, modOp, mods ) );
@@ -1056,7 +1056,7 @@
             {
                 String msg = "failed to parse the new subtreeSpecification";
                 log.error( msg, e );
-                throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALIDATTRIBUTESYNTAX );
+                throw new LdapInvalidAttributeValueException( msg, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
             }
 
             subentryCache.setSubentry( name.toNormName(), ssNew, getSubentryTypes( entry, mods ) );

Modified: directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java Mon Nov 13 16:54:03 2006
@@ -173,7 +173,7 @@
             {
                 String msg = "failed to parse entryTrigger: " + triggerString;
                 log.error( msg, e );
-                throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONSERROR );
+                throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONS_ERROR );
             }
 
             triggerSpecs.add( item );

Modified: directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Mon Nov 13 16:54:03 2006
@@ -147,7 +147,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
 
         // this should fail since the modify operation tries to delete all
@@ -162,7 +162,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
     }
 
@@ -210,7 +210,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
 
         // this should fail since the modify operation tries to delete all
@@ -226,7 +226,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
     }
 
@@ -254,7 +254,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
 
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
@@ -272,7 +272,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
 
         // should succeed since the value being deleted from the rdn attribute is
@@ -291,7 +291,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
     }
 
@@ -319,7 +319,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
 
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
@@ -337,7 +337,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
 
         // should succeed since the values being replaced from the rdn attribute is
@@ -357,7 +357,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
     }
 
@@ -395,7 +395,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
 
         // this should fail since the modify operation tries to delete all
@@ -408,7 +408,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
     }
 
@@ -450,7 +450,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
 
         // this should fail since the modify operation tries to delete all
@@ -464,7 +464,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECTCLASSMODSPROHIBITED );
+            assertEquals( e.getResultCode(), ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
         }
     }
 
@@ -491,7 +491,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
 
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
@@ -507,7 +507,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
 
         // should succeed since the value being deleted from the rdn attribute is
@@ -522,7 +522,7 @@
         }
         catch ( LdapSchemaViolationException e )
         {
-            assertEquals( ResultCodeEnum.NOTALLOWEDONRDN, e.getResultCode() );
+            assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_RDN, e.getResultCode() );
         }
     }
 

Modified: directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/branches/apacheds-schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Mon Nov 13 16:54:03 2006
@@ -101,7 +101,7 @@
         }
         catch ( LdapNamingException e )
         {
-            assertEquals( ResultCodeEnum.OPERATIONSERROR, e.getResultCode() );
+            assertEquals( ResultCodeEnum.OPERATIONS_ERROR, e.getResultCode() );
         }
 
         attr = new BasicAttribute( "objectClass" );

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java (original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java Mon Nov 13 16:54:03 2006
@@ -393,7 +393,7 @@
                     {
                         ResultResponse resp = req.getResultResponse();
                         resp.getLdapResult().setErrorMessage( "Unsupport critical control: " + control.getID() );
-                        resp.getLdapResult().setResultCode( ResultCodeEnum.UNAVAILABLECRITICALEXTENSION );
+                        resp.getLdapResult().setResultCode( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
                         session.write( resp );
                         return;
                     }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java (original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java Mon Nov 13 16:54:03 2006
@@ -121,8 +121,8 @@
             result.setErrorMessage( msg );
 
             if ( ( e.getResolvedName() != null )
-                && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM )
-                    || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM ) ) )
+                && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
+                    || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
             {
                 result.setMatchedDn( (LdapDN)e.getResolvedName() );
             }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java (original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java Mon Nov 13 16:54:03 2006
@@ -67,7 +67,7 @@
         
         if ( !req.getVersion3() )
         {
-            result.setResultCode( ResultCodeEnum.PROTOCOLERROR );
+            result.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
             result.setErrorMessage( "Only LDAP v3 is supported" );
             session.write( req.getResultResponse() );
             return;
@@ -76,7 +76,7 @@
         // if the bind request is not simple then we freak: no strong auth yet
         if ( !req.isSimple() )
         {
-            result.setResultCode( ResultCodeEnum.AUTHMETHODNOTSUPPORTED );
+            result.setResultCode( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
             result.setErrorMessage( "Only simple binds currently supported" );
             session.write( req.getResultResponse() );
             return;
@@ -143,8 +143,8 @@
             }
 
             if ( ( e.getResolvedName() != null )
-                && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM )
-                    || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM ) ) )
+                && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
+                    || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
             {
                 result.setMatchedDn( (LdapDN)e.getResolvedName() );
             }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/CompareHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/CompareHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/CompareHandler.java (original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/CompareHandler.java Mon Nov 13 16:54:03 2006
@@ -80,11 +80,11 @@
 
             if ( newCtx.compare( req.getName(), req.getAttributeId(), req.getAssertionValue() ) )
             {
-                result.setResultCode( ResultCodeEnum.COMPARETRUE );
+                result.setResultCode( ResultCodeEnum.COMPARE_TRUE );
             }
             else
             {
-                result.setResultCode( ResultCodeEnum.COMPAREFALSE );
+                result.setResultCode( ResultCodeEnum.COMPARE_FALSE );
             }
         }
         catch ( ReferralException e )
@@ -133,8 +133,8 @@
                 NamingException ne = ( NamingException ) e;
 
                 if ( ( ne.getResolvedName() != null )
-                    && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM )
-                        || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM ) ) )
+                    && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
+                        || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
                 {
                     result.setMatchedDn( (LdapDN)ne.getResolvedName() );
                 }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DeleteHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DeleteHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DeleteHandler.java (original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/DeleteHandler.java Mon Nov 13 16:54:03 2006
@@ -114,8 +114,8 @@
             result.setResultCode( code );
             result.setErrorMessage( msg );
             if ( ( e.getResolvedName() != null )
-                && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM )
-                    || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM ) ) )
+                && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
+                    || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
             {
                 result.setMatchedDn( (LdapDN)e.getResolvedName() );
             }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ExtendedHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ExtendedHandler.java (original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ExtendedHandler.java Mon Nov 13 16:54:03 2006
@@ -88,7 +88,7 @@
             // error back to the client.
             String msg = "Unrecognized extended operation EXTENSION_OID: " + req.getOid();
             LdapResult result = req.getResultResponse().getLdapResult();
-            result.setResultCode( ResultCodeEnum.PROTOCOLERROR );
+            result.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
             result.setErrorMessage( msg );
             session.write( req.getResultResponse() );
         }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java (original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java Mon Nov 13 16:54:03 2006
@@ -71,7 +71,7 @@
         {
             // it is not allowed to modify the name of the Root DSE
             String msg = "Modify DN is not allowed on Root DSE.";
-            result.setResultCode( ResultCodeEnum.PROTOCOLERROR );
+            result.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
             result.setErrorMessage( msg );
             session.write( req.getResultResponse() );
         }
@@ -177,8 +177,8 @@
                 result.setErrorMessage( msg );
                 
                 if ( ( e.getResolvedName() != null )
-                    && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM )
-                        || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM ) ) )
+                    && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
+                        || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
                 {
                     result.setMatchedDn( (LdapDN)e.getResolvedName() );
                 }



Mime
View raw message