Author: akarasulu Date: Thu Feb 3 20:44:37 2011 New Revision: 1066954 URL: http://svn.apache.org/viewvc?rev=1066954&view=rev Log: DIRSHARED-81: applying class/interface naming conventions to ppolicy control Added: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java - copied, changed from r1066947, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicy.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyImpl.java - copied, changed from r1066947, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java - copied, changed from r1066947, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicyResponse.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponseImpl.java - copied, changed from r1066947, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java Removed: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicy.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicyResponse.java Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyTest.java Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1066954&r1=1066953&r2=1066954&view=diff ============================================================================== --- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original) +++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Thu Feb 3 20:44:37 2011 @@ -45,8 +45,8 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.ICodecControl; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.extras.controls.IPasswordPolicy; import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl; import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator; import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; @@ -80,7 +80,7 @@ public class PasswordPolicyTest extends private static final ILdapCodecService codec = new DefaultLdapCodecService(); private static final PasswordPolicyDecorator PP_REQ_CTRL = - new PasswordPolicyDecorator( codec, new PasswordPolicy() ); + new PasswordPolicyDecorator( codec, new PasswordPolicyImpl() ); @Before @@ -133,7 +133,7 @@ public class PasswordPolicyTest extends AddResponse addResp = connection.add( addRequest ); assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, addResp.getLdapResult().getResultCode() ); - IPasswordPolicy respCtrl = getPwdRespCtrl( addResp ); + PasswordPolicy respCtrl = getPwdRespCtrl( addResp ); assertNotNull( respCtrl ); assertEquals( PASSWORD_TOO_SHORT, respCtrl.getResponse().getPasswordPolicyError() ); @@ -173,7 +173,7 @@ public class PasswordPolicyTest extends AddResponse addResp = connection.add( addRequest ); assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, addResp.getLdapResult().getResultCode() ); - IPasswordPolicy respCtrl = getPwdRespCtrl( addResp ); + PasswordPolicy respCtrl = getPwdRespCtrl( addResp ); assertNotNull( respCtrl ); assertEquals( INSUFFICIENT_PASSWORD_QUALITY, respCtrl.getResponse().getPasswordPolicyError() ); @@ -211,7 +211,7 @@ public class PasswordPolicyTest extends AddResponse addResp = connection.add( addRequest ); assertEquals( ResultCodeEnum.SUCCESS, addResp.getLdapResult().getResultCode() ); - IPasswordPolicy respCtrl = getPwdRespCtrl( addResp ); + PasswordPolicy respCtrl = getPwdRespCtrl( addResp ); assertNull( respCtrl ); ModifyRequest modReq = new ModifyRequestImpl(); @@ -236,7 +236,7 @@ public class PasswordPolicyTest extends } - private IPasswordPolicy getPwdRespCtrl( Response resp ) throws Exception + private PasswordPolicy getPwdRespCtrl( Response resp ) throws Exception { ICodecControl ctrl = codec.decorate( resp.getControls().get( PP_REQ_CTRL.getOid() ) ); Modified: directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1066954&r1=1066953&r2=1066954&view=diff ============================================================================== --- directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original) +++ directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Feb 3 20:44:37 2011 @@ -87,9 +87,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; -import org.apache.directory.shared.ldap.extras.controls.IPasswordPolicy; import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; -import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyResponse; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyResponseImpl; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SyncModifyDn; @@ -181,7 +181,7 @@ public abstract class ServerContext impl ADS_CONTROLS.put( EntryChange.OID, ControlEnum.ENTRY_CHANGE_CONTROL ); ADS_CONTROLS.put( ManageDsaIT.OID, ControlEnum.MANAGE_DSA_IT_CONTROL ); ADS_CONTROLS.put( PagedResults.OID, ControlEnum.PAGED_RESULTS_CONTROL ); - ADS_CONTROLS.put( IPasswordPolicy.OID, ControlEnum.PASSWORD_POLICY_REQUEST_CONTROL ); + ADS_CONTROLS.put( PasswordPolicy.OID, ControlEnum.PASSWORD_POLICY_REQUEST_CONTROL ); ADS_CONTROLS.put( PersistentSearch.OID, ControlEnum.PERSISTENT_SEARCH_CONTROL ); ADS_CONTROLS.put( Subentries.OID, ControlEnum.SUBENTRIES_CONTROL ); ADS_CONTROLS.put( SyncDoneValue.OID, ControlEnum.SYNC_DONE_VALUE_CONTROL ); @@ -409,12 +409,12 @@ public abstract class ServerContext impl if ( isRequest ) { control = new PasswordPolicyDecorator( getDirectoryService().getLdapCodecService(), - new PasswordPolicy() ); + new PasswordPolicyImpl() ); } else { control = new PasswordPolicyDecorator( getDirectoryService().getLdapCodecService(), - new PasswordPolicy( new PasswordPolicyResponse() ) ); + new PasswordPolicyImpl( new PasswordPolicyResponseImpl() ) ); } break; Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1066954&r1=1066953&r2=1066954&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Thu Feb 3 20:44:37 2011 @@ -82,7 +82,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.subtree.SubentryInterceptor; import org.apache.directory.server.core.trigger.TriggerInterceptor; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.extras.controls.IPasswordPolicy; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyErrorEnum; import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; @@ -347,7 +347,7 @@ public class AuthenticationInterceptor e PasswordPolicyConfiguration policyConfig = directoryService.getPwdPolicy( entry ); - boolean isPPolicyReqCtrlPresent = addContext.hasRequestControl( IPasswordPolicy.OID ); + boolean isPPolicyReqCtrlPresent = addContext.hasRequestControl( PasswordPolicy.OID ); checkPwdReset( addContext ); @@ -511,7 +511,7 @@ public class AuthenticationInterceptor e // handle the case where pwdPolicySubentry AT is about to be deleted in thid modify() PasswordPolicyConfiguration policyConfig = directoryService.getPwdPolicy( modifyContext.getOriginalEntry() ); - boolean isPPolicyReqCtrlPresent = modifyContext.hasRequestControl( IPasswordPolicy.OID ); + boolean isPPolicyReqCtrlPresent = modifyContext.hasRequestControl( PasswordPolicy.OID ); Dn userDn = modifyContext.getSession().getAuthenticatedPrincipal().getDN(); PwdModDetailsHolder pwdModDetails = null; @@ -879,7 +879,7 @@ public class AuthenticationInterceptor e return; } - boolean isPPolicyReqCtrlPresent = bindContext.hasRequestControl( IPasswordPolicy.OID ); + boolean isPPolicyReqCtrlPresent = bindContext.hasRequestControl( PasswordPolicy.OID ); PasswordPolicyDecorator pwdRespCtrl = new PasswordPolicyDecorator( directoryService.getLdapCodecService() ); @@ -1385,7 +1385,7 @@ public class AuthenticationInterceptor e if ( pwdResetSet.contains( userDn ) ) { boolean isPPolicyReqCtrlPresent = opContext - .hasRequestControl( IPasswordPolicy.OID ); + .hasRequestControl( PasswordPolicy.OID ); if ( isPPolicyReqCtrlPresent ) { PasswordPolicyDecorator pwdRespCtrl = Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java?rev=1066954&r1=1066953&r2=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java Thu Feb 3 20:44:37 2011 @@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory; import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory; import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory; -import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SyncModifyDn; @@ -116,7 +116,7 @@ public class DefaultLdapCodecService imp controlFactories.put( ISyncStateValue.OID, syncStateValueFactory ); PasswordPolicyFactory passwordPolicyFactory = new PasswordPolicyFactory( this ); - controlFactories.put( PasswordPolicy.OID, passwordPolicyFactory ); + controlFactories.put( PasswordPolicyImpl.OID, passwordPolicyFactory ); } Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java (from r1066947, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicy.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicy.java&r1=1066947&r2=1066954&rev=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicy.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java Thu Feb 3 20:44:37 2011 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. * @author Apache Directory Project * @version $Rev$, $Date$ */ -public interface IPasswordPolicy extends Control +public interface PasswordPolicy extends Control { /** the password policy request control */ public static final String OID = "1.3.6.1.4.1.42.2.27.8.5.1"; @@ -52,7 +52,7 @@ public interface IPasswordPolicy extends * * @param response a valid response object, or null to make this a request */ - void setResponse( IPasswordPolicyResponse response ); + void setResponse( PasswordPolicyResponse response ); /** @@ -67,7 +67,7 @@ public interface IPasswordPolicy extends * @param hasResponse true to create default response, false to clear it * @return the old response object, if one did not exist null is returned */ - IPasswordPolicyResponse setResponse( boolean hasResponse ); + PasswordPolicyResponse setResponse( boolean hasResponse ); /** @@ -78,5 +78,5 @@ public interface IPasswordPolicy extends * @return a non-null policy response or null, if {@link #hasResponse()} * returns false */ - IPasswordPolicyResponse getResponse(); + PasswordPolicyResponse getResponse(); } Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyImpl.java (from r1066947, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyImpl.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyImpl.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java&r1=1066947&r2=1066954&rev=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicy.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyImpl.java Thu Feb 3 20:44:37 2011 @@ -24,25 +24,25 @@ import org.apache.directory.shared.ldap. /** - * A simple {@link IPasswordPolicy} {@link Control} implementation. + * A simple {@link PasswordPolicy} {@link Control} implementation. * * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class PasswordPolicy implements IPasswordPolicy +public class PasswordPolicyImpl implements PasswordPolicy { /** The criticality of this {@link Control} */ private boolean criticality; /** The password policy response component if this is a response control */ - private IPasswordPolicyResponse response; + private PasswordPolicyResponse response; /** * Creates a new instance of a PasswordPolicy request Control without any * response data associated with it. */ - public PasswordPolicy() + public PasswordPolicyImpl() { response = null; } @@ -52,11 +52,11 @@ public class PasswordPolicy implements I * Creates a new instance of a PasswordPolicy request Control without any * response data associated with it. */ - public PasswordPolicy( boolean hasResponse ) + public PasswordPolicyImpl( boolean hasResponse ) { if ( hasResponse ) { - response = new PasswordPolicyResponse(); + response = new PasswordPolicyResponseImpl(); } else { @@ -69,7 +69,7 @@ public class PasswordPolicy implements I * Creates a new instance of PasswordPolicy response Control with response * information packaged into the control. */ - public PasswordPolicy( IPasswordPolicyResponse response ) + public PasswordPolicyImpl( PasswordPolicyResponse response ) { this.response = response; } @@ -80,7 +80,7 @@ public class PasswordPolicy implements I */ public String getOid() { - return IPasswordPolicy.OID; + return PasswordPolicy.OID; } @@ -106,7 +106,7 @@ public class PasswordPolicy implements I * * {@inheritDoc} */ - public void setResponse( IPasswordPolicyResponse response ) + public void setResponse( PasswordPolicyResponse response ) { this.response = response; } @@ -125,13 +125,13 @@ public class PasswordPolicy implements I * * {@inheritDoc} */ - public IPasswordPolicyResponse setResponse( boolean hasResponse ) + public PasswordPolicyResponse setResponse( boolean hasResponse ) { - IPasswordPolicyResponse old = this.response; + PasswordPolicyResponse old = this.response; if ( hasResponse ) { - this.response = new PasswordPolicyResponse(); + this.response = new PasswordPolicyResponseImpl(); } else { @@ -145,7 +145,7 @@ public class PasswordPolicy implements I /** * {@inheritDoc} */ - public IPasswordPolicyResponse getResponse() + public PasswordPolicyResponse getResponse() { return response; } Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java (from r1066947, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicyResponse.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicyResponse.java&r1=1066947&r2=1066954&rev=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/IPasswordPolicyResponse.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java Thu Feb 3 20:44:37 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.extras.controls; -public interface IPasswordPolicyResponse +public interface PasswordPolicyResponse { int getTimeBeforeExpiration(); Copied: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponseImpl.java (from r1066947, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponseImpl.java?p2=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponseImpl.java&p1=directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java&r1=1066947&r2=1066954&rev=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponse.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/PasswordPolicyResponseImpl.java Thu Feb 3 20:44:37 2011 @@ -26,7 +26,7 @@ package org.apache.directory.shared.ldap * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class PasswordPolicyResponse implements IPasswordPolicyResponse +public class PasswordPolicyResponseImpl implements PasswordPolicyResponse { /** time before expiration of the password */ private int timeBeforeExpiration = -1; Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java?rev=1066954&r1=1066953&r2=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java Thu Feb 3 20:44:37 2011 @@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.asn1.ber.AbstractContainer; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.extras.controls.IPasswordPolicy; import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl; /** @@ -40,14 +40,14 @@ public class PasswordPolicyContainer ext public PasswordPolicyContainer( ILdapCodecService codec ) { super(); - control = new PasswordPolicyDecorator( codec, new PasswordPolicy() ); + control = new PasswordPolicyDecorator( codec, new PasswordPolicyImpl() ); stateStack = new int[1]; grammar = PasswordPolicyGrammar.getInstance(); setTransition( PasswordPolicyStates.START_STATE ); } - public PasswordPolicyContainer( ILdapCodecService codec, IPasswordPolicy ppolicyResponse ) + public PasswordPolicyContainer( ILdapCodecService codec, PasswordPolicy ppolicyResponse ) { super(); control = new PasswordPolicyDecorator( codec, ppolicyResponse ); Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java?rev=1066954&r1=1066953&r2=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java Thu Feb 3 20:44:37 2011 @@ -32,9 +32,9 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.codec.ILdapCodecService; import org.apache.directory.shared.ldap.codec.controls.ControlDecorator; -import org.apache.directory.shared.ldap.extras.controls.IPasswordPolicy; -import org.apache.directory.shared.ldap.extras.controls.IPasswordPolicyResponse; import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyResponse; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl; /** @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class PasswordPolicyDecorator extends ControlDecorator implements IPasswordPolicy +public class PasswordPolicyDecorator extends ControlDecorator implements PasswordPolicy { /** An instance of this decoder */ private static final Asn1Decoder decoder = new Asn1Decoder(); @@ -57,17 +57,17 @@ public class PasswordPolicyDecorator ext public PasswordPolicyDecorator( ILdapCodecService codec ) { - super( codec, new PasswordPolicy() ); + super( codec, new PasswordPolicyImpl() ); } public PasswordPolicyDecorator( ILdapCodecService codec, boolean hasResponse ) { - super( codec, new PasswordPolicy( hasResponse ) ); + super( codec, new PasswordPolicyImpl( hasResponse ) ); } - public PasswordPolicyDecorator( ILdapCodecService codec, IPasswordPolicy policy ) + public PasswordPolicyDecorator( ILdapCodecService codec, PasswordPolicy policy ) { super( codec, policy ); } @@ -244,7 +244,7 @@ public class PasswordPolicyDecorator ext * * {@inheritDoc} */ - public void setResponse( IPasswordPolicyResponse response ) + public void setResponse( PasswordPolicyResponse response ) { getDecorated().setResponse( response ); } @@ -254,7 +254,7 @@ public class PasswordPolicyDecorator ext * * {@inheritDoc} */ - public IPasswordPolicyResponse setResponse( boolean hasResponse ) + public PasswordPolicyResponse setResponse( boolean hasResponse ) { return getDecorated().setResponse( hasResponse ); } @@ -264,7 +264,7 @@ public class PasswordPolicyDecorator ext * * {@inheritDoc} */ - public IPasswordPolicyResponse getResponse() + public PasswordPolicyResponse getResponse() { return getDecorated().getResponse(); } Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java?rev=1066954&r1=1066953&r2=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java (original) +++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java Thu Feb 3 20:44:37 2011 @@ -29,17 +29,17 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.IControlFactory; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.extras.controls.IPasswordPolicy; import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl; /** - * A {@link IControlFactory} which creates {@link IPasswordPolicy} controls. + * A {@link IControlFactory} which creates {@link PasswordPolicy} controls. * * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class PasswordPolicyFactory implements IControlFactory +public class PasswordPolicyFactory implements IControlFactory { private ILdapCodecService codec; @@ -61,7 +61,7 @@ public class PasswordPolicyFactory imple */ public String getOid() { - return IPasswordPolicy.OID; + return PasswordPolicy.OID; } @@ -75,7 +75,7 @@ public class PasswordPolicyFactory imple } - public PasswordPolicyDecorator decorate( IPasswordPolicy control ) + public PasswordPolicyDecorator decorate( PasswordPolicy control ) { PasswordPolicyDecorator decorator = null; @@ -93,13 +93,13 @@ public class PasswordPolicyFactory imple } - public IPasswordPolicy newControl() + public PasswordPolicy newControl() { - return new PasswordPolicy(); + return new PasswordPolicyImpl(); } - public Control toJndiControl( IPasswordPolicy control ) throws EncoderException + public Control toJndiControl( PasswordPolicy control ) throws EncoderException { PasswordPolicyDecorator decorator = decorate( control ); ByteBuffer bb = ByteBuffer.allocate( decorator.computeLength() ); @@ -109,7 +109,7 @@ public class PasswordPolicyFactory imple } - public IPasswordPolicy fromJndiControl( Control jndi ) throws DecoderException + public PasswordPolicy fromJndiControl( Control jndi ) throws DecoderException { PasswordPolicyDecorator decorator = null; Modified: directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyTest.java?rev=1066954&r1=1066953&r2=1066954&view=diff ============================================================================== --- directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyTest.java (original) +++ directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyTest.java Thu Feb 3 20:44:37 2011 @@ -29,7 +29,7 @@ import java.nio.ByteBuffer; import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService; import org.apache.directory.shared.ldap.codec.ILdapCodecService; -import org.apache.directory.shared.ldap.extras.controls.IPasswordPolicy; +import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy; import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator; import org.apache.directory.shared.util.Strings; import org.junit.Test; @@ -60,7 +60,7 @@ public class PasswordPolicyTest bb.flip(); PasswordPolicyDecorator control = new PasswordPolicyDecorator( codec, true ); - IPasswordPolicy passwordPolicy = ( IPasswordPolicy ) control.decode( bb.array() ); + PasswordPolicy passwordPolicy = ( PasswordPolicy ) control.decode( bb.array() ); assertTrue( passwordPolicy.hasResponse() ); assertEquals( 1, passwordPolicy.getResponse().getTimeBeforeExpiration() ); @@ -88,7 +88,7 @@ public class PasswordPolicyTest bb.flip(); PasswordPolicyDecorator control = new PasswordPolicyDecorator( codec, true ); - IPasswordPolicy passwordPolicy = ( IPasswordPolicy ) control.decode( bb.array() ); + PasswordPolicy passwordPolicy = ( PasswordPolicy ) control.decode( bb.array() ); assertTrue( passwordPolicy.hasResponse() ); assertEquals( 1, passwordPolicy.getResponse().getGraceAuthNsRemaining() ); @@ -115,7 +115,7 @@ public class PasswordPolicyTest bb.flip(); PasswordPolicyDecorator control = new PasswordPolicyDecorator( codec, true ); - IPasswordPolicy passwordPolicy = ( IPasswordPolicy ) control.decode( bb.array() ); + PasswordPolicy passwordPolicy = ( PasswordPolicy ) control.decode( bb.array() ); assertTrue( passwordPolicy.hasResponse() ); assertEquals( 1, passwordPolicy.getResponse().getTimeBeforeExpiration() ); @@ -141,7 +141,7 @@ public class PasswordPolicyTest bb.flip(); PasswordPolicyDecorator control = new PasswordPolicyDecorator( codec, true ); - IPasswordPolicy passwordPolicy = ( IPasswordPolicy ) control.decode( bb.array() ); + PasswordPolicy passwordPolicy = ( PasswordPolicy ) control.decode( bb.array() ); assertTrue( passwordPolicy.hasResponse() ); assertEquals( 1, passwordPolicy.getResponse().getGraceAuthNsRemaining() ); @@ -166,7 +166,7 @@ public class PasswordPolicyTest bb.flip(); PasswordPolicyDecorator control = new PasswordPolicyDecorator( codec, true ); - IPasswordPolicy passwordPolicy = ( IPasswordPolicy ) control.decode( bb.array() ); + PasswordPolicy passwordPolicy = ( PasswordPolicy ) control.decode( bb.array() ); assertTrue( passwordPolicy.hasResponse() ); assertEquals( 1, passwordPolicy.getResponse().getPasswordPolicyError().getValue() ); @@ -190,7 +190,7 @@ public class PasswordPolicyTest bb.flip(); PasswordPolicyDecorator control = new PasswordPolicyDecorator( codec, true ); - IPasswordPolicy passwordPolicy = ( IPasswordPolicy ) control.decode( bb.array() ); + PasswordPolicy passwordPolicy = ( PasswordPolicy ) control.decode( bb.array() ); assertNotNull( passwordPolicy ); assertTrue( passwordPolicy.hasResponse() );