You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2006/11/13 21:16:19 UTC
svn commit: r474487 [4/4] - in
/directory/branches/apacheds-schema/shared/ldap/src: main/antlr/
main/java/org/apache/directory/shared/ldap/codec/
main/java/org/apache/directory/shared/ldap/codec/actions/
main/java/org/apache/directory/shared/ldap/codec...
Modified: directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java Mon Nov 13 12:16:16 2006
@@ -517,21 +517,21 @@
sb.append( " Deref Aliases : " );
- switch ( derefAliases.getValue() )
+ switch ( derefAliases )
{
- case LdapConstants.NEVER_DEREF_ALIASES:
+ case NEVER_DEREF_ALIASES:
sb.append( "never Deref Aliases" );
break;
- case LdapConstants.DEREF_IN_SEARCHING:
+ case DEREF_IN_SEARCHING:
sb.append( "deref In Searching" );
break;
- case LdapConstants.DEREF_FINDING_BASE_OBJ:
+ case DEREF_FINDING_BASE_OBJ:
sb.append( "deref Finding Base Obj" );
break;
- case LdapConstants.DEREF_ALWAYS:
+ case DEREF_ALWAYS:
sb.append( "deref Always" );
break;
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDone.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntry.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReference.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownResponse.java Mon Nov 13 12:16:16 2006
@@ -45,17 +45,17 @@
{
super( messageId, EXTENSION_OID );
- switch ( rcode.getValue() )
+ switch ( rcode )
{
- case ( ResultCodeEnum.SUCCESS_VAL ):
+ case SUCCESS :
break;
- case ( ResultCodeEnum.OPERATIONSERROR_VAL ):
+ case OPERATIONS_ERROR:
break;
- case ( ResultCodeEnum.INSUFFICIENTACCESSRIGHTS_VAL ):
+ case INSUFFICIENT_ACCESS_RIGHTS :
break;
default:
throw new IllegalArgumentException( "The result code can only be one of: " + ResultCodeEnum.SUCCESS
- + ", " + ResultCodeEnum.OPERATIONSERROR + ", " + ResultCodeEnum.INSUFFICIENTACCESSRIGHTS );
+ + ", " + ResultCodeEnum.OPERATIONS_ERROR + ", " + ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
}
super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( rcode );
Modified: directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiResponse.java Mon Nov 13 12:16:16 2006
@@ -44,18 +44,22 @@
{
super( messageId, EXTENSION_OID );
- switch ( rcode.getValue() )
+ switch ( rcode )
{
- case ( ResultCodeEnum.SUCCESS_VAL ):
+ case SUCCESS :
break;
- case ( ResultCodeEnum.OPERATIONSERROR_VAL ):
+
+ case OPERATIONS_ERROR :
break;
- case ( ResultCodeEnum.INSUFFICIENTACCESSRIGHTS_VAL ):
+
+ case INSUFFICIENT_ACCESS_RIGHTS :
break;
+
default:
throw new IllegalArgumentException( "The result code can only be one of: " + ResultCodeEnum.SUCCESS
- + ", " + ResultCodeEnum.OPERATIONSERROR + ", " + ResultCodeEnum.INSUFFICIENTACCESSRIGHTS );
+ + ", " + ResultCodeEnum.OPERATIONS_ERROR + ", " + ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
}
+
super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( rcode );
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java Mon Nov 13 12:16:16 2006
@@ -111,27 +111,31 @@
public static NoticeOfDisconnect UNAVAILABLE = new NoticeOfDisconnect( ResultCodeEnum.UNAVAILABLE );
- public static NoticeOfDisconnect PROTOCOLERROR = new NoticeOfDisconnect( ResultCodeEnum.PROTOCOLERROR );
+ public static NoticeOfDisconnect PROTOCOLERROR = new NoticeOfDisconnect( ResultCodeEnum.PROTOCOL_ERROR );
- public static NoticeOfDisconnect STRONGAUTHREQUIRED = new NoticeOfDisconnect( ResultCodeEnum.STRONGAUTHREQUIRED );
+ public static NoticeOfDisconnect STRONGAUTHREQUIRED = new NoticeOfDisconnect( ResultCodeEnum.STRONG_AUTH_REQUIRED );
private NoticeOfDisconnect(ResultCodeEnum rcode)
{
super( 0, EXTENSION_OID );
- switch ( rcode.getValue() )
+ switch ( rcode )
{
- case ( ResultCodeEnum.UNAVAILABLE_VAL ):
+ case UNAVAILABLE :
break;
- case ( ResultCodeEnum.PROTOCOLERROR_VAL ):
+
+ case PROTOCOL_ERROR :
break;
- case ( ResultCodeEnum.STRONGAUTHREQUIRED_VAL ):
+
+ case STRONG_AUTH_REQUIRED :
break;
+
default:
throw new IllegalArgumentException( "The result code can only be one of: " + ResultCodeEnum.UNAVAILABLE
- + ", " + ResultCodeEnum.PROTOCOLERROR + ", " + ResultCodeEnum.STRONGAUTHREQUIRED );
+ + ", " + ResultCodeEnum.PROTOCOL_ERROR + ", " + ResultCodeEnum.STRONG_AUTH_REQUIRED );
}
+
super.getLdapResult().setErrorMessage( "The server will disconnect!" );
super.getLdapResult().setMatchedDn( null );
super.getLdapResult().setResultCode( rcode );
Modified: directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleEnum.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleEnum.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleEnum.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRuleEnum.java Mon Nov 13 12:16:16 2006
@@ -86,7 +86,7 @@
*/
public static MatchingRuleEnum getUsage( String usage )
{
- if ( usage.equalsIgnoreCase( MatchingRuleEnum.EQUALITY.getName() ) )
+ if ( usage.equalsIgnoreCase( MatchingRuleEnum.valueOf( EQUALITY ) ) );
{
return MatchingRuleEnum.EQUALITY;
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/Enum.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/Enum.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/Enum.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/Enum.java Mon Nov 13 12:16:16 2006
@@ -281,7 +281,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class Enum implements Comparable, Serializable
+public abstract class Enum1 implements Comparable, Serializable
{
/** Lang version 1.0.1 serial compatibility */
Modified: directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/EnumUtils.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/EnumUtils.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/EnumUtils.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/EnumUtils.java Mon Nov 13 12:16:16 2006
@@ -34,7 +34,7 @@
* @see ValuedEnum
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EnumUtils
+public class EnumUtils1
{
/**
Modified: directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/ValuedEnum.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/ValuedEnum.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/ValuedEnum.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/ValuedEnum.java Mon Nov 13 12:16:16 2006
@@ -129,7 +129,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class ValuedEnum extends Enum
+public abstract class ValuedEnum1 extends Enum
{
/** Lang version 1.0.1 serial compatibility */
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Mon Nov 13 12:16:16 2006
@@ -30,8 +30,8 @@
import org.apache.directory.shared.ldap.codec.LdapMessage;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.add.AddResponse;
-import org.apache.directory.shared.ldap.codec.util.LdapResultEnum;
import org.apache.directory.shared.ldap.codec.util.LdapURL;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.StringTools;
import java.nio.ByteBuffer;
@@ -377,7 +377,7 @@
AddResponse addResponse = message.getAddResponse();
assertEquals( 1, message.getMessageId() );
- assertEquals( LdapResultEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
assertEquals( "", addResponse.getLdapResult().getMatchedDN() );
assertEquals( "", addResponse.getLdapResult().getErrorMessage() );
@@ -452,7 +452,7 @@
AddResponse addResponse = message.getAddResponse();
assertEquals( 1, message.getMessageId() );
- assertEquals( LdapResultEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
assertEquals( "", addResponse.getLdapResult().getMatchedDN() );
assertEquals( "", addResponse.getLdapResult().getErrorMessage() );
@@ -531,7 +531,7 @@
AddResponse addResponse = message.getAddResponse();
assertEquals( 1, message.getMessageId() );
- assertEquals( LdapResultEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() );
assertEquals( "", addResponse.getLdapResult().getMatchedDN() );
assertEquals( "", addResponse.getLdapResult().getErrorMessage() );
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Mon Nov 13 12:16:16 2006
@@ -278,7 +278,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof AddResponseImpl );
- assertEquals( ResultCodeEnum.NAMINGVIOLATION, ((AddResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.NAMING_VIOLATION, ((AddResponseImpl)response).getLdapResult().getResultCode() );
return;
}
@@ -338,7 +338,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof AddResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((AddResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((AddResponseImpl)response).getLdapResult().getResultCode() );
return;
}
@@ -472,7 +472,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof AddResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDATTRIBUTESYNTAX, ((AddResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, ((AddResponseImpl)response).getLdapResult().getResultCode() );
return;
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Mon Nov 13 12:16:16 2006
@@ -270,7 +270,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof BindResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((BindResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((BindResponseImpl)response).getLdapResult().getResultCode() );
return;
}
catch ( NamingException ne )
@@ -966,7 +966,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof BindResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDCREDENTIALS, ((BindResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, ((BindResponseImpl)response).getLdapResult().getResultCode() );
return;
}
catch ( NamingException ne )
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java Mon Nov 13 12:16:16 2006
@@ -280,7 +280,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof CompareResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((CompareResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((CompareResponseImpl)response).getLdapResult().getResultCode() );
return;
}
}
@@ -326,7 +326,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof CompareResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDATTRIBUTESYNTAX, ((CompareResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, ((CompareResponseImpl)response).getLdapResult().getResultCode() );
return;
}
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Mon Nov 13 12:16:16 2006
@@ -148,7 +148,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof DeleteResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((DeleteResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((DeleteResponseImpl)response).getLdapResult().getResultCode() );
return;
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Mon Nov 13 12:16:16 2006
@@ -219,7 +219,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof ModifyResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((ModifyResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((ModifyResponseImpl)response).getLdapResult().getResultCode() );
return;
}
catch ( NamingException ne )
@@ -980,7 +980,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof ModifyResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDATTRIBUTESYNTAX, ((ModifyResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, ((ModifyResponseImpl)response).getLdapResult().getResultCode() );
return;
}
catch ( NamingException ne )
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Mon Nov 13 12:16:16 2006
@@ -166,7 +166,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof ModifyDnResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
return;
}
catch ( NamingException ne )
@@ -221,7 +221,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof ModifyDnResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
return;
}
catch ( NamingException ne )
@@ -276,7 +276,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof ModifyDnResponseImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
return;
}
catch ( NamingException ne )
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Mon Nov 13 12:16:16 2006
@@ -1526,7 +1526,7 @@
assertTrue( de instanceof ResponseCarryingException );
Message response = ((ResponseCarryingException)de).getResponse();
assertTrue( response instanceof SearchResponseDoneImpl );
- assertEquals( ResultCodeEnum.INVALIDDNSYNTAX, ((SearchResponseDoneImpl)response).getLdapResult().getResultCode() );
+ assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((SearchResponseDoneImpl)response).getLdapResult().getResultCode() );
return;
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java Mon Nov 13 12:16:16 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;
};
@@ -78,8 +78,8 @@
r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r0.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
- r1.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
+ r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
+ r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Referral refs0 = new ReferralImpl();
refs0.addLdapUrl( "ldap://someserver.com" );
@@ -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;
};
@@ -116,8 +116,8 @@
r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
r1.setMatchedDn( new LdapDN( "dc=apache,dc=org" ) );
- r0.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
- r1.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
+ r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
+ r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Referral refs0 = new ReferralImpl();
refs0.addLdapUrl( "ldap://someserver.com" );
@@ -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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java Mon Nov 13 12:16:16 2006
@@ -105,8 +105,8 @@
r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r0.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
- r1.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
+ r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
+ r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Referral refs0 = new ReferralImpl();
refs0.addLdapUrl( "ldap://someserver.com" );
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java Mon Nov 13 12:16:16 2006
@@ -160,7 +160,7 @@
public MessageTypeEnum getType()
{
- return MessageTypeEnum.EXTENDEDRESP;
+ return MessageTypeEnum.EXTENDED_RESP;
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java Mon Nov 13 12:16:16 2006
@@ -154,8 +154,8 @@
r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r0.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
- r1.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
+ r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
+ r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Referral refs0 = new ReferralImpl();
refs0.addLdapUrl( "ldap://someserver.com" );
@@ -184,8 +184,8 @@
r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r0.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
- r1.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
+ r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
+ r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Referral refs0 = new ReferralImpl();
refs0.addLdapUrl( "ldap://someserver.com" );
@@ -214,8 +214,8 @@
r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
r1.setMatchedDn( new LdapDN( "dc=apache,dc=org") );
- r0.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
- r1.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
+ r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
+ r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Referral refs0 = new ReferralImpl();
refs0.addLdapUrl( "ldap://someserver.com" );
@@ -244,8 +244,8 @@
r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r0.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
- r1.setResultCode( ResultCodeEnum.SIZELIMITEXCEEDED );
+ r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
+ r1.setResultCode( ResultCodeEnum.SIZE_LIMIT_EXCEEDED );
Referral refs0 = new ReferralImpl();
refs0.addLdapUrl( "ldap://someserver.com" );
@@ -274,8 +274,8 @@
r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r0.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
- r1.setResultCode( ResultCodeEnum.TIMELIMITEXCEEDED );
+ r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
+ r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Referral refs0 = new ReferralImpl();
r0.setReferral( refs0 );
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java Mon Nov 13 12:16:16 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/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java Mon Nov 13 12:16:16 2006
@@ -132,7 +132,7 @@
public MessageTypeEnum getType()
{
- return MessageTypeEnum.SEARCHRESDONE;
+ return MessageTypeEnum.SEARCH_RES_DONE;
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java Mon Nov 13 12:16:16 2006
@@ -145,7 +145,7 @@
public MessageTypeEnum getType()
{
- return MessageTypeEnum.SEARCHRESENTRY;
+ return MessageTypeEnum.SEARCH_RES_ENTRY;
}
Modified: directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java?view=diff&rev=474487&r1=474486&r2=474487
==============================================================================
--- directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java (original)
+++ directory/branches/apacheds-schema/shared/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java Mon Nov 13 12:16:16 2006
@@ -107,7 +107,7 @@
public MessageTypeEnum getType()
{
- return MessageTypeEnum.SEARCHRESREF;
+ return MessageTypeEnum.SEARCH_RES_REF;
}