directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r476948 - in /directory/trunks/shared/ldap/src: main/java/org/apache/directory/shared/ldap/codec/ main/java/org/apache/directory/shared/ldap/message/ test/java/org/apache/directory/shared/ldap/message/
Date Sun, 19 Nov 2006 22:19:54 GMT
Author: elecharny
Date: Sun Nov 19 14:19:52 2006
New Revision: 476948

URL: http://svn.apache.org/viewvc?view=rev&rev=476948
Log:
Changed the MessageTypeEnum to become an enum instead of an subclass
of ValuedEnum (Java 5 migration)

Modified:
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponse.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponse.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponse.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponse.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponse.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageTypeEnum.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponse.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java
    directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
    directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java Sun Nov 19 14:19:52 2006
@@ -1172,45 +1172,48 @@
 
         twixMessage.setMessageId( msg.getMessageId() );
 
-        if ( msg.getType() == MessageTypeEnum.SEARCHRESENTRY )
+        switch ( msg.getType() )
         {
-            transformSearchResultEntry( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.SEARCHRESDONE )
-        {
-            transformSearchResultDone( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.SEARCHRESREF )
-        {
-            transformSearchResultReference( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.BINDRESPONSE )
-        {
-            transformBindResponse( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.ADDRESPONSE )
-        {
-            transformAddResponse( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.COMPARERESPONSE )
-        {
-            transformCompareResponse( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.DELRESPONSE )
-        {
-            transformDelResponse( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.MODIFYRESPONSE )
-        {
-            transformModifyResponse( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.MODDNRESPONSE )
-        {
-            transformModifyDNResponse( twixMessage, msg );
-        }
-        else if ( msg.getType() == MessageTypeEnum.EXTENDEDRESP )
-        {
-            transformExtendedResponse( twixMessage, msg );
+            case SEARCH_RES_ENTRY :
+                transformSearchResultEntry( twixMessage, msg );
+                break;
+                
+            case SEARCH_RES_DONE :
+                transformSearchResultDone( twixMessage, msg );
+                break;
+                
+            case SEARCH_RES_REF :
+                transformSearchResultReference( twixMessage, msg );
+                break;
+                
+            case BIND_REQUEST :
+                transformBindResponse( twixMessage, msg );
+                break;
+                
+            case ADD_RESPONSE :
+                transformAddResponse( twixMessage, msg );
+                break;
+                
+            case COMPARE_RESPONSE :
+                transformCompareResponse( twixMessage, msg );
+                break;
+                
+            case DEL_RESPONSE :
+                transformDelResponse( twixMessage, msg );
+                break;
+         
+            case MODIFY_RESPONSE :
+                transformModifyResponse( twixMessage, msg );
+                break;
+
+            case MOD_DN_RESPONSE :
+                transformModifyDNResponse( twixMessage, msg );
+                break;
+                
+            case EXTENDED_RESP :
+                transformExtendedResponse( twixMessage, msg );
+                break;
+                
         }
 
         // We also have to transform the controls...

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequest.java Sun Nov 19 14:19:52 2006
@@ -30,7 +30,7 @@
 public interface AbandonRequest extends Request
 {
     /** Ldap abandon request type code */
-    MessageTypeEnum TYPE = MessageTypeEnum.ABANDONREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.ABANDON_REQUEST;
 
 
     /**

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java Sun Nov 19 14:19:52 2006
@@ -35,7 +35,7 @@
 public interface AddRequest extends SingleReplyRequest, AbandonableRequest
 {
     /** LDAPv3 add request type enum code */
-    MessageTypeEnum TYPE = MessageTypeEnum.ADDREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.ADD_REQUEST;
 
     /** LDAPv3 add response type enum code */
     MessageTypeEnum RESP_TYPE = AddResponse.TYPE;

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponse.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponse.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponse.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponse.java Sun Nov 19 14:19:52 2006
@@ -31,5 +31,5 @@
 public interface AddResponse extends ResultResponse
 {
     /** Add response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.ADDRESPONSE;
+    MessageTypeEnum TYPE = MessageTypeEnum.ADD_RESPONSE;
 }

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java Sun Nov 19 14:19:52 2006
@@ -32,7 +32,7 @@
 public interface BindRequest extends SingleReplyRequest
 {
     /** Bind request message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.BINDREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.BIND_REQUEST;
 
     /** Bind response message type enumeration value */
     MessageTypeEnum RESP_TYPE = BindResponse.TYPE;

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponse.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponse.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponse.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponse.java Sun Nov 19 14:19:52 2006
@@ -31,7 +31,7 @@
 public interface BindResponse extends ResultResponse
 {
     /** Bind response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.BINDRESPONSE;
+    MessageTypeEnum TYPE = MessageTypeEnum.BIND_RESPONSE;
 
 
     /**

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java Sun Nov 19 14:19:52 2006
@@ -32,7 +32,7 @@
 public interface CompareRequest extends SingleReplyRequest, AbandonableRequest
 {
     /** Compare request message type enum code */
-    MessageTypeEnum TYPE = MessageTypeEnum.COMPAREREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.COMPARE_REQUEST;
 
     /** Compare response message type enum code */
     MessageTypeEnum RESP_TYPE = CompareResponse.TYPE;

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponse.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponse.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponse.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponse.java Sun Nov 19 14:19:52 2006
@@ -30,5 +30,5 @@
 public interface CompareResponse extends ResultResponse
 {
     /** Compare response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.COMPARERESPONSE;
+    MessageTypeEnum TYPE = MessageTypeEnum.COMPARE_RESPONSE;
 }

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java Sun Nov 19 14:19:52 2006
@@ -32,7 +32,7 @@
 public interface DeleteRequest extends SingleReplyRequest, AbandonableRequest
 {
     /** Delete request message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.DELREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.DEL_REQUEST;
 
     /** Delete response message type enumeration value */
     MessageTypeEnum RESP_TYPE = DeleteResponse.TYPE;

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponse.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponse.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponse.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponse.java Sun Nov 19 14:19:52 2006
@@ -30,5 +30,5 @@
 public interface DeleteResponse extends ResultResponse
 {
     /** Delete response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.DELRESPONSE;
+    MessageTypeEnum TYPE = MessageTypeEnum.DEL_RESPONSE;
 }

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequest.java Sun Nov 19 14:19:52 2006
@@ -56,7 +56,7 @@
 public interface ExtendedRequest extends SingleReplyRequest, javax.naming.ldap.ExtendedRequest
 {
     /** Extended request message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.EXTENDEDREQ;
+    MessageTypeEnum TYPE = MessageTypeEnum.EXTENDED_REQ;
 
     /** Extended response message type enumeration value */
     MessageTypeEnum RESP_TYPE = ExtendedResponse.TYPE;

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponse.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponse.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponse.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponse.java Sun Nov 19 14:19:52 2006
@@ -30,7 +30,7 @@
 public interface ExtendedResponse extends ResultResponse, javax.naming.ldap.ExtendedResponse
 {
     /** Extended response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.EXTENDEDRESP;
+    MessageTypeEnum TYPE = MessageTypeEnum.EXTENDED_RESP;
 
 
     /**

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageTypeEnum.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageTypeEnum.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageTypeEnum.java Sun Nov 19 14:19:52 2006
@@ -19,152 +19,93 @@
  */
 package org.apache.directory.shared.ldap.message;
 
-
-import org.apache.directory.shared.ldap.util.ValuedEnum;
-
-
 /**
  * Type safe enumeration over the various LDAPv3 message types.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Revision$
  */
-public class MessageTypeEnum extends ValuedEnum
+public enum MessageTypeEnum
 {
-    static final long serialVersionUID = 4297707466257974528L;
-
     /** Bind request protocol message type value */
-    public static final int BINDREQUEST_VAL = 0x40000000;
+    BIND_REQUEST( 0x40000000 ),
 
     /** Bind response protocol message type value */
-    public static final int BINDRESPONSE_VAL = 0x40000001;
+    BIND_RESPONSE( 0x40000001 ),
 
     /** Unbind request protocol message type value */
-    public static final int UNBINDREQUEST_VAL = 0x40000002;
+    UNBIND_REQUEST( 0x40000002 ),
 
     /** Search request protocol message type value */
-    public static final int SEARCHREQUEST_VAL = 0x40000003;
+    SEARCH_REQUEST( 0x40000003 ),
 
     /** Search entry response protocol message type value */
-    public static final int SEARCHRESENTRY_VAL = 0x40000004;
+    SEARCH_RES_ENTRY( 0x40000004 ),
 
     /** Search done response protocol message type value */
-    public static final int SEARCHRESDONE_VAL = 0x40000005;
+    SEARCH_RES_DONE( 0x40000005 ),
 
     /** Search reference response protocol message type value */
-    public static final int SEARCHRESREF_VAL = 0x40000013;
+    SEARCH_RES_REF( 0x40000013 ),
 
     /** Modify request protocol message type value */
-    public static final int MODIFYREQUEST_VAL = 0x40000006;
+    MODIFY_REQUEST( 0x40000006 ),
 
     /** Modify response protocol message type value */
-    public static final int MODIFYRESPONSE_VAL = 0x40000007;
+    MODIFY_RESPONSE( 0x40000007 ),
 
     /** Add request protocol message type value */
-    public static final int ADDREQUEST_VAL = 0x40000008;
+    ADD_REQUEST( 0x40000008 ),
 
     /** Add response protocol message type value */
-    public static final int ADDRESPONSE_VAL = 0x40000009;
+    ADD_RESPONSE( 0x40000009 ),
 
     /** Delete request protocol message type value */
-    public static final int DELREQUEST_VAL = 0x4000000a;
+    DEL_REQUEST( 0x4000000 ),
 
     /** Delete response protocol message type value */
-    public static final int DELRESPONSE_VAL = 0x4000000b;
+    DEL_RESPONSE( 0x4000000b ),
 
     /** Modify DN request protocol message type value */
-    public static final int MODDNREQUEST_VAL = 0x4000000c;
+    MOD_DN_REQUEST( 0x4000000c ),
 
     /** Modify DN response protocol message type value */
-    public static final int MODDNRESPONSE_VAL = 0x4000000d;
+    MOD_DN_RESPONSE( 0x4000000d ),
 
     /** Compare request protocol message type value */
-    public static final int COMPAREREQUEST_VAL = 0x4000000e;
+    COMPARE_REQUEST( 0x4000000e ),
 
     /** Compare response protocol message type value */
-    public static final int COMPARERESPONSE_VAL = 0x4000000f;
+    COMPARE_RESPONSE( 0x4000000f ),
 
     /** Abandon request protocol message type value */
-    public static final int ABANDONREQUEST_VAL = 0x40000010;
+    ABANDON_REQUEST( 0x40000010 ),
 
     /** Extended request protocol message type value */
-    public static final int EXTENDEDREQ_VAL = 0x40000017;
+    EXTENDED_REQ( 0x40000017 ),
 
     /** Extended response protocol message type value */
-    public static final int EXTENDEDRESP_VAL = 0x40000018;
-
-    /** Bind request protocol message type */
-    public static final MessageTypeEnum BINDREQUEST = new MessageTypeEnum( "BINDREQUEST", BINDREQUEST_VAL );
-
-    /** Bind response protocol message type */
-    public static final MessageTypeEnum BINDRESPONSE = new MessageTypeEnum( "BINDRESPONSE", BINDRESPONSE_VAL );
-
-    /** Unbind request protocol message type */
-    public static final MessageTypeEnum UNBINDREQUEST = new MessageTypeEnum( "UNBINDREQUEST", UNBINDREQUEST_VAL );
-
-    /** Search request protocol message type */
-    public static final MessageTypeEnum SEARCHREQUEST = new MessageTypeEnum( "SEARCHREQUEST", SEARCHREQUEST_VAL );
-
-    /** Search entry response protocol message type */
-    public static final MessageTypeEnum SEARCHRESENTRY = new MessageTypeEnum( "SEARCHRESENTRY", SEARCHRESENTRY_VAL );
-
-    /** Search done response protocol message type */
-    public static final MessageTypeEnum SEARCHRESDONE = new MessageTypeEnum( "SEARCHRESDONE", SEARCHRESDONE_VAL );
-
-    /** Search reference response protocol message type */
-    public static final MessageTypeEnum SEARCHRESREF = new MessageTypeEnum( "SEARCHRESREF", SEARCHRESREF_VAL );
-
-    /** Modify request protocol message type */
-    public static final MessageTypeEnum MODIFYREQUEST = new MessageTypeEnum( "MODIFYREQUEST", MODIFYREQUEST_VAL );
-
-    /** Modify response protocol message type */
-    public static final MessageTypeEnum MODIFYRESPONSE = new MessageTypeEnum( "MODIFYRESPONSE", MODIFYRESPONSE_VAL );
-
-    /** Add request protocol message type */
-    public static final MessageTypeEnum ADDREQUEST = new MessageTypeEnum( "ADDREQUEST", ADDREQUEST_VAL );
-
-    /** Add response protocol message type */
-    public static final MessageTypeEnum ADDRESPONSE = new MessageTypeEnum( "ADDRESPONSE", ADDRESPONSE_VAL );
-
-    /** Delete request protocol message type */
-    public static final MessageTypeEnum DELREQUEST = new MessageTypeEnum( "DELREQUEST", DELREQUEST_VAL );
-
-    /** Delete response protocol message type */
-    public static final MessageTypeEnum DELRESPONSE = new MessageTypeEnum( "DELRESPONSE", DELRESPONSE_VAL );
-
-    /** Modify DN request protocol message type */
-    public static final MessageTypeEnum MODDNREQUEST = new MessageTypeEnum( "MODDNREQUEST", MODDNREQUEST_VAL );
-
-    /** Modify DN response protocol message type */
-    public static final MessageTypeEnum MODDNRESPONSE = new MessageTypeEnum( "MODDNRESPONSE", MODDNRESPONSE_VAL );
-
-    /** Compare request protocol message type */
-    public static final MessageTypeEnum COMPAREREQUEST = new MessageTypeEnum( "COMPAREREQUEST", COMPAREREQUEST_VAL );
-
-    /** Compare response protocol message type */
-    public static final MessageTypeEnum COMPARERESPONSE = new MessageTypeEnum( "COMPARERESPONSE", COMPARERESPONSE_VAL );
-
-    /** Abandon request protocol message type */
-    public static final MessageTypeEnum ABANDONREQUEST = new MessageTypeEnum( "ABANDONREQUEST", ABANDONREQUEST_VAL );
-
-    /** Extended request protocol message type */
-    public static final MessageTypeEnum EXTENDEDREQ = new MessageTypeEnum( "EXTENDEDREQ", EXTENDEDREQ_VAL );
-
-    /** Extended response protocol message type */
-    public static final MessageTypeEnum EXTENDEDRESP = new MessageTypeEnum( "EXTENDEDRESP", EXTENDEDRESP_VAL );
-
+    EXTENDED_RESP( 0x40000018 );
+    
+    private int messageType;
 
     /**
      * Private construct so no other instances can be created other than the
      * public static constants in this class.
      * 
-     * @param a_name
-     *            a string name for the enumeration value.
-     * @param a_value
+     * @param messageType
      *            the integer value of the enumeration.
      */
-    private MessageTypeEnum(final String a_name, final int a_value)
+    private MessageTypeEnum( int messageType )
+    {
+        this.messageType = messageType;
+    }
+    
+    /**
+     * @return The integer associated with the result code
+     */
+    public int getMessageType()
     {
-        super( a_name, a_value );
+        return messageType;
     }
 }

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java Sun Nov 19 14:19:52 2006
@@ -68,7 +68,7 @@
 public interface ModifyDnRequest extends SingleReplyRequest, AbandonableRequest
 {
     /** Modify DN request message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.MODDNREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.MOD_DN_REQUEST;
 
     /** Modify DN response message type enumeration value */
     MessageTypeEnum RESP_TYPE = ModifyDnResponse.TYPE;

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java Sun Nov 19 14:19:52 2006
@@ -30,5 +30,5 @@
 public interface ModifyDnResponse extends ResultResponse
 {
     /** Modify DN response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.MODDNRESPONSE;
+    MessageTypeEnum TYPE = MessageTypeEnum.MOD_DN_RESPONSE;
 }

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java Sun Nov 19 14:19:52 2006
@@ -99,7 +99,7 @@
 public interface ModifyRequest extends SingleReplyRequest, AbandonableRequest
 {
     /** Modify request message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.MODIFYREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.MODIFY_REQUEST;
 
     /** Modify response message type enumeration value */
     MessageTypeEnum RESP_TYPE = ModifyResponse.TYPE;

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponse.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponse.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponse.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponse.java Sun Nov 19 14:19:52 2006
@@ -29,5 +29,5 @@
 public interface ModifyResponse extends ResultResponse
 {
     /** Modify response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.MODIFYRESPONSE;
+    MessageTypeEnum TYPE = MessageTypeEnum.MODIFY_RESPONSE;
 }

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java Sun Nov 19 14:19:52 2006
@@ -2160,65 +2160,84 @@
         }
 
         Set candidates = Collections.EMPTY_SET;
-        switch ( type.getValue() )
+        
+        switch ( type )
         {
-            case ( MessageTypeEnum.ABANDONREQUEST_VAL  ):
+            case ABANDON_REQUEST :
                 return ( ResultCodeEnum ) set.iterator().next();
-            case ( MessageTypeEnum.ADDREQUEST_VAL  ):
+                
+            case ADD_REQUEST :
                 candidates = intersection( set, ADD_CODES );
                 break;
-            case ( MessageTypeEnum.ADDRESPONSE_VAL  ):
+                
+            case ADD_RESPONSE :
                 candidates = intersection( set, ADD_CODES );
                 break;
-            case ( MessageTypeEnum.BINDREQUEST_VAL  ):
+                
+            case BIND_REQUEST :
                 candidates = intersection( set, BIND_CODES );
                 break;
-            case ( MessageTypeEnum.BINDRESPONSE_VAL  ):
+                
+            case BIND_RESPONSE :
                 candidates = intersection( set, BIND_CODES );
                 break;
-            case ( MessageTypeEnum.COMPAREREQUEST_VAL  ):
+                
+            case COMPARE_REQUEST :
                 candidates = intersection( set, COMPARE_CODES );
                 break;
-            case ( MessageTypeEnum.COMPARERESPONSE_VAL  ):
+                
+            case COMPARE_RESPONSE :
                 candidates = intersection( set, COMPARE_CODES );
                 break;
-            case ( MessageTypeEnum.DELREQUEST_VAL  ):
+                
+            case DEL_REQUEST :
                 candidates = intersection( set, DELETE_CODES );
                 break;
-            case ( MessageTypeEnum.DELRESPONSE_VAL  ):
+                
+            case DEL_RESPONSE :
                 candidates = intersection( set, DELETE_CODES );
                 break;
-            case ( MessageTypeEnum.EXTENDEDREQ_VAL  ):
+                
+            case EXTENDED_REQ :
                 candidates = intersection( set, EXTENDED_CODES );
                 break;
-            case ( MessageTypeEnum.EXTENDEDRESP_VAL  ):
+                
+            case EXTENDED_RESP :
                 candidates = intersection( set, EXTENDED_CODES );
                 break;
-            case ( MessageTypeEnum.MODDNREQUEST_VAL  ):
+                
+            case MOD_DN_REQUEST :
                 candidates = intersection( set, MODIFYDN_CODES );
                 break;
-            case ( MessageTypeEnum.MODDNRESPONSE_VAL  ):
+                
+            case MOD_DN_RESPONSE :
                 candidates = intersection( set, MODIFYDN_CODES );
                 break;
-            case ( MessageTypeEnum.MODIFYREQUEST_VAL  ):
+                
+            case MODIFY_REQUEST :
                 candidates = intersection( set, MODIFY_CODES );
                 break;
-            case ( MessageTypeEnum.MODIFYRESPONSE_VAL  ):
+                
+            case MODIFY_RESPONSE :
                 candidates = intersection( set, MODIFY_CODES );
                 break;
-            case ( MessageTypeEnum.SEARCHREQUEST_VAL  ):
+                
+            case SEARCH_REQUEST :
                 candidates = intersection( set, SEARCH_CODES );
                 break;
-            case ( MessageTypeEnum.SEARCHRESDONE_VAL  ):
+                
+            case SEARCH_RES_DONE :
                 candidates = intersection( set, SEARCH_CODES );
                 break;
-            case ( MessageTypeEnum.SEARCHRESENTRY_VAL  ):
+                
+            case SEARCH_RES_ENTRY :
                 candidates = intersection( set, SEARCH_CODES );
                 break;
-            case ( MessageTypeEnum.SEARCHRESREF_VAL  ):
+                
+            case SEARCH_RES_REF :
                 candidates = intersection( set, SEARCH_CODES );
                 break;
-            case ( MessageTypeEnum.UNBINDREQUEST_VAL  ):
+            case UNBIND_REQUEST :
                 return ( ResultCodeEnum ) set.iterator().next();
         }
 

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java Sun Nov 19 14:19:52 2006
@@ -35,7 +35,7 @@
 public interface SearchRequest extends ManyReplyRequest, AbandonableRequest
 {
     /** Search request protocol message type */
-    MessageTypeEnum TYPE = MessageTypeEnum.SEARCHREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_REQUEST;
 
     /**
      * Different response types that a search request may return. A search

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java Sun Nov 19 14:19:52 2006
@@ -30,5 +30,5 @@
 public interface SearchResponseDone extends ResultResponse
 {
     /** Search done response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.SEARCHRESDONE;
+    MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RES_DONE;
 }

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java Sun Nov 19 14:19:52 2006
@@ -36,7 +36,7 @@
 public interface SearchResponseEntry extends Response
 {
     /** Search entry response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.SEARCHRESENTRY;
+    MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RES_ENTRY;
 
 
     /**

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java Sun Nov 19 14:19:52 2006
@@ -31,7 +31,7 @@
 public interface SearchResponseReference extends Response
 {
     /** Search reference response message type enumeration value */
-    MessageTypeEnum TYPE = MessageTypeEnum.SEARCHRESREF;
+    MessageTypeEnum TYPE = MessageTypeEnum.SEARCH_RES_REF;
 
 
     /**

Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java Sun Nov 19 14:19:52 2006
@@ -29,5 +29,5 @@
 public interface UnbindRequest extends Request
 {
     /** Unbind request protocol message type */
-    MessageTypeEnum TYPE = MessageTypeEnum.UNBINDREQUEST;
+    MessageTypeEnum TYPE = MessageTypeEnum.UNBIND_REQUEST;
 }

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java Sun Nov 19 14:19:52 2006
@@ -41,7 +41,7 @@
     public void testEqualsSameObj()
     {
         AbstractMessage msg;
-        msg = new AbstractMessage( 5, MessageTypeEnum.BINDREQUEST )
+        msg = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -56,11 +56,11 @@
     {
         AbstractMessage msg0;
         AbstractMessage msg1;
-        msg0 = new AbstractMessage( 5, MessageTypeEnum.BINDREQUEST )
+        msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
-        msg1 = new AbstractMessage( 5, MessageTypeEnum.BINDREQUEST )
+        msg1 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -76,11 +76,11 @@
     {
         AbstractMessage msg0;
         AbstractMessage msg1;
-        msg0 = new AbstractMessage( 5, MessageTypeEnum.BINDREQUEST )
+        msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
-        msg1 = new AbstractMessage( 6, MessageTypeEnum.BINDREQUEST )
+        msg1 = new AbstractMessage( 6, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -96,11 +96,11 @@
     {
         AbstractMessage msg0;
         AbstractMessage msg1;
-        msg0 = new AbstractMessage( 5, MessageTypeEnum.BINDREQUEST )
+        msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
-        msg1 = new AbstractMessage( 5, MessageTypeEnum.UNBINDREQUEST )
+        msg1 = new AbstractMessage( 5, MessageTypeEnum.UNBIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -116,7 +116,7 @@
     {
         AbstractMessage msg0;
         AbstractMessage msg1;
-        msg0 = new AbstractMessage( 5, MessageTypeEnum.BINDREQUEST )
+        msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -169,7 +169,7 @@
                 return null;
             }
         } );
-        msg1 = new AbstractMessage( 5, MessageTypeEnum.BINDREQUEST )
+        msg1 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java Sun Nov 19 14:19:52 2006
@@ -48,7 +48,7 @@
     public void testEqualsSameObj()
     {
         AbstractResultResponse msg;
-        msg = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        msg = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -61,11 +61,11 @@
      */
     public void testEqualsExactCopy() throws InvalidNameException
     {
-        AbstractResultResponse msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        AbstractResultResponse msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
-        AbstractResultResponse msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        AbstractResultResponse msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -99,11 +99,11 @@
      */
     public void testNotEqualsDiffResult() throws InvalidNameException
     {
-        AbstractResultResponse msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        AbstractResultResponse msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
-        AbstractResultResponse msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        AbstractResultResponse msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -139,11 +139,11 @@
     {
         AbstractResultResponse msg0;
         AbstractResultResponse msg1;
-        msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
-        msg1 = new AbstractResultResponse( 6, MessageTypeEnum.BINDREQUEST )
+        msg1 = new AbstractResultResponse( 6, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -159,11 +159,11 @@
     {
         AbstractResultResponse msg0;
         AbstractResultResponse msg1;
-        msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
-        msg1 = new AbstractResultResponse( 5, MessageTypeEnum.UNBINDREQUEST )
+        msg1 = new AbstractResultResponse( 5, MessageTypeEnum.UNBIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -179,7 +179,7 @@
     {
         AbstractResultResponse msg0;
         AbstractResultResponse msg1;
-        msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };
@@ -232,7 +232,7 @@
                 return null;
             }
         } );
-        msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BINDREQUEST )
+        msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
         {
             private static final long serialVersionUID = 1L;
         };

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java Sun Nov 19 14:19:52 2006
@@ -199,7 +199,7 @@
 
             public MessageTypeEnum getResponseType()
             {
-                return MessageTypeEnum.ADDRESPONSE;
+                return MessageTypeEnum.ADD_RESPONSE;
             }
 
 
@@ -211,7 +211,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.ADDREQUEST;
+                return MessageTypeEnum.ADD_REQUEST;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java Sun Nov 19 14:19:52 2006
@@ -245,7 +245,7 @@
 
             public MessageTypeEnum getResponseType()
             {
-                return MessageTypeEnum.BINDREQUEST;
+                return MessageTypeEnum.BIND_REQUEST;
             }
 
 
@@ -257,7 +257,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.BINDREQUEST;
+                return MessageTypeEnum.BIND_REQUEST;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java Sun Nov 19 14:19:52 2006
@@ -182,7 +182,7 @@
 
             public MessageTypeEnum getResponseType()
             {
-                return MessageTypeEnum.COMPARERESPONSE;
+                return MessageTypeEnum.COMPARE_RESPONSE;
             }
 
 
@@ -194,7 +194,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.COMPAREREQUEST;
+                return MessageTypeEnum.COMPARE_REQUEST;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java Sun Nov 19 14:19:52 2006
@@ -121,7 +121,7 @@
 
             public MessageTypeEnum getResponseType()
             {
-                return MessageTypeEnum.DELRESPONSE;
+                return MessageTypeEnum.DEL_RESPONSE;
             }
 
 
@@ -133,7 +133,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.DELREQUEST;
+                return MessageTypeEnum.DEL_REQUEST;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java Sun Nov 19 14:19:52 2006
@@ -156,7 +156,7 @@
 
             public MessageTypeEnum getResponseType()
             {
-                return MessageTypeEnum.EXTENDEDRESP;
+                return MessageTypeEnum.EXTENDED_RESP;
             }
 
 
@@ -168,7 +168,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.EXTENDEDREQ;
+                return MessageTypeEnum.EXTENDED_REQ;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java Sun Nov 19 14:19:52 2006
@@ -160,7 +160,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.EXTENDEDRESP;
+                return MessageTypeEnum.EXTENDED_RESP;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java Sun Nov 19 14:19:52 2006
@@ -264,7 +264,7 @@
 
             public MessageTypeEnum getResponseType()
             {
-                return MessageTypeEnum.MODDNRESPONSE;
+                return MessageTypeEnum.MOD_DN_RESPONSE;
             }
 
 
@@ -276,7 +276,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.MODDNREQUEST;
+                return MessageTypeEnum.MOD_DN_REQUEST;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java Sun Nov 19 14:19:52 2006
@@ -306,7 +306,7 @@
 
             public MessageTypeEnum getResponseType()
             {
-                return MessageTypeEnum.MODIFYRESPONSE;
+                return MessageTypeEnum.MODIFY_RESPONSE;
             }
 
 
@@ -318,7 +318,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.MODIFYREQUEST;
+                return MessageTypeEnum.MODIFY_REQUEST;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java Sun Nov 19 14:19:52 2006
@@ -132,7 +132,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.SEARCHRESDONE;
+                return MessageTypeEnum.SEARCH_RES_DONE;
             }
 
 

Modified: directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java?view=diff&rev=476948&r1=476947&r2=476948
==============================================================================
--- directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java (original)
+++ directory/trunks/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java Sun Nov 19 14:19:52 2006
@@ -145,7 +145,7 @@
 
             public MessageTypeEnum getType()
             {
-                return MessageTypeEnum.SEARCHRESENTRY;
+                return MessageTypeEnum.SEARCH_RES_ENTRY;
             }
 
 



Mime
View raw message