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 2012/01/24 18:27:12 UTC
svn commit: r1235364 [21/27] - in /directory/shared/trunk:
asn1/api/src/main/java/org/apache/directory/shared/asn1/util/
asn1/api/src/test/java/org/apache/directory/shared/asn1/util/
asn1/ber/src/main/java/org/apache/directory/shared/asn1/actions/ asn1...
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java Tue Jan 24 17:27:00 2012
@@ -28,7 +28,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.util.Strings;
-
/**
* A simple {@link SyncInfoValue} implementation to store control properties.
*
@@ -186,16 +185,16 @@ public class SyncInfoValueImpl extends A
{
int h = 37;
- h = h*17 + super.hashCode();
- h = h*17 + type.getValue();
- h = h*17 + ( refreshDone ? 1 : 0 );
- h = h*17 + ( refreshDeletes ? 1 : 0 );
+ h = h * 17 + super.hashCode();
+ h = h * 17 + type.getValue();
+ h = h * 17 + ( refreshDone ? 1 : 0 );
+ h = h * 17 + ( refreshDeletes ? 1 : 0 );
if ( cookie != null )
{
for ( byte b : cookie )
{
- h = h*17 + b;
+ h = h * 17 + b;
}
}
@@ -207,7 +206,7 @@ public class SyncInfoValueImpl extends A
{
for ( byte b : bytes )
{
- h = h*17 + b;
+ h = h * 17 + b;
}
}
}
@@ -293,12 +292,12 @@ public class SyncInfoValueImpl extends A
switch ( getType() )
{
- case NEW_COOKIE :
+ case NEW_COOKIE:
sb.append( " newCookie : '" ).
append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
break;
- case REFRESH_DELETE :
+ case REFRESH_DELETE:
sb.append( " refreshDelete : \n" );
if ( getCookie() != null )
@@ -307,10 +306,10 @@ public class SyncInfoValueImpl extends A
append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
}
- sb.append( " refreshDone : " ).append( isRefreshDone() ).append( '\n' );
+ sb.append( " refreshDone : " ).append( isRefreshDone() ).append( '\n' );
break;
- case REFRESH_PRESENT :
+ case REFRESH_PRESENT:
sb.append( " refreshPresent : \n" );
if ( getCookie() != null )
@@ -319,10 +318,10 @@ public class SyncInfoValueImpl extends A
append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
}
- sb.append( " refreshDone : " ).append( isRefreshDone() ).append( '\n' );
+ sb.append( " refreshDone : " ).append( isRefreshDone() ).append( '\n' );
break;
- case SYNC_ID_SET :
+ case SYNC_ID_SET:
sb.append( " syncIdSet : \n" );
if ( getCookie() != null )
@@ -331,14 +330,14 @@ public class SyncInfoValueImpl extends A
append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
}
- sb.append( " refreshDeletes : " ).append( isRefreshDeletes() ).append( '\n' );
- sb.append( " syncUUIDS : " );
+ sb.append( " refreshDeletes : " ).append( isRefreshDeletes() ).append( '\n' );
+ sb.append( " syncUUIDS : " );
if ( getSyncUUIDs().size() != 0 )
{
boolean isFirst = true;
- for ( byte[] syncUUID: getSyncUUIDs() )
+ for ( byte[] syncUUID : getSyncUUIDs() )
{
if ( isFirst )
{
@@ -349,14 +348,14 @@ public class SyncInfoValueImpl extends A
sb.append( ", " );
}
- sb.append( Arrays.toString ( syncUUID ) );
+ sb.append( Arrays.toString( syncUUID ) );
}
sb.append( '\n' );
}
else
{
- sb.append( "empty\n" );
+ sb.append( "empty\n" );
}
break;
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncModifyDnType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncModifyDnType.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncModifyDnType.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncModifyDnType.java Tue Jan 24 17:27:00 2012
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.extras.controls;
+
/**
* The type of MODDN modification. One of MOVE, RENAME or MOVE_AND_RENAME
*
@@ -27,13 +28,14 @@ package org.apache.directory.shared.ldap
*/
public enum SyncModifyDnType
{
- MOVE( 0 ),
- RENAME( 1 ),
- MOVE_AND_RENAME( 2 );
-
+ MOVE(0),
+ RENAME(1),
+ MOVE_AND_RENAME(2);
+
/** Internal value for each tag */
private int value;
-
+
+
/**
* Creates the value
*/
@@ -41,8 +43,8 @@ public enum SyncModifyDnType
{
this.value = value;
}
-
-
+
+
/**
* @return The value associated with the current element.
*/
@@ -50,8 +52,8 @@ public enum SyncModifyDnType
{
return value;
}
-
-
+
+
/**
* Get the instance from it's interger value
* @param value The value we are looking for
@@ -61,13 +63,16 @@ public enum SyncModifyDnType
{
switch ( value )
{
- case 0 : return MOVE;
-
- case 1 : return RENAME;
-
- case 2 : return MOVE_AND_RENAME;
+ case 0:
+ return MOVE;
+
+ case 1:
+ return RENAME;
+
+ case 2:
+ return MOVE_AND_RENAME;
}
-
+
throw new IllegalArgumentException( "unknown modify dn operantion type " + value );
}
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java Tue Jan 24 17:27:00 2012
@@ -149,15 +149,15 @@ public class SyncRequestValueImpl extend
{
int h = 37;
- h = h*17 + super.hashCode();
- h = h*17 + ( isReloadHint ? 1 : 0 );
- h = h*17 + mode.getValue();
+ h = h * 17 + super.hashCode();
+ h = h * 17 + ( isReloadHint ? 1 : 0 );
+ h = h * 17 + mode.getValue();
if ( cookie != null )
{
for ( byte b : cookie )
{
- h = h*17 + b;
+ h = h * 17 + b;
}
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateTypeEnum.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateTypeEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateTypeEnum.java Tue Jan 24 17:27:00 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.extras.controls;
+
import org.apache.directory.shared.i18n.I18n;
@@ -95,7 +96,7 @@ public enum SyncStateTypeEnum
{
return MODDN;
}
-
+
throw new IllegalArgumentException( I18n.err( I18n.ERR_04163, value ) );
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java Tue Jan 24 17:27:00 2012
@@ -128,14 +128,14 @@ public class SyncStateValueImpl extends
{
int h = 37;
- h = h*17 + super.hashCode();
- h = h*17 + type.getValue();
+ h = h * 17 + super.hashCode();
+ h = h * 17 + type.getValue();
if ( cookie != null )
{
for ( byte b : cookie )
{
- h = h*17 + b;
+ h = h * 17 + b;
}
}
@@ -143,7 +143,7 @@ public class SyncStateValueImpl extends
{
for ( byte b : entryUuid )
{
- h = h*17 + b;
+ h = h * 17 + b;
}
}
@@ -189,7 +189,7 @@ public class SyncStateValueImpl extends
sb.append( " critical : " ).append( isCritical() ).append( '\n' );
sb.append( " syncStateType : '" ).append( getSyncStateType() ).append( "'\n" );
sb.append( " entryUUID : '" ).append( Strings.dumpBytes( getEntryUUID() ) ).append( "'\n" );
- sb.append( " cookie : '" ).append( Strings.dumpBytes( getCookie()) ).append( "'\n" );
+ sb.append( " cookie : '" ).append( Strings.dumpBytes( getCookie() ) ).append( "'\n" );
return sb.toString();
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationInfoEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationInfoEnum.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationInfoEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationInfoEnum.java Tue Jan 24 17:27:00 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.extras.controls;
+
/**
* This class describes the four possible Info values :
* <ul>
@@ -38,10 +39,10 @@ public enum SynchronizationInfoEnum
REFRESH_DELETE(1),
REFRESH_PRESENT(2),
SYNC_ID_SET(3);
-
+
/** The internal value */
private int value;
-
+
/**
* Private constructor so no other instances can be created other than the
@@ -54,7 +55,7 @@ public enum SynchronizationInfoEnum
this.value = value;
}
-
+
/**
* @return The value associated with the current element.
*/
@@ -62,8 +63,8 @@ public enum SynchronizationInfoEnum
{
return value;
}
-
-
+
+
/**
* Get the {@link SynchronizationInfoEnum} instance from an integer value.
*
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationModeEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationModeEnum.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationModeEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SynchronizationModeEnum.java Tue Jan 24 17:27:00 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.extras.controls;
+
/**
* This class describes the four possible synchronization mode, out of
* which only two are presently valid :
@@ -41,10 +42,10 @@ public enum SynchronizationModeEnum
REFRESH_ONLY(1),
RESERVED(2),
REFRESH_AND_PERSIST(3);
-
+
/** The internal value */
private int value;
-
+
/**
* Private constructor so no other instances can be created other than the
@@ -57,7 +58,7 @@ public enum SynchronizationModeEnum
this.value = value;
}
-
+
/**
* @return The value associated with the current element.
*/
@@ -65,8 +66,8 @@ public enum SynchronizationModeEnum
{
return value;
}
-
-
+
+
/**
* Get the {@link SynchronizationModeEnum} instance from an integer value.
*
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java Tue Jan 24 17:27:00 2012
@@ -44,8 +44,8 @@ public interface PasswordPolicy extends
* @return true if this Control carries a response, false if it is a request
*/
boolean hasResponse();
-
-
+
+
/**
* Sets the response. If null hasResponse() will return null and this will be
* handled as a password policy request control rather than a response control.
@@ -53,8 +53,8 @@ public interface PasswordPolicy extends
* @param response a valid response object, or null to make this a request
*/
void setResponse( PasswordPolicyResponse response );
-
-
+
+
/**
* If true sets the response to a default newly initialized response object.
* If this was previously a request, it automatically becomes a response. If it
@@ -68,8 +68,8 @@ public interface PasswordPolicy extends
* @return the old response object, if one did not exist null is returned
*/
PasswordPolicyResponse setResponse( boolean hasResponse );
-
-
+
+
/**
* Get's the response component of this control if this control carries a
* response. If {@link #hasResponse()} returns true, this will return a non-null
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyErrorEnum.java Tue Jan 24 17:27:00 2012
@@ -28,8 +28,16 @@ package org.apache.directory.shared.ldap
*/
public enum PasswordPolicyErrorEnum
{
- PASSWORD_EXPIRED(0), ACCOUNT_LOCKED(1), CHANGE_AFTER_RESET(2), PASSWORD_MOD_NOT_ALLOWED(3), MUST_SUPPLY_OLD_PASSWORD(
- 4), INSUFFICIENT_PASSWORD_QUALITY(5), PASSWORD_TOO_SHORT(6), PASSWORD_TOO_YOUNG(7), PASSWORD_IN_HISTORY(8);
+ PASSWORD_EXPIRED(0),
+ ACCOUNT_LOCKED(1),
+ CHANGE_AFTER_RESET(2),
+ PASSWORD_MOD_NOT_ALLOWED(3),
+ MUST_SUPPLY_OLD_PASSWORD(
+ 4),
+ INSUFFICIENT_PASSWORD_QUALITY(5),
+ PASSWORD_TOO_SHORT(6),
+ PASSWORD_TOO_YOUNG(7),
+ PASSWORD_IN_HISTORY(8);
private int value;
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java Tue Jan 24 17:27:00 2012
@@ -33,11 +33,11 @@ public class PasswordPolicyImpl implemen
{
/** The criticality of this {@link Control} */
private boolean criticality;
-
+
/** The password policy response component if this is a response control */
private PasswordPolicyResponse response;
-
-
+
+
/**
* Creates a new instance of a PasswordPolicy request Control without any
* response data associated with it.
@@ -101,7 +101,7 @@ public class PasswordPolicyImpl implemen
this.criticality = isCritical;
}
-
+
/**
*
* {@inheritDoc}
@@ -110,7 +110,7 @@ public class PasswordPolicyImpl implemen
{
this.response = response;
}
-
+
/**
* {@inheritDoc}
@@ -120,7 +120,7 @@ public class PasswordPolicyImpl implemen
return response != null;
}
-
+
/**
*
* {@inheritDoc}
@@ -128,7 +128,7 @@ public class PasswordPolicyImpl implemen
public PasswordPolicyResponse setResponse( boolean hasResponse )
{
PasswordPolicyResponse old = this.response;
-
+
if ( hasResponse )
{
this.response = new PasswordPolicyResponseImpl();
@@ -137,10 +137,10 @@ public class PasswordPolicyImpl implemen
{
this.response = null;
}
-
+
return old;
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponse.java Tue Jan 24 17:27:00 2012
@@ -34,12 +34,14 @@ public interface PasswordPolicyResponse
*/
int getTimeBeforeExpiration();
+
/**
* Set a date of expiration for the password
* @param timeBeforeExpiration The time before the password will expire
*/
void setTimeBeforeExpiration( int timeBeforeExpiration );
+
/**
* @return The number of possible attempts on the password before it's locked
*/
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyResponseImpl.java Tue Jan 24 17:27:00 2012
@@ -37,7 +37,7 @@ public class PasswordPolicyResponseImpl
/** number representing the password policy error */
private PasswordPolicyErrorEnum ppolicyError;
-
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java Tue Jan 24 17:27:00 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.extras.extended;
+
import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java Tue Jan 24 17:27:00 2012
@@ -43,6 +43,7 @@ public class CancelRequestImpl extends A
/** The cancelId of the request to be canceled */
private int cancelId;
+
/**
* Creates a new instance of CancelRequest.
*
@@ -66,18 +67,18 @@ public class CancelRequestImpl extends A
setRequestName( EXTENSION_OID );
}
-
+
public int getCancelId()
{
return cancelId;
}
-
-
+
+
public void setCancelId( int cancelId )
{
this.cancelId = cancelId;
}
-
+
public CancelResponse getResultResponse()
{
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java Tue Jan 24 17:27:00 2012
@@ -30,7 +30,8 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CertGenerationRequestImpl extends AbstractExtendedRequest<CertGenerationResponse> implements CertGenerationRequest
+public class CertGenerationRequestImpl extends AbstractExtendedRequest<CertGenerationResponse> implements
+ CertGenerationRequest
{
/** The serial version UUID */
private static final long serialVersionUID = 1L;
@@ -47,7 +48,7 @@ public class CertGenerationRequestImpl e
/** name of the algorithm used for generating the keys*/
private String keyAlgorithm;// = "RSA";
-
+
/**
* Creates a new instance of CertGenerationRequest.
*
@@ -57,7 +58,8 @@ public class CertGenerationRequestImpl e
* @param subjectDN Dn to be used as certificate's subject
* @param keyAlgorithm crypto algorithm name to be used for generating the keys
*/
- public CertGenerationRequestImpl( int messageId, String targerDN, String issuerDN, String subjectDN, String keyAlgorithm )
+ public CertGenerationRequestImpl( int messageId, String targerDN, String issuerDN, String subjectDN,
+ String keyAlgorithm )
{
super( messageId );
setRequestName( EXTENSION_OID );
@@ -154,8 +156,8 @@ public class CertGenerationRequestImpl e
{
return new CertGenerationResponseImpl();
}
-
-
+
+
@Override
public String toString()
{
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java Tue Jan 24 17:27:00 2012
@@ -36,6 +36,7 @@ public class CertGenerationResponseImpl
/** The serial version UUID */
private static final long serialVersionUID = 1L;
+
public CertGenerationResponseImpl( int messageId, ResultCodeEnum rcode )
{
super( messageId, EXTENSION_OID );
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java Tue Jan 24 17:27:00 2012
@@ -111,7 +111,6 @@ public class GracefulDisconnectResponseI
// Parameters of the Extended Response Value
// -----------------------------------------------------------------------
-
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse#getDelay()
*/
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java Tue Jan 24 17:27:00 2012
@@ -37,10 +37,10 @@ public interface GracefulShutdownRequest
/** The OID for the graceful shutdown extended operation request. */
String EXTENSION_OID = "1.3.6.1.4.1.18060.0.1.3";
-
+
/** Undetermined value used for offline time */
int UNDETERMINED = 0;
-
+
/** The shutdown is immediate */
int NOW = 0;
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java Tue Jan 24 17:27:00 2012
@@ -32,13 +32,14 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class GracefulShutdownRequestImpl extends AbstractExtendedRequest<GracefulShutdownResponse> implements GracefulShutdownRequest
+public class GracefulShutdownRequestImpl extends AbstractExtendedRequest<GracefulShutdownResponse> implements
+ GracefulShutdownRequest
{
/** The serialVersionUID. */
private static final long serialVersionUID = -4682291068700593492L;
private GracefulShutdownResponse response;
-
+
/** Offline time after disconnection */
private int timeOffline;
@@ -88,7 +89,6 @@ public class GracefulShutdownRequestImpl
// Parameters of the Extended Request Payload
// -----------------------------------------------------------------------
-
/**
* {@inheritDoc}
*/
@@ -132,7 +132,7 @@ public class GracefulShutdownRequestImpl
{
response = new GracefulShutdownResponseImpl();
}
-
+
return response;
}
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java Tue Jan 24 17:27:00 2012
@@ -97,7 +97,6 @@ public class GracefulShutdownResponseImp
// ExtendedResponse Interface Method Implementations
// ------------------------------------------------------------------------
-
/**
* Gets the OID uniquely identifying this extended response (a.k.a. its
* name).
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureParameter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureParameter.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureParameter.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureParameter.java Tue Jan 24 17:27:00 2012
@@ -45,8 +45,8 @@ public class StoredProcedureParameter
{
return Strings.utf8ToString( type );
}
-
-
+
+
/**
* Gets the value as a UTF8 String.
*
@@ -56,8 +56,8 @@ public class StoredProcedureParameter
{
return Strings.utf8ToString( value );
}
-
-
+
+
/**
* Gets the type as a byte[].
*
@@ -70,7 +70,7 @@ public class StoredProcedureParameter
return null;
}
- final byte[] copy = new byte[ type.length ];
+ final byte[] copy = new byte[type.length];
System.arraycopy( type, 0, copy, 0, type.length );
return copy;
}
@@ -85,10 +85,10 @@ public class StoredProcedureParameter
{
if ( type != null )
{
- this.type = new byte[ type.length ];
+ this.type = new byte[type.length];
System.arraycopy( type, 0, this.type, 0, type.length );
- }
- else
+ }
+ else
{
this.type = null;
}
@@ -107,7 +107,7 @@ public class StoredProcedureParameter
return null;
}
- final byte[] copy = new byte[ value.length ];
+ final byte[] copy = new byte[value.length];
System.arraycopy( value, 0, copy, 0, value.length );
return copy;
}
@@ -122,10 +122,10 @@ public class StoredProcedureParameter
{
if ( value != null )
{
- this.value = new byte[ value.length ];
+ this.value = new byte[value.length];
System.arraycopy( value, 0, this.value, 0, value.length );
- }
- else
+ }
+ else
{
this.value = null;
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java Tue Jan 24 17:27:00 2012
@@ -54,11 +54,11 @@ public interface StoredProcedureRequest
byte[] getProcedure();
-
-
+
+
void setProcedure( byte[] procedure );
-
+
/**
* Gets the procedure specification.
*
@@ -119,8 +119,9 @@ public interface StoredProcedureRequest
*/
void addParameter( Object type, Object value );
-
+
void addParameter( StoredProcedureParameter parameter );
+
List<StoredProcedureParameter> getParameters();
}
\ No newline at end of file
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java Tue Jan 24 17:27:00 2012
@@ -38,17 +38,18 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoredProcedureRequestImpl extends AbstractExtendedRequest<StoredProcedureResponse> implements StoredProcedureRequest
+public class StoredProcedureRequestImpl extends AbstractExtendedRequest<StoredProcedureResponse> implements
+ StoredProcedureRequest
{
/** The serialVersionUID. */
private static final long serialVersionUID = -4682291068700593492L;
-
+
private String language = "Java";
private byte[] procedure = StringConstants.EMPTY_BYTES;
private List<StoredProcedureParameter> parameters = new ArrayList<StoredProcedureParameter>();
-
+
private StoredProcedureResponse response;
@@ -87,13 +88,12 @@ public class StoredProcedureRequestImpl
this.language = language;
this.procedure = Strings.getBytesUtf8( procedure );
}
-
-
+
+
// -----------------------------------------------------------------------
// Parameters of the Extended Request Payload
// -----------------------------------------------------------------------
-
/**
* {@inheritDoc}
*/
@@ -119,7 +119,7 @@ public class StoredProcedureRequestImpl
return null;
}
- final byte[] copy = new byte[ procedure.length ];
+ final byte[] copy = new byte[procedure.length];
System.arraycopy( procedure, 0, copy, 0, procedure.length );
return copy;
}
@@ -129,7 +129,7 @@ public class StoredProcedureRequestImpl
{
if ( procedure != null )
{
- this.procedure = new byte[ procedure.length ];
+ this.procedure = new byte[procedure.length];
System.arraycopy( procedure, 0, this.procedure, 0, procedure.length );
}
else
@@ -183,7 +183,7 @@ public class StoredProcedureRequestImpl
*/
public Object getParameterType( int index )
{
- if ( ! language.equals( "java" ) )
+ if ( !language.equals( "java" ) )
{
return parameters.get( index ).getType();
}
@@ -195,16 +195,16 @@ public class StoredProcedureRequestImpl
/**
* {@inheritDoc}
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings( value = "BC_IMPOSSIBLE_INSTANCEOF",
- justification = "False positive")
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_IMPOSSIBLE_INSTANCEOF",
+ justification = "False positive")
public Object getParameterTypeString( int index )
{
- if ( ! language.equals( "java" ) )
+ if ( !language.equals( "java" ) )
{
Object obj = parameters.get( index ).getType();
if ( obj instanceof byte[] )
{
- return Strings.utf8ToString( ( byte [] ) obj );
+ return Strings.utf8ToString( ( byte[] ) obj );
}
}
@@ -226,7 +226,7 @@ public class StoredProcedureRequestImpl
*/
public Object getParameterValue( int index )
{
- if ( ! language.equals( "java" ) )
+ if ( !language.equals( "java" ) )
{
return parameters.get( index ).getValue();
}
@@ -238,23 +238,23 @@ public class StoredProcedureRequestImpl
/**
* {@inheritDoc}
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings( value = "BC_IMPOSSIBLE_INSTANCEOF",
- justification = "False positive")
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_IMPOSSIBLE_INSTANCEOF",
+ justification = "False positive")
public Object getParameterValueString( int index )
{
- if ( ! language.equals( "java" ) )
+ if ( !language.equals( "java" ) )
{
Object obj = parameters.get( index ).getValue();
if ( obj instanceof byte[] )
{
- String str = Strings.utf8ToString( ( byte [] ) obj );
+ String str = Strings.utf8ToString( ( byte[] ) obj );
String type = ( String ) getParameterTypeString( index );
-
+
if ( type.equals( "int" ) )
{
try
{
- return IntegerDecoder.parse( new Value( (byte[]) obj ) );
+ return IntegerDecoder.parse( new Value( ( byte[] ) obj ) );
}
catch ( IntegerDecoderException e )
{
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponseImpl.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureResponseImpl.java Tue Jan 24 17:27:00 2012
@@ -34,6 +34,7 @@ public class StoredProcedureResponseImpl
/** The Constant serialVersionUID. */
private static final long serialVersionUID = 7689434378578829994L;
+
/**
* Instantiates a new stored procedure response.
*
@@ -44,7 +45,7 @@ public class StoredProcedureResponseImpl
super( messageId, EXTENSION_OID );
}
-
+
/**
* Instantiates a new stored procedure response.
*/
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java Tue Jan 24 17:27:00 2012
@@ -58,8 +58,8 @@ import org.osgi.framework.ServiceReferen
public class ExtrasBundleActivator implements BundleActivator
{
private ServiceReference codecServiceRef;
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -70,8 +70,8 @@ public class ExtrasBundleActivator imple
registerExtrasControls( codec );
registerExtrasExtendedOps( codec );
}
-
-
+
+
/**
* Registers all the extras controls present in this control pack.
*
@@ -79,18 +79,18 @@ public class ExtrasBundleActivator imple
*/
private void registerExtrasControls( LdapApiService codec )
{
- ControlFactory<?,?> factory = new SyncDoneValueFactory( codec );
+ ControlFactory<?, ?> factory = new SyncDoneValueFactory( codec );
codec.registerControl( factory );
-
+
factory = new SyncInfoValueFactory( codec );
codec.registerControl( factory );
-
+
factory = new SyncRequestValueFactory( codec );
codec.registerControl( factory );
factory = new SyncStateValueFactory( codec );
codec.registerControl( factory );
-
+
factory = new PasswordPolicyFactory( codec );
codec.registerControl( factory );
}
@@ -106,49 +106,46 @@ public class ExtrasBundleActivator imple
// --------------------------------------------------------------------
// Register Extended Request Factories
// --------------------------------------------------------------------
-
-
- ExtendedRequestFactory<?,?> extReqfactory = new CancelFactory( codec );
+
+ ExtendedRequestFactory<?, ?> extReqfactory = new CancelFactory( codec );
codec.registerExtendedRequest( extReqfactory );
-
+
extReqfactory = new CertGenerationFactory( codec );
codec.registerExtendedRequest( extReqfactory );
extReqfactory = new GracefulShutdownFactory( codec );
codec.registerExtendedRequest( extReqfactory );
-
+
extReqfactory = new StoredProcedureFactory( codec );
codec.registerExtendedRequest( extReqfactory );
-
-
+
// --------------------------------------------------------------------
// Register Unsolicited Response Factories
// --------------------------------------------------------------------
-
-
+
UnsolicitedResponseFactory<?> unsolicitedResponseFactory = new GracefulDisconnectFactory( codec );
codec.registerUnsolicitedResponse( unsolicitedResponseFactory );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public void stop( BundleContext context ) throws Exception
{
LdapApiService codec = ( LdapApiService ) context.getService( codecServiceRef );
-
+
codec.unregisterControl( SyncDoneValue.OID );
codec.unregisterControl( SyncInfoValue.OID );
codec.unregisterControl( SyncRequestValue.OID );
codec.unregisterControl( SyncStateValue.OID );
codec.unregisterControl( PasswordPolicy.OID );
-
+
codec.unregisterExtendedRequest( CancelRequest.EXTENSION_OID );
codec.unregisterExtendedRequest( CertGenerationRequest.EXTENSION_OID );
codec.unregisterExtendedRequest( GracefulShutdownRequest.EXTENSION_OID );
codec.unregisterExtendedRequest( StoredProcedureRequest.EXTENSION_OID );
-
+
codec.unregisterUnsolicitedResponse( GracefulDisconnectResponse.EXTENSION_OID );
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java Tue Jan 24 17:27:00 2012
@@ -50,8 +50,8 @@ public class PasswordPolicyContainer ext
public PasswordPolicyContainer( LdapApiService codec, PasswordPolicy ppolicyResponse )
{
super();
-
- if( ppolicyResponse instanceof PasswordPolicyDecorator )
+
+ if ( ppolicyResponse instanceof PasswordPolicyDecorator )
{
this.control = ( PasswordPolicyDecorator ) ppolicyResponse;
}
@@ -59,7 +59,7 @@ public class PasswordPolicyContainer ext
{
control = new PasswordPolicyDecorator( codec, ppolicyResponse );
}
-
+
stateStack = new int[1];
grammar = PasswordPolicyGrammar.getInstance();
setTransition( PasswordPolicyStates.START_STATE );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java Tue Jan 24 17:27:00 2012
@@ -46,21 +46,21 @@ public class PasswordPolicyDecorator ext
{
/** An instance of this decoder */
private static final Asn1Decoder decoder = new Asn1Decoder();
-
+
// Storage for computed lengths
private int valueLength = 0;
private int ppolicySeqLength = 0;
private int warningLength = 0;
private int timeBeforeExpirationTagLength;
private int graceAuthNsRemainingTagLength;
-
-
+
+
public PasswordPolicyDecorator( LdapApiService codec )
{
super( codec, new PasswordPolicyImpl() );
}
-
-
+
+
public PasswordPolicyDecorator( LdapApiService codec, boolean hasResponse )
{
super( codec, new PasswordPolicyImpl( hasResponse ) );
@@ -71,7 +71,7 @@ public class PasswordPolicyDecorator ext
{
super( codec, policy );
}
-
+
/**
* {@inheritDoc}
@@ -83,12 +83,12 @@ public class PasswordPolicyDecorator ext
{
setResponse( null );
}
-
- if ( value != null && ! hasResponse() )
+
+ if ( value != null && !hasResponse() )
{
setResponse( true );
}
-
+
super.setValue( value );
}
@@ -103,11 +103,11 @@ public class PasswordPolicyDecorator ext
timeBeforeExpirationTagLength = 0;
graceAuthNsRemainingTagLength = 0;
- if ( ! hasResponse() )
+ if ( !hasResponse() )
{
return 0;
}
-
+
if ( getResponse().getTimeBeforeExpiration() >= 0 )
{
timeBeforeExpirationTagLength = TLV.getNbBytes( getResponse().getTimeBeforeExpiration() );
@@ -128,7 +128,7 @@ public class PasswordPolicyDecorator ext
{
ppolicySeqLength += 1 + 1 + 1;
}
-
+
if ( ppolicySeqLength > 0 )
{
valueLength = 1 + TLV.getNbBytes( ppolicySeqLength ) + ppolicySeqLength;
@@ -141,17 +141,17 @@ public class PasswordPolicyDecorator ext
@Override
public ByteBuffer encode( ByteBuffer buffer ) throws EncoderException
{
- if ( ! hasResponse() )
+ if ( !hasResponse() )
{
return buffer;
}
-
+
if ( buffer == null )
{
throw new EncoderException( I18n.err( I18n.ERR_04023 ) );
}
- if ( ( getResponse().getTimeBeforeExpiration() < 0 ) && ( getResponse().getGraceAuthNsRemaining() < 0 ) && (
+ if ( ( getResponse().getTimeBeforeExpiration() < 0 ) && ( getResponse().getGraceAuthNsRemaining() < 0 ) && (
getResponse().getPasswordPolicyError() == null ) )
{
return buffer;
@@ -165,7 +165,7 @@ public class PasswordPolicyDecorator ext
if ( warningLength > 0 )
{
// Encode the Warning tag
- buffer.put( ( byte )PasswordPolicyTags.PPOLICY_WARNING_TAG.getValue() );
+ buffer.put( ( byte ) PasswordPolicyTags.PPOLICY_WARNING_TAG.getValue() );
buffer.put( TLV.getBytes( warningLength ) );
if ( getResponse().getTimeBeforeExpiration() >= 0 )
@@ -181,10 +181,10 @@ public class PasswordPolicyDecorator ext
buffer.put( Value.getBytes( getResponse().getGraceAuthNsRemaining() ) );
}
}
-
+
if ( getResponse().getPasswordPolicyError() != null )
{
- buffer.put( (byte)PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue() );
+ buffer.put( ( byte ) PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue() );
buffer.put( ( byte ) 0x01 );
buffer.put( Value.getBytes( getResponse().getPasswordPolicyError().getValue() ) );
}
@@ -193,7 +193,7 @@ public class PasswordPolicyDecorator ext
return buffer;
}
-
+
@Override
public String toString()
{
@@ -201,19 +201,22 @@ public class PasswordPolicyDecorator ext
sb.append( " PasswordPolicyResponse control :\n" );
sb.append( " oid : '" ).append( getOid() ).append( '\n' );
-
+
if ( hasResponse() && getResponse().getTimeBeforeExpiration() >= 0 )
{
- sb.append( " timeBeforeExpiration : '" ).append( getResponse().getTimeBeforeExpiration() ).append( '\n' );
+ sb.append( " timeBeforeExpiration : '" ).append( getResponse().getTimeBeforeExpiration() )
+ .append( '\n' );
}
else if ( hasResponse() && getResponse().getGraceAuthNsRemaining() >= 0 )
{
- sb.append( " graceAuthNsRemaining : '" ).append( getResponse().getGraceAuthNsRemaining() ).append( '\n' );
+ sb.append( " graceAuthNsRemaining : '" ).append( getResponse().getGraceAuthNsRemaining() )
+ .append( '\n' );
}
if ( hasResponse() && getResponse().getPasswordPolicyError() != null )
{
- sb.append( " ppolicyError : '" ).append( getResponse().getPasswordPolicyError().toString() ).append( '\n' );
+ sb.append( " ppolicyError : '" ).append( getResponse().getPasswordPolicyError().toString() )
+ .append( '\n' );
}
return sb.toString();
@@ -225,11 +228,11 @@ public class PasswordPolicyDecorator ext
*/
public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
- if ( ! hasResponse() )
+ if ( !hasResponse() )
{
return this;
}
-
+
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
PasswordPolicyContainer container = new PasswordPolicyContainer( getCodecService(), this );
decoder.decode( bb, container );
@@ -245,8 +248,8 @@ public class PasswordPolicyDecorator ext
{
return getDecorated().hasResponse();
}
-
-
+
+
/**
*
* {@inheritDoc}
@@ -256,7 +259,7 @@ public class PasswordPolicyDecorator ext
getDecorated().setResponse( response );
}
-
+
/**
*
* {@inheritDoc}
@@ -265,7 +268,7 @@ public class PasswordPolicyDecorator ext
{
return getDecorated().setResponse( hasResponse );
}
-
+
/**
*
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java Tue Jan 24 17:27:00 2012
@@ -33,9 +33,9 @@ import org.apache.directory.shared.ldap.
*/
public class PasswordPolicyFactory implements ControlFactory<PasswordPolicy, PasswordPolicyDecorator>
{
-
+
private LdapApiService codec;
-
+
/**
* Creates a new instance of PasswordPolicyFactory.
@@ -45,7 +45,7 @@ public class PasswordPolicyFactory imple
{
this.codec = codec;
}
-
+
/**
*
@@ -56,7 +56,7 @@ public class PasswordPolicyFactory imple
return PasswordPolicy.OID;
}
-
+
/**
*
* {@inheritDoc}
@@ -65,7 +65,7 @@ public class PasswordPolicyFactory imple
{
return new PasswordPolicyDecorator( codec );
}
-
+
/**
*
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java Tue Jan 24 17:27:00 2012
@@ -55,61 +55,73 @@ public class PasswordPolicyGrammar exten
private static final PasswordPolicyGrammar INSTANCE = new PasswordPolicyGrammar();
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings(
+ { "unchecked", "rawtypes" })
private PasswordPolicyGrammar()
{
setName( PasswordPolicyGrammar.class.getName() );
super.transitions = new GrammarTransition[PasswordPolicyStates.END_STATE.ordinal()][256];
-
// PasswordPolicyResponseValue ::= SEQUENCE {
// ...
super.transitions[PasswordPolicyStates.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] = new GrammarTransition(
PasswordPolicyStates.START_STATE, PasswordPolicyStates.PPOLICY_SEQ_STATE, UniversalTag.SEQUENCE.getValue(),
- new PPolicyInit());
-
+ new PPolicyInit() );
+
// PasswordPolicyResponseValue ::= SEQUENCE {
// warning [0] CHOICE {
- super.transitions[PasswordPolicyStates.PPOLICY_SEQ_STATE.ordinal()][PasswordPolicyTags.PPOLICY_WARNING_TAG.getValue()] = new GrammarTransition(
- PasswordPolicyStates.PPOLICY_SEQ_STATE, PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE, PasswordPolicyTags.PPOLICY_WARNING_TAG.getValue(),
- new CheckNotNullLength());
-
+ super.transitions[PasswordPolicyStates.PPOLICY_SEQ_STATE.ordinal()][PasswordPolicyTags.PPOLICY_WARNING_TAG
+ .getValue()] = new GrammarTransition(
+ PasswordPolicyStates.PPOLICY_SEQ_STATE, PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE,
+ PasswordPolicyTags.PPOLICY_WARNING_TAG.getValue(),
+ new CheckNotNullLength() );
+
// PasswordPolicyResponseValue ::= SEQUENCE {
// ...
// error [1] ENUMERATED {
- super.transitions[PasswordPolicyStates.PPOLICY_SEQ_STATE.ordinal()][PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue()] = new GrammarTransition(
- PasswordPolicyStates.PPOLICY_SEQ_STATE, PasswordPolicyStates.PPOLICY_ERROR_TAG_STATE, PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue(),
- new StoreError());
-
+ super.transitions[PasswordPolicyStates.PPOLICY_SEQ_STATE.ordinal()][PasswordPolicyTags.PPOLICY_ERROR_TAG
+ .getValue()] = new GrammarTransition(
+ PasswordPolicyStates.PPOLICY_SEQ_STATE, PasswordPolicyStates.PPOLICY_ERROR_TAG_STATE,
+ PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue(),
+ new StoreError() );
+
// PasswordPolicyResponseValue ::= SEQUENCE {
// warning [0] CHOICE {
// timeBeforeExpiration [0] INTEGER (0 .. maxInt),
- super.transitions[PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE.ordinal()][PasswordPolicyTags.TIME_BEFORE_EXPIRATION_TAG.getValue()] = new GrammarTransition(
- PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE, PasswordPolicyStates.PPOLICY_TIME_BEFORE_EXPIRATION_STATE, PasswordPolicyTags.TIME_BEFORE_EXPIRATION_TAG.getValue(),
- new StoreTimeBeforeExpiration());
-
+ super.transitions[PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE.ordinal()][PasswordPolicyTags.TIME_BEFORE_EXPIRATION_TAG
+ .getValue()] = new GrammarTransition(
+ PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE, PasswordPolicyStates.PPOLICY_TIME_BEFORE_EXPIRATION_STATE,
+ PasswordPolicyTags.TIME_BEFORE_EXPIRATION_TAG.getValue(),
+ new StoreTimeBeforeExpiration() );
+
// PasswordPolicyResponseValue ::= SEQUENCE {
// warning [0] CHOICE {
// ...
// graceAuthNsRemaining [1] INTEGER (0 .. maxInt) } OPTIONAL,
- super.transitions[PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE.ordinal()][PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG.getValue()] = new GrammarTransition(
- PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE, PasswordPolicyStates.PPOLICY_GRACE_AUTHNS_REMAINING_STATE, PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG.getValue(),
- new StoreGraceAuthsRemaining());
-
+ super.transitions[PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE.ordinal()][PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG
+ .getValue()] = new GrammarTransition(
+ PasswordPolicyStates.PPOLICY_WARNING_TAG_STATE, PasswordPolicyStates.PPOLICY_GRACE_AUTHNS_REMAINING_STATE,
+ PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG.getValue(),
+ new StoreGraceAuthsRemaining() );
+
// PasswordPolicyResponseValue ::= SEQUENCE {
// ...
// error [1] ENUMERATED {
- super.transitions[PasswordPolicyStates.PPOLICY_TIME_BEFORE_EXPIRATION_STATE.ordinal()][PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue()] = new GrammarTransition(
- PasswordPolicyStates.PPOLICY_TIME_BEFORE_EXPIRATION_STATE, PasswordPolicyStates.PPOLICY_ERROR_TAG_STATE, PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue(),
- new StoreError());
-
+ super.transitions[PasswordPolicyStates.PPOLICY_TIME_BEFORE_EXPIRATION_STATE.ordinal()][PasswordPolicyTags.PPOLICY_ERROR_TAG
+ .getValue()] = new GrammarTransition(
+ PasswordPolicyStates.PPOLICY_TIME_BEFORE_EXPIRATION_STATE, PasswordPolicyStates.PPOLICY_ERROR_TAG_STATE,
+ PasswordPolicyTags.PPOLICY_ERROR_TAG.getValue(),
+ new StoreError() );
+
// PasswordPolicyResponseValue ::= SEQUENCE {
// ...
// error [1] ENUMERATED {
- super.transitions[PasswordPolicyStates.PPOLICY_GRACE_AUTHNS_REMAINING_STATE.ordinal()][PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG.getValue()] = new GrammarTransition(
- PasswordPolicyStates.PPOLICY_GRACE_AUTHNS_REMAINING_STATE, PasswordPolicyStates.PPOLICY_ERROR_TAG_STATE, PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG.getValue(),
- new StoreError());
+ super.transitions[PasswordPolicyStates.PPOLICY_GRACE_AUTHNS_REMAINING_STATE.ordinal()][PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG
+ .getValue()] = new GrammarTransition(
+ PasswordPolicyStates.PPOLICY_GRACE_AUTHNS_REMAINING_STATE, PasswordPolicyStates.PPOLICY_ERROR_TAG_STATE,
+ PasswordPolicyTags.GRACE_AUTHNS_REMAINING_TAG.getValue(),
+ new StoreError() );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java Tue Jan 24 17:27:00 2012
@@ -33,33 +33,34 @@ import org.apache.directory.shared.asn1.
public enum PasswordPolicyStates implements States
{
- START_STATE, // 0
+ START_STATE, // 0
- PPOLICY_SEQ_STATE, // 1
-
- PPOLICY_WARNING_TAG_STATE, // 2
+ PPOLICY_SEQ_STATE, // 1
- PPOLICY_TIME_BEFORE_EXPIRATION_STATE, // 3
+ PPOLICY_WARNING_TAG_STATE, // 2
- PPOLICY_GRACE_AUTHNS_REMAINING_STATE, // 4
+ PPOLICY_TIME_BEFORE_EXPIRATION_STATE, // 3
- PPOLICY_ERROR_TAG_STATE, // 5
+ PPOLICY_GRACE_AUTHNS_REMAINING_STATE, // 4
- END_STATE; // 6
+ PPOLICY_ERROR_TAG_STATE, // 5
+
+ END_STATE; // 6
/**
* {@inheritDoc}
*/
public String getGrammarName( Grammar<?> grammar )
{
- if( grammar instanceof PasswordPolicyGrammar )
+ if ( grammar instanceof PasswordPolicyGrammar )
{
return "PASSWORD_POLICY_RESPONSE_CONTROL_GRAMMAR";
}
-
+
return "UNKNOWN_GRAMMAR";
}
+
/**
* {@inheritDoc}
*/
@@ -85,8 +86,8 @@ public enum PasswordPolicyStates impleme
{
return this == END_STATE;
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTags.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTags.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTags.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTags.java Tue Jan 24 17:27:00 2012
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.extras.controls.ppolicy_impl;
+
/**
* Tags used for decoding PasswordPolicyResponseControl.
*
@@ -27,10 +28,10 @@ package org.apache.directory.shared.ldap
*/
public enum PasswordPolicyTags
{
- PPOLICY_WARNING_TAG(0xA0), // warning [0]
- PPOLICY_ERROR_TAG(0x81), // error [1]
- TIME_BEFORE_EXPIRATION_TAG(0x80), // timeBeforeExpiration [0]
- GRACE_AUTHNS_REMAINING_TAG(0x81); // graceAuthNsRemaining [1]
+ PPOLICY_WARNING_TAG(0xA0), // warning [0]
+ PPOLICY_ERROR_TAG(0x81), // error [1]
+ TIME_BEFORE_EXPIRATION_TAG(0x80), // timeBeforeExpiration [0]
+ GRACE_AUTHNS_REMAINING_TAG(0x81); // graceAuthNsRemaining [1]
/** Internal value for each tag */
private int value;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreError.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreError.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreError.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreError.java Tue Jan 24 17:27:00 2012
@@ -50,7 +50,7 @@ public class StoreError extends Abstract
protected void setIntegerValue( int value, Asn1Container container )
{
PasswordPolicyContainer ppolicyContainer = ( PasswordPolicyContainer ) container;
-
+
PasswordPolicyErrorEnum error = PasswordPolicyErrorEnum.get( value );
ppolicyContainer.getPasswordPolicyResponseControl().getResponse().setPasswordPolicyError( error );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreGraceAuthsRemaining.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreGraceAuthsRemaining.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreGraceAuthsRemaining.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreGraceAuthsRemaining.java Tue Jan 24 17:27:00 2012
@@ -49,7 +49,7 @@ public class StoreGraceAuthsRemaining ex
protected void setIntegerValue( int value, Asn1Container container )
{
PasswordPolicyContainer ppolicyContainer = ( PasswordPolicyContainer ) container;
-
+
ppolicyContainer.getPasswordPolicyResponseControl().getResponse().setGraceAuthNsRemaining( value );
ppolicyContainer.setGrammarEndAllowed( true );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreTimeBeforeExpiration.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreTimeBeforeExpiration.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreTimeBeforeExpiration.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreTimeBeforeExpiration.java Tue Jan 24 17:27:00 2012
@@ -49,9 +49,9 @@ public class StoreTimeBeforeExpiration e
protected void setIntegerValue( int value, Asn1Container container )
{
PasswordPolicyContainer ppolicyContainer = ( PasswordPolicyContainer ) container;
-
+
ppolicyContainer.getPasswordPolicyResponseControl().getResponse().setTimeBeforeExpiration( value );
-
+
container.setGrammarEndAllowed( true );
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java Tue Jan 24 17:27:00 2012
@@ -37,8 +37,8 @@ public class SyncDoneValueContainer exte
private SyncDoneValue control;
private LdapApiService codec;
-
-
+
+
/**
*
* Creates a new SyncDoneValueControlContainer object.
@@ -91,12 +91,12 @@ public class SyncDoneValueContainer exte
this.control = control;
}
-
+
public LdapApiService getCodecService()
{
return codec;
}
-
+
/**
* clean the container
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java Tue Jan 24 17:27:00 2012
@@ -222,7 +222,7 @@ public class SyncDoneValueDecorator exte
/**
* {@inheritDoc}
*/
- public Asn1Object decode( byte[] controlBytes ) throws DecoderException
+ public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
SyncDoneValueContainer container = new SyncDoneValueContainer( getCodecService(), this );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java Tue Jan 24 17:27:00 2012
@@ -35,7 +35,7 @@ public class SyncDoneValueFactory implem
{
/** The codec for this factory */
private LdapApiService codec;
-
+
/**
* Creates a new instance of SyncDoneValueFactory.
@@ -46,7 +46,7 @@ public class SyncDoneValueFactory implem
{
this.codec = codec;
}
-
+
/**
* {@inheritDoc}
@@ -56,7 +56,7 @@ public class SyncDoneValueFactory implem
return SyncDoneValue.OID;
}
-
+
/**
* {@inheritDoc}
*/
@@ -64,7 +64,7 @@ public class SyncDoneValueFactory implem
{
return new SyncDoneValueDecorator( codec );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueGrammar.java Tue Jan 24 17:27:00 2012
@@ -83,7 +83,8 @@ public final class SyncDoneValueGrammar
* Initialize the syncDoneValue object
*/
super.transitions[SyncDoneValueStatesEnum.START_STATE.ordinal()][UniversalTag.SEQUENCE.getValue()] = new GrammarTransition<SyncDoneValueContainer>(
- SyncDoneValueStatesEnum.START_STATE, SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE, UniversalTag.SEQUENCE.getValue(),
+ SyncDoneValueStatesEnum.START_STATE, SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE,
+ UniversalTag.SEQUENCE.getValue(),
new GrammarAction<SyncDoneValueContainer>( "Initialization" )
{
public void action( SyncDoneValueContainer container ) throws DecoderException
@@ -91,7 +92,7 @@ public final class SyncDoneValueGrammar
// As all the values are optional or defaulted, we can end here
container.setGrammarEndAllowed( true );
}
- } );
+ } );
/**
* transition from start to cookie
@@ -100,58 +101,59 @@ public final class SyncDoneValueGrammar
* ....
* }
*/
- super.transitions[SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE.ordinal()][UniversalTag.OCTET_STRING.getValue()] =
- new GrammarTransition<SyncDoneValueContainer>( SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE,
- SyncDoneValueStatesEnum.COOKIE_STATE, UniversalTag.OCTET_STRING.getValue(),
- new GrammarAction<SyncDoneValueContainer>( "Set SyncDoneValueControl cookie" )
- {
- public void action( SyncDoneValueContainer container ) throws DecoderException
+ super.transitions[SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE.ordinal()][UniversalTag.OCTET_STRING
+ .getValue()] =
+ new GrammarTransition<SyncDoneValueContainer>( SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE,
+ SyncDoneValueStatesEnum.COOKIE_STATE, UniversalTag.OCTET_STRING.getValue(),
+ new GrammarAction<SyncDoneValueContainer>( "Set SyncDoneValueControl cookie" )
{
- Value value = container.getCurrentTLV().getValue();
+ public void action( SyncDoneValueContainer container ) throws DecoderException
+ {
+ Value value = container.getCurrentTLV().getValue();
- byte[] cookie = value.getData();
+ byte[] cookie = value.getData();
- if ( IS_DEBUG )
- {
- LOG.debug( "cookie = {}", Strings.dumpBytes(cookie) );
- }
+ if ( IS_DEBUG )
+ {
+ LOG.debug( "cookie = {}", Strings.dumpBytes( cookie ) );
+ }
- container.getSyncDoneValueControl().setCookie( cookie );
+ container.getSyncDoneValueControl().setCookie( cookie );
- container.setGrammarEndAllowed( true );
- }
- } );
+ container.setGrammarEndAllowed( true );
+ }
+ } );
- GrammarAction<SyncDoneValueContainer> refreshDeletesTagAction =
+ GrammarAction<SyncDoneValueContainer> refreshDeletesTagAction =
new GrammarAction<SyncDoneValueContainer>( "set SyncDoneValueControl refreshDeletes flag" )
- {
- public void action( SyncDoneValueContainer container ) throws DecoderException
{
- Value value = container.getCurrentTLV().getValue();
-
- try
+ public void action( SyncDoneValueContainer container ) throws DecoderException
{
- boolean refreshDeletes = BooleanDecoder.parse( value );
+ Value value = container.getCurrentTLV().getValue();
- if ( IS_DEBUG )
+ try
{
- LOG.debug( "refreshDeletes = {}", refreshDeletes );
- }
+ boolean refreshDeletes = BooleanDecoder.parse( value );
- container.getSyncDoneValueControl().setRefreshDeletes( refreshDeletes );
+ if ( IS_DEBUG )
+ {
+ LOG.debug( "refreshDeletes = {}", refreshDeletes );
+ }
- // the END transition for grammar
- container.setGrammarEndAllowed( true );
- }
- catch ( BooleanDecoderException be )
- {
- String msg = I18n.err( I18n.ERR_04024 );
- LOG.error( msg, be );
- throw new DecoderException( msg );
- }
+ container.getSyncDoneValueControl().setRefreshDeletes( refreshDeletes );
- }
- };
+ // the END transition for grammar
+ container.setGrammarEndAllowed( true );
+ }
+ catch ( BooleanDecoderException be )
+ {
+ String msg = I18n.err( I18n.ERR_04024 );
+ LOG.error( msg, be );
+ throw new DecoderException( msg );
+ }
+
+ }
+ };
/**
* transition from cookie to refreshDeletes
* {
@@ -159,11 +161,11 @@ public final class SyncDoneValueGrammar
* refreshDeletes BOOLEAN DEFAULT FALSE
* }
*/
- super.transitions[SyncDoneValueStatesEnum.COOKIE_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
+ super.transitions[SyncDoneValueStatesEnum.COOKIE_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
new GrammarTransition<SyncDoneValueContainer>(
- SyncDoneValueStatesEnum.COOKIE_STATE, SyncDoneValueStatesEnum.REFRESH_DELETES_STATE,
- UniversalTag.BOOLEAN.getValue(), refreshDeletesTagAction );
-
+ SyncDoneValueStatesEnum.COOKIE_STATE, SyncDoneValueStatesEnum.REFRESH_DELETES_STATE,
+ UniversalTag.BOOLEAN.getValue(), refreshDeletesTagAction );
+
/**
* transition from SEQUENCE to refreshDeletes
* {
@@ -171,8 +173,9 @@ public final class SyncDoneValueGrammar
* refreshDeletes BOOLEAN DEFAULT FALSE
* }
*/
- super.transitions[SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE.ordinal()][UniversalTag.BOOLEAN.getValue()] =
- new GrammarTransition<SyncDoneValueContainer>( SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE,
+ super.transitions[SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE.ordinal()][UniversalTag.BOOLEAN
+ .getValue()] =
+ new GrammarTransition<SyncDoneValueContainer>( SyncDoneValueStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE,
SyncDoneValueStatesEnum.REFRESH_DELETES_STATE, UniversalTag.BOOLEAN.getValue(), refreshDeletesTagAction );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueStatesEnum.java Tue Jan 24 17:27:00 2012
@@ -34,7 +34,7 @@ public enum SyncDoneValueStatesEnum impl
/** The END_STATE */
END_STATE,
-
+
/***/
START_STATE,
@@ -98,8 +98,8 @@ public enum SyncDoneValueStatesEnum impl
{
return this == END_STATE;
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java?rev=1235364&r1=1235363&r2=1235364&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java Tue Jan 24 17:27:00 2012
@@ -37,7 +37,7 @@ public class SyncInfoValueContainer exte
private LdapApiService codec;
-
+
/**
* Creates a new SyncInfoValueControlContainer object. We will store one grammar,
* it's enough ...
@@ -88,13 +88,13 @@ public class SyncInfoValueContainer exte
this.control = control;
}
-
+
public LdapApiService getCodecService()
{
return codec;
}
-
-
+
+
/**
* Clean the container
*/