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 2014/03/17 14:27:12 UTC
svn commit: r1578361 [2/3] - in /directory:
apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/
apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/
apacheds/trunk/protocol-ldap/src/main/java/org/a...
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1578361&r1=1578360&r2=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java Mon Mar 17 13:27:09 2014
@@ -53,7 +53,13 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
import org.apache.directory.api.ldap.model.message.Message;
+import org.apache.directory.api.ldap.model.message.controls.Cascade;
+import org.apache.directory.api.ldap.model.message.controls.EntryChange;
+import org.apache.directory.api.ldap.model.message.controls.ManageDsaIT;
import org.apache.directory.api.ldap.model.message.controls.OpaqueControl;
+import org.apache.directory.api.ldap.model.message.controls.PagedResults;
+import org.apache.directory.api.ldap.model.message.controls.PersistentSearch;
+import org.apache.directory.api.ldap.model.message.controls.Subentries;
import org.apache.directory.api.util.Strings;
import org.apache.directory.api.util.exception.NotImplementedException;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
@@ -73,7 +79,7 @@ public class DefaultLdapCodecService imp
private static final Logger LOG = LoggerFactory.getLogger( DefaultLdapCodecService.class );
/** The map of registered {@link org.apache.directory.api.ldap.codec.api.ControlFactory}'s */
- protected Map<String, ControlFactory<?, ?>> controlFactories = new HashMap<String, ControlFactory<?, ?>>();
+ protected Map<String, ControlFactory<? extends Control>> controlFactories = new HashMap<String, ControlFactory<? extends Control>>();
/** The map of registered {@link org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory}'s by request OID */
protected Map<String, ExtendedOperationFactory<?, ?>> extendedOperationsFactories = new HashMap<String, ExtendedOperationFactory<?, ?>>();
@@ -96,29 +102,29 @@ public class DefaultLdapCodecService imp
*/
private void loadStockControls()
{
- ControlFactory<?, ?> factory = new CascadeFactory( this );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new EntryChangeFactory( this );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new ManageDsaITFactory( this );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new PagedResultsFactory( this );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new PersistentSearchFactory( this );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new SubentriesFactory( this );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
+ ControlFactory<Cascade> cascadeFactory = new CascadeFactory( this );
+ controlFactories.put( cascadeFactory.getOid(), cascadeFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", cascadeFactory.getOid() );
+
+ ControlFactory<EntryChange> entryChangeFactory = new EntryChangeFactory( this );
+ controlFactories.put( entryChangeFactory.getOid(), entryChangeFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", entryChangeFactory.getOid() );
+
+ ControlFactory<ManageDsaIT> manageDsaItFactory = new ManageDsaITFactory( this );
+ controlFactories.put( manageDsaItFactory.getOid(), manageDsaItFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", manageDsaItFactory.getOid() );
+
+ ControlFactory<PagedResults> pageResultsFactory = new PagedResultsFactory( this );
+ controlFactories.put( pageResultsFactory.getOid(), pageResultsFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", pageResultsFactory.getOid() );
+
+ ControlFactory<PersistentSearch> persistentSearchFactory = new PersistentSearchFactory( this );
+ controlFactories.put( persistentSearchFactory.getOid(), persistentSearchFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", persistentSearchFactory.getOid() );
+
+ ControlFactory<Subentries> subentriesFactory = new SubentriesFactory( this );
+ controlFactories.put( subentriesFactory.getOid(), subentriesFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", subentriesFactory.getOid() );
}
@@ -129,7 +135,7 @@ public class DefaultLdapCodecService imp
/**
* {@inheritDoc}
*/
- public ControlFactory<?, ?> registerControl( ControlFactory<?, ?> factory )
+ public ControlFactory<?> registerControl( ControlFactory<?> factory )
{
return controlFactories.put( factory.getOid(), factory );
}
@@ -138,7 +144,7 @@ public class DefaultLdapCodecService imp
/**
* {@inheritDoc}
*/
- public ControlFactory<?, ?> unregisterControl( String oid )
+ public ControlFactory<?> unregisterControl( String oid )
{
return controlFactories.remove( oid );
}
@@ -202,7 +208,7 @@ public class DefaultLdapCodecService imp
*/
public CodecControl<? extends Control> newControl( String oid )
{
- ControlFactory<?, ?> factory = controlFactories.get( oid );
+ ControlFactory<?> factory = controlFactories.get( oid );
if ( factory == null )
{
Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/sort/SortRequestControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/sort/SortRequestControlTest.java?rev=1578361&r1=1578360&r2=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/sort/SortRequestControlTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/sort/SortRequestControlTest.java Mon Mar 17 13:27:09 2014
@@ -32,7 +32,7 @@ import org.apache.directory.api.asn1.Dec
import org.apache.directory.api.ldap.codec.controls.sort.SortRequestDecorator;
import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest;
import org.apache.directory.api.ldap.model.message.controls.SortKey;
-import org.apache.directory.api.ldap.model.message.controls.SortRequestControl;
+import org.apache.directory.api.ldap.model.message.controls.SortRequest;
import org.junit.Test;
/**
@@ -57,7 +57,7 @@ public class SortRequestControlTest exte
buffer.flip();
SortRequestDecorator decorator = new SortRequestDecorator( codec );
- SortRequestControl control = ( SortRequestControl ) decorator.decode( buffer.array() );
+ SortRequest control = ( SortRequest ) decorator.decode( buffer.array() );
assertEquals( 1, control.getSortKeys().size() );
@@ -94,7 +94,7 @@ public class SortRequestControlTest exte
buffer.flip();
SortRequestDecorator decorator = new SortRequestDecorator( codec );
- SortRequestControl control = ( SortRequestControl ) decorator.decode( buffer.array() );
+ SortRequest control = ( SortRequest ) decorator.decode( buffer.array() );
assertEquals( 2, control.getSortKeys().size() );
@@ -146,7 +146,7 @@ public class SortRequestControlTest exte
buffer.flip();
SortRequestDecorator decorator = new SortRequestDecorator( codec );
- SortRequestControl control = ( SortRequestControl ) decorator.decode( buffer.array() );
+ SortRequest control = ( SortRequest ) decorator.decode( buffer.array() );
assertEquals( 1, control.getSortKeys().size() );
Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/sort/SortResponseControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/sort/SortResponseControlTest.java?rev=1578361&r1=1578360&r2=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/sort/SortResponseControlTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/sort/SortResponseControlTest.java Mon Mar 17 13:27:09 2014
@@ -29,7 +29,7 @@ import java.util.Arrays;
import org.apache.directory.api.ldap.codec.controls.sort.SortResponseDecorator;
import org.apache.directory.api.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.api.ldap.model.message.controls.SortResponseControl;
+import org.apache.directory.api.ldap.model.message.controls.SortResponse;
import org.apache.directory.api.ldap.model.message.controls.SortResultCode;
import org.junit.Test;
@@ -53,7 +53,7 @@ public class SortResponseControlTest ext
buffer.flip();
SortResponseDecorator decorator = new SortResponseDecorator( codec );
- SortResponseControl control = ( SortResponseControl ) decorator.decode( buffer.array() );
+ SortResponse control = ( SortResponse ) decorator.decode( buffer.array() );
assertEquals( SortResultCode.SUCCESS, control.getSortResult() );
assertEquals( "cn", control.getAttributeName() );
@@ -77,7 +77,7 @@ public class SortResponseControlTest ext
buffer.flip();
SortResponseDecorator decorator = new SortResponseDecorator( codec );
- SortResponseControl control = ( SortResponseControl ) decorator.decode( buffer.array() );
+ SortResponse control = ( SortResponse ) decorator.decode( buffer.array() );
assertEquals( SortResultCode.NOSUCHATTRIBUTE, control.getSortResult() );
assertNull( control.getAttributeName() );
Modified: directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java?rev=1578361&r1=1578360&r2=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java Mon Mar 17 13:27:09 2014
@@ -19,6 +19,7 @@
*/
package org.apache.directory.api.ldap.codec.standalone;
+
import java.util.Map;
import org.apache.directory.api.ldap.codec.api.ControlFactory;
@@ -32,7 +33,12 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory;
import org.apache.directory.api.ldap.codec.controls.sort.SortRequestFactory;
import org.apache.directory.api.ldap.codec.controls.sort.SortResponseFactory;
+import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncState.SyncStateValue;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory;
@@ -43,9 +49,18 @@ import org.apache.directory.api.ldap.ext
import org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory;
import org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory;
import org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory;
+import org.apache.directory.api.ldap.model.message.controls.Cascade;
+import org.apache.directory.api.ldap.model.message.controls.EntryChange;
+import org.apache.directory.api.ldap.model.message.controls.ManageDsaIT;
+import org.apache.directory.api.ldap.model.message.controls.PagedResults;
+import org.apache.directory.api.ldap.model.message.controls.PersistentSearch;
+import org.apache.directory.api.ldap.model.message.controls.SortRequest;
+import org.apache.directory.api.ldap.model.message.controls.SortResponse;
+import org.apache.directory.api.ldap.model.message.controls.Subentries;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* A utility class for adding Codec and extended operation factories.
*
@@ -55,66 +70,68 @@ public class CodecFactoryUtil
{
private static final Logger LOG = LoggerFactory.getLogger( CodecFactoryUtil.class );
+
/**
* Loads the Controls implement out of the box in the codec.
*/
- public static void loadStockControls( Map<String, ControlFactory<?, ?>> controlFactories, LdapApiService apiService )
+ public static void loadStockControls( Map<String, ControlFactory<?>> controlFactories, LdapApiService apiService )
{
- ControlFactory<?, ?> factory = new CascadeFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new EntryChangeFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new ManageDsaITFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new PagedResultsFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new PersistentSearchFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new SubentriesFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new PasswordPolicyFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new SyncDoneValueFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new SyncInfoValueFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new SyncRequestValueFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new SyncStateValueFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new SortRequestFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
-
- factory = new SortResponseFactory( apiService );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
+ ControlFactory<Cascade> cascadeFactory = new CascadeFactory( apiService );
+ controlFactories.put( cascadeFactory.getOid(), cascadeFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", cascadeFactory.getOid() );
+
+ ControlFactory<EntryChange> entryChangeFactory = new EntryChangeFactory( apiService );
+ controlFactories.put( entryChangeFactory.getOid(), entryChangeFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", entryChangeFactory.getOid() );
+
+ ControlFactory<ManageDsaIT> manageDsaITFactory = new ManageDsaITFactory( apiService );
+ controlFactories.put( manageDsaITFactory.getOid(), manageDsaITFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", manageDsaITFactory.getOid() );
+
+ ControlFactory<PagedResults> pagedResultsFactory = new PagedResultsFactory( apiService );
+ controlFactories.put( pagedResultsFactory.getOid(), pagedResultsFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", pagedResultsFactory.getOid() );
+
+ ControlFactory<PersistentSearch> persistentSearchFactory = new PersistentSearchFactory( apiService );
+ controlFactories.put( persistentSearchFactory.getOid(), persistentSearchFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", persistentSearchFactory.getOid() );
+
+ ControlFactory<Subentries> SubentriesFactory = new SubentriesFactory( apiService );
+ controlFactories.put( SubentriesFactory.getOid(), SubentriesFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", SubentriesFactory.getOid() );
+
+ ControlFactory<PasswordPolicy> passwordPolicyFactory = new PasswordPolicyFactory( apiService );
+ controlFactories.put( passwordPolicyFactory.getOid(), passwordPolicyFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", passwordPolicyFactory.getOid() );
+
+ ControlFactory<SyncDoneValue> SyncDoneValueFactory = new SyncDoneValueFactory( apiService );
+ controlFactories.put( SyncDoneValueFactory.getOid(), SyncDoneValueFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", SyncDoneValueFactory.getOid() );
+
+ ControlFactory<SyncInfoValue> syncInfoValueFactory = new SyncInfoValueFactory( apiService );
+ controlFactories.put( syncInfoValueFactory.getOid(), syncInfoValueFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", syncInfoValueFactory.getOid() );
+
+ ControlFactory<SyncRequestValue> syncRequestValueFactory = new SyncRequestValueFactory( apiService );
+ controlFactories.put( syncRequestValueFactory.getOid(), syncRequestValueFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", syncRequestValueFactory.getOid() );
+
+ ControlFactory<SyncStateValue> syncStateValueFactory = new SyncStateValueFactory( apiService );
+ controlFactories.put( syncStateValueFactory.getOid(), syncStateValueFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", syncStateValueFactory.getOid() );
+
+ ControlFactory<SortRequest> sortRequestFactory = new SortRequestFactory( apiService );
+ controlFactories.put( sortRequestFactory.getOid(), sortRequestFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", sortRequestFactory.getOid() );
+
+ ControlFactory<SortResponse> sortResponseFactory = new SortResponseFactory( apiService );
+ controlFactories.put( sortResponseFactory.getOid(), sortResponseFactory );
+ LOG.info( "Registered pre-bundled control factory: {}", sortResponseFactory.getOid() );
}
- public static void loadStockExtendedOperations( Map<String, ExtendedOperationFactory<?, ?>> extendendOperationsFactories, LdapApiService apiService )
+ public static void loadStockExtendedOperations(
+ Map<String, ExtendedOperationFactory<?, ?>> extendendOperationsFactories, LdapApiService apiService )
{
ExtendedOperationFactory<?, ?> factory = new CancelFactory( apiService );
extendendOperationsFactories.put( factory.getOid(), factory );
Modified: directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1578361&r1=1578360&r2=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java Mon Mar 17 13:27:09 2014
@@ -289,11 +289,11 @@ public class StandaloneLdapApiService ex
// note, trimming whitespace doesnt hurt as it is a class name and
// helps DI containers that use xml config as xml ignores whitespace
@SuppressWarnings("unchecked")
- Class<? extends ControlFactory<?, ?>> clazz = ( Class<? extends ControlFactory<?, ?>> ) Class
+ Class<? extends ControlFactory<?>> clazz = ( Class<? extends ControlFactory<?>> ) Class
.forName( controlFQCN.trim() );
Constructor<?> constructor = clazz.getConstructor( types );
- ControlFactory<?, ?> factory = ( ControlFactory<?, ?> ) constructor.newInstance( new Object[]
+ ControlFactory<?> factory = ( ControlFactory<?> ) constructor.newInstance( new Object[]
{ this } );
controlFactories.put( factory.getOid(), factory );
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValue.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValue.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValue.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValue.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValue.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValue.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValue.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone;
import org.apache.directory.api.ldap.model.message.Control;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValueImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValueImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncDoneValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncDone/SyncDoneValueImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone;
import java.util.Arrays;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValue.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValue.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValue.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValue.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValue.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValue.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValue.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue;
import java.util.List;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValueImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValueImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncInfoValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncInfoValueImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue;
import java.util.ArrayList;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValue.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValue.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValue.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValue.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValue.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValue.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValue.java Mon Mar 17 13:27:09 2014
@@ -17,9 +17,10 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum;
import org.apache.directory.api.ldap.model.message.Control;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValueImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValueImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncRequestValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SyncRequestValueImpl.java Mon Mar 17 13:27:09 2014
@@ -17,11 +17,12 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue;
import java.util.Arrays;
+import org.apache.directory.api.ldap.extras.controls.SynchronizationModeEnum;
import org.apache.directory.api.ldap.model.message.controls.AbstractControl;
import org.apache.directory.api.util.Strings;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SynchronizationInfoEnum.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationInfoEnum.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SynchronizationInfoEnum.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SynchronizationInfoEnum.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationInfoEnum.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SynchronizationInfoEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncInfoValue/SynchronizationInfoEnum.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue;
/**
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateTypeEnum.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateTypeEnum.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateTypeEnum.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateTypeEnum.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateTypeEnum.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateTypeEnum.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateTypeEnum.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncState;
import org.apache.directory.api.i18n.I18n;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValue.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValue.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValue.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValue.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValue.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValue.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValue.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncState;
import org.apache.directory.api.ldap.model.message.Control;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValueImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValueImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/SyncStateValueImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl/syncState/SyncStateValueImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.controls;
+package org.apache.directory.api.ldap.extras.controls.syncrepl.syncState;
import java.util.Arrays;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelRequest.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelRequest.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelRequest.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequest.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelRequest.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.cancel;
import org.apache.directory.api.ldap.model.message.ExtendedRequest;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelRequestImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelRequestImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelRequestImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelRequestImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.cancel;
import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelResponse.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelResponse.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelResponse.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponse.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponse.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelResponse.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.cancel;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelResponseImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelResponseImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelResponseImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/CancelResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/cancel/CancelResponseImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.cancel;
import org.apache.directory.api.i18n.I18n;
Added: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequest.java?rev=1578361&view=auto
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequest.java (added)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequest.java Mon Mar 17 13:27:09 2014
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.api.ldap.extras.extended.certGeneration;
+
+
+import org.apache.directory.api.ldap.model.message.ExtendedRequest;
+
+
+/**
+ * The interface for a certificate generation request extended operation.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface CertGenerationRequest extends ExtendedRequest<CertGenerationResponse>
+{
+ static final String EXTENSION_OID = "1.3.6.1.4.1.18060.0.1.8";
+
+
+ String getTargetDN();
+
+
+ void setTargetDN( String targetDN );
+
+
+ String getIssuerDN();
+
+
+ void setIssuerDN( String issuerDN );
+
+
+ String getSubjectDN();
+
+
+ void setSubjectDN( String subjectDN );
+
+
+ String getKeyAlgorithm();
+
+
+ void setKeyAlgorithm( String keyAlgorithm );
+
+}
\ No newline at end of file
Added: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequestImpl.java?rev=1578361&view=auto
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequestImpl.java (added)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequestImpl.java Mon Mar 17 13:27:09 2014
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.api.ldap.extras.extended.certGeneration;
+
+
+import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
+
+
+/**
+ *
+ * An extended operation requesting the server to generate a public/private key pair and a certificate
+ * and store them in a specified target entry in the DIT.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class CertGenerationRequestImpl extends AbstractExtendedRequest<CertGenerationResponse> implements
+ CertGenerationRequest
+{
+ /** the Dn of the server entry which will be updated*/
+ private String targetDN;
+
+ /** the issuer Dn that will be set in the certificate*/
+ private String issuerDN;// = "CN=ApacheDS, OU=Directory, O=ASF, C=US";
+
+ /** the Dn of the subject that is present in the certificate*/
+ private String subjectDN;// = "CN=ApacheDS, OU=Directory, O=ASF, C=US";
+
+ /** name of the algorithm used for generating the keys*/
+ private String keyAlgorithm;// = "RSA";
+
+
+ /**
+ * Creates a new instance of CertGenerationRequest.
+ *
+ * @param messageId the message id
+ * @param targerDN the Dn of target entry whose key and certificate values will be changed
+ * @param issuerDN Dn to be used as the issuer's Dn in the certificate
+ * @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 )
+ {
+ super( messageId );
+ setRequestName( EXTENSION_OID );
+ this.targetDN = targerDN;
+ this.issuerDN = issuerDN;
+ this.subjectDN = subjectDN;
+ this.keyAlgorithm = keyAlgorithm;
+ }
+
+
+ /**
+ * Creates a new instance of CertGenerationRequest.
+ */
+ public CertGenerationRequestImpl()
+ {
+ setRequestName( EXTENSION_OID );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getTargetDN()
+ {
+ return targetDN;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setTargetDN( String targetDN )
+ {
+ this.targetDN = targetDN;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getIssuerDN()
+ {
+ return issuerDN;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setIssuerDN( String issuerDN )
+ {
+ this.issuerDN = issuerDN;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getSubjectDN()
+ {
+ return subjectDN;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setSubjectDN( String subjectDN )
+ {
+ this.subjectDN = subjectDN;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getKeyAlgorithm()
+ {
+ return keyAlgorithm;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setKeyAlgorithm( String keyAlgorithm )
+ {
+ this.keyAlgorithm = keyAlgorithm;
+ }
+
+
+ @Override
+ public CertGenerationResponse getResultResponse()
+ {
+ return new CertGenerationResponseImpl();
+ }
+
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append( "Certficate Generation Object { " ).append( " Target Dn: " ).append( targetDN ).append( ',' );
+ sb.append( " Issuer Dn: " ).append( issuerDN ).append( ',' );
+ sb.append( " Subject Dn: " ).append( subjectDN ).append( ',' );
+ sb.append( " Key Algorithm: " ).append( keyAlgorithm ).append( " }" );
+
+ return sb.toString();
+ }
+}
Propchange: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponse.java?rev=1578361&view=auto
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponse.java (added)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponse.java Mon Mar 17 13:27:09 2014
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.api.ldap.extras.extended.certGeneration;
+
+
+import org.apache.directory.api.ldap.model.message.ExtendedResponse;
+
+
+/**
+ * The interface for the certificate generation extended operation.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface CertGenerationResponse extends ExtendedResponse
+{
+ /** The CertGenerationResponse OID */
+ static final String EXTENSION_OID = CertGenerationRequest.EXTENSION_OID;
+}
\ No newline at end of file
Added: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponseImpl.java?rev=1578361&view=auto
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponseImpl.java (added)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponseImpl.java Mon Mar 17 13:27:09 2014
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.api.ldap.extras.extended.certGeneration;
+
+
+import org.apache.directory.api.i18n.I18n;
+import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
+
+
+/**
+ *
+ * The response sent back from the server after the CertGeneration extended operation is performed.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class CertGenerationResponseImpl extends ExtendedResponseImpl implements CertGenerationResponse
+{
+ public CertGenerationResponseImpl( int messageId, ResultCodeEnum rcode )
+ {
+ super( messageId, EXTENSION_OID );
+
+ switch ( rcode )
+ {
+ case SUCCESS:
+ case OPERATIONS_ERROR:
+ case INSUFFICIENT_ACCESS_RIGHTS:
+ break;
+
+ default:
+ throw new IllegalArgumentException( I18n.err( I18n.ERR_04166, ResultCodeEnum.SUCCESS,
+ ResultCodeEnum.OPERATIONS_ERROR, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
+ }
+
+ super.getLdapResult().setMatchedDn( null );
+ super.getLdapResult().setResultCode( rcode );
+ }
+
+
+ public CertGenerationResponseImpl( int messageId )
+ {
+ super( messageId, EXTENSION_OID );
+ super.getLdapResult().setMatchedDn( null );
+ super.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
+ }
+
+
+ public CertGenerationResponseImpl()
+ {
+ super( EXTENSION_OID );
+ super.getLdapResult().setMatchedDn( null );
+ super.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
+ }
+
+
+ /**
+ * Gets the OID uniquely identifying this extended response (a.k.a. its
+ * name).
+ *
+ * @return the OID of the extended response type.
+ */
+ public String getResponseName()
+ {
+ return EXTENSION_OID;
+ }
+
+
+ /**
+ * Sets the OID uniquely identifying this extended response (a.k.a. its
+ * name).
+ *
+ * @param oid
+ * the OID of the extended response type.
+ */
+ public void setResponseName( String oid )
+ {
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_04168, EXTENSION_OID ) );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ int hash = 37;
+ // Seems simple but look at the equals() method ...
+ hash = hash * 17 + getClass().getName().hashCode();
+
+ return hash;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals( Object obj )
+ {
+ if ( obj == this )
+ {
+ return true;
+ }
+
+ return ( obj instanceof CertGenerationResponseImpl );
+ }
+}
Propchange: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/certGeneration/CertGenerationResponseImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulDisconnect/GracefulDisconnectResponse.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulDisconnect/GracefulDisconnectResponse.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulDisconnect/GracefulDisconnectResponse.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponse.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponse.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulDisconnect/GracefulDisconnectResponse.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.gracefulDisconnect;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulDisconnect/GracefulDisconnectResponseImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulDisconnect/GracefulDisconnectResponseImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulDisconnect/GracefulDisconnectResponseImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulDisconnectResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulDisconnect/GracefulDisconnectResponseImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.gracefulDisconnect;
import org.apache.directory.api.i18n.I18n;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownRequest.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownRequest.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownRequest.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequest.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownRequest.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.gracefulShutdown;
import org.apache.directory.api.ldap.model.message.ExtendedRequest;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownRequestImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownRequestImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownRequestImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownRequestImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.gracefulShutdown;
import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownResponse.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownResponse.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownResponse.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponse.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponse.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownResponse.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.gracefulShutdown;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownResponseImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownResponseImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownResponseImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/GracefulShutdownResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/gracefulShutdown/GracefulShutdownResponseImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.gracefulShutdown;
import org.apache.directory.api.i18n.I18n;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyRequest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyRequest.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequest.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.pwdModify;
import org.apache.directory.api.ldap.model.message.ExtendedRequest;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyRequestImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyRequestImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.pwdModify;
import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyResponse.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyResponse.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponse.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.pwdModify;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyResponseImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/PwdModifyResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/pwdModify/PwdModifyResponseImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.pwdModify;
import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureParameter.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureParameter.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureParameter.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureParameter.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureParameter.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureParameter.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureParameter.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.storedProcedure;
import org.apache.directory.api.util.Strings;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequest.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequest.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequest.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequest.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequest.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequest.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.storedProcedure;
import java.util.List;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureRequestImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.storedProcedure;
import java.util.ArrayList;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponse.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponse.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponse.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponse.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponse.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponse.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.storedProcedure;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
Copied: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java (from r1578136, directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java?p2=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java&p1=directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java&r1=1578136&r2=1578361&rev=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/StoredProcedureResponseImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/api/ldap/extras/extended/storedProcedure/StoredProcedureResponseImpl.java Mon Mar 17 13:27:09 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.extras.extended;
+package org.apache.directory.api.ldap.extras.extended.storedProcedure;
import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java?rev=1578361&r1=1578360&r2=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java Mon Mar 17 13:27:09 2014
@@ -23,27 +23,27 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.ldap.codec.api.ControlFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
-import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
-import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
-import org.apache.directory.api.ldap.extras.controls.SyncStateValue;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
import org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue.SyncInfoValue;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue.SyncRequestValue;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncState.SyncStateValue;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory;
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory;
-import org.apache.directory.api.ldap.extras.extended.CancelRequest;
-import org.apache.directory.api.ldap.extras.extended.CertGenerationRequest;
-import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse;
-import org.apache.directory.api.ldap.extras.extended.GracefulShutdownRequest;
-import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequest;
import org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory;
import org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory;
import org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory;
import org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory;
import org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory;
import org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory;
+import org.apache.directory.api.ldap.extras.extended.cancel.CancelRequest;
+import org.apache.directory.api.ldap.extras.extended.certGeneration.CertGenerationRequest;
+import org.apache.directory.api.ldap.extras.extended.gracefulDisconnect.GracefulDisconnectResponse;
+import org.apache.directory.api.ldap.extras.extended.gracefulShutdown.GracefulShutdownRequest;
+import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureRequest;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -79,20 +79,20 @@ public class ExtrasBundleActivator imple
*/
private void registerExtrasControls( LdapApiService codec )
{
- ControlFactory<?, ?> factory = new SyncDoneValueFactory( codec );
- codec.registerControl( factory );
+ ControlFactory<SyncDoneValue> syncDoneValuefactory = new SyncDoneValueFactory( codec );
+ codec.registerControl( syncDoneValuefactory );
- factory = new SyncInfoValueFactory( codec );
- codec.registerControl( factory );
+ ControlFactory<SyncInfoValue> syncInfoValueFactory = new SyncInfoValueFactory( codec );
+ codec.registerControl( syncInfoValueFactory );
- factory = new SyncRequestValueFactory( codec );
- codec.registerControl( factory );
+ ControlFactory<SyncRequestValue> syncRequestValueFactory = new SyncRequestValueFactory( codec );
+ codec.registerControl( syncRequestValueFactory );
- factory = new SyncStateValueFactory( codec );
- codec.registerControl( factory );
+ ControlFactory<SyncStateValue> syncStateValuefactory = new SyncStateValueFactory( codec );
+ codec.registerControl( syncStateValuefactory );
- factory = new PasswordPolicyFactory( codec );
- codec.registerControl( factory );
+ ControlFactory<PasswordPolicy> passwordPolicyFactory = new PasswordPolicyFactory( codec );
+ codec.registerControl( passwordPolicyFactory );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/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/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java?rev=1578361&r1=1578360&r2=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java Mon Mar 17 13:27:09 2014
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.extras.controls.ppolicy_impl;
+import org.apache.directory.api.ldap.codec.api.CodecControl;
import org.apache.directory.api.ldap.codec.api.ControlFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
@@ -31,7 +32,7 @@ import org.apache.directory.api.ldap.ext
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class PasswordPolicyFactory implements ControlFactory<PasswordPolicy, PasswordPolicyDecorator>
+public class PasswordPolicyFactory implements ControlFactory<PasswordPolicy>
{
private LdapApiService codec;
@@ -61,7 +62,7 @@ public class PasswordPolicyFactory imple
*
* {@inheritDoc}
*/
- public PasswordPolicyDecorator newCodecControl()
+ public CodecControl<PasswordPolicy> newCodecControl()
{
return new PasswordPolicyDecorator( codec );
}
@@ -71,7 +72,7 @@ public class PasswordPolicyFactory imple
*
* {@inheritDoc}
*/
- public PasswordPolicyDecorator newCodecControl( PasswordPolicy control )
+ public CodecControl<PasswordPolicy> newCodecControl( PasswordPolicy control )
{
return new PasswordPolicyDecorator( codec, control );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/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/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java?rev=1578361&r1=1578360&r2=1578361&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java Mon Mar 17 13:27:09 2014
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.ber.AbstractContainer;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
+import org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone.SyncDoneValue;
/**