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 2011/05/19 12:29:08 UTC
svn commit: r1124671 [5/5] - in /directory/shared/trunk: ./ all/
dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml/parser/src/main/java/org/apache/direc...
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.codec.decorators;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
import org.apache.directory.shared.ldap.model.message.Request;
@@ -39,7 +39,7 @@ public abstract class RequestDecorator<M
*
* @param decoratedMessage the decorated message
*/
- public RequestDecorator( LdapCodecService codec, M decoratedMessage )
+ public RequestDecorator( LdapApiService codec, M decoratedMessage )
{
super( codec, decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.codec.decorators;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
import org.apache.directory.shared.ldap.model.message.LdapResult;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
@@ -42,7 +42,7 @@ public abstract class ResponseDecorator<
*
* @param decoratedMessage the decorated AddRequest
*/
- public ResponseDecorator( LdapCodecService codec, M decoratedMessage )
+ public ResponseDecorator( LdapApiService codec, M decoratedMessage )
{
super( codec, decoratedMessage );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.codec.decorators;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
import org.apache.directory.shared.ldap.model.message.ResultResponseRequest;
@@ -38,7 +38,7 @@ public abstract class ResultResponseRequ
*
* @param decoratedMessage the decorated message
*/
- public ResultResponseRequestDecorator( LdapCodecService codec, M decoratedMessage )
+ public ResultResponseRequestDecorator( LdapApiService codec, M decoratedMessage )
{
super( codec, decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java Thu May 19 10:28:59 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.AttributeValueAssertion;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.LdapConstants;
import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -104,7 +104,7 @@ public class SearchRequestDecorator exte
*
* @param decoratedMessage the decorated SearchRequest
*/
- public SearchRequestDecorator( LdapCodecService codec, SearchRequest decoratedMessage )
+ public SearchRequestDecorator( LdapApiService codec, SearchRequest decoratedMessage )
{
super( codec, decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java Thu May 19 10:28:59 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.LdapConstants;
import org.apache.directory.shared.ldap.model.message.SearchResultDone;
@@ -47,7 +47,7 @@ public class SearchResultDoneDecorator e
*
* @param decoratedMessage the decorated SearchResultDone
*/
- public SearchResultDoneDecorator( LdapCodecService codec, SearchResultDone decoratedMessage )
+ public SearchResultDoneDecorator( LdapApiService codec, SearchResultDone decoratedMessage )
{
super( codec, decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java Thu May 19 10:28:59 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.LdapConstants;
import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
@@ -74,7 +74,7 @@ public class SearchResultEntryDecorator
*
* @param decoratedMessage the decorated SearchResultEntry
*/
- public SearchResultEntryDecorator( LdapCodecService codec, SearchResultEntry decoratedMessage )
+ public SearchResultEntryDecorator( LdapApiService codec, SearchResultEntry decoratedMessage )
{
super( codec, decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java Thu May 19 10:28:59 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.LdapConstants;
import org.apache.directory.shared.ldap.codec.api.LdapEncoder;
import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -55,7 +55,7 @@ public class SearchResultReferenceDecora
*
* @param decoratedMessage the decorated SearchResultReference
*/
- public SearchResultReferenceDecorator( LdapCodecService codec, SearchResultReference decoratedMessage )
+ public SearchResultReferenceDecorator( LdapApiService codec, SearchResultReference decoratedMessage )
{
super( codec, decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.codec.decorators;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.model.message.AbandonListener;
import org.apache.directory.shared.ldap.model.message.AbandonableRequest;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -41,7 +41,7 @@ public abstract class SingleReplyRequest
*
* @param decoratedMessage the decorated message
*/
- public SingleReplyRequestDecorator( LdapCodecService codec, M decoratedMessage )
+ public SingleReplyRequestDecorator( LdapApiService codec, M decoratedMessage )
{
super( codec, decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java Thu May 19 10:28:59 2011
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.LdapConstants;
import org.apache.directory.shared.ldap.model.message.UnbindRequest;
@@ -42,7 +42,7 @@ public class UnbindRequestDecorator exte
*
* @param decoratedMessage the decorated message
*/
- public UnbindRequestDecorator( LdapCodecService codec, UnbindRequest decoratedMessage )
+ public UnbindRequestDecorator( LdapApiService codec, UnbindRequest decoratedMessage )
{
super( codec, decoratedMessage );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java Thu May 19 10:28:59 2011
@@ -20,8 +20,8 @@
package org.apache.directory.shared.ldap.codec.osgi;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -53,8 +53,8 @@ public class DefaultActivator implements
*/
public void start( BundleContext bundleContext ) throws Exception
{
- registration = bundleContext.registerService( LdapCodecService.class.getName(), codec, null );
- LdapCodecServiceFactory.initialize( codec );
+ registration = bundleContext.registerService( LdapApiService.class.getName(), codec, null );
+ LdapApiServiceFactory.initialize( codec );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java Thu May 19 10:28:59 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.api.CodecControl;
import org.apache.directory.shared.ldap.codec.api.ControlFactory;
import org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
import org.apache.directory.shared.ldap.codec.api.UnsolicitedResponseFactory;
import org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory;
@@ -62,12 +62,12 @@ import javax.naming.NamingException;
/**
- * The default {@link LdapCodecService} implementation.
+ * The default {@link LdapApiService} implementation.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class DefaultLdapCodecService implements LdapCodecService
+public class DefaultLdapCodecService implements LdapApiService
{
/** A logger */
private static final Logger LOG = LoggerFactory.getLogger( DefaultLdapCodecService.class );
Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.codec.osgi;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.shared.ldap.codec.api.LdapEncoder;
import org.apache.directory.shared.ldap.codec.osgi.DefaultLdapCodecService;
import org.apache.mina.core.session.IoSession;
@@ -66,9 +66,9 @@ public abstract class AbstractCodecServi
});
- if ( LdapCodecServiceFactory.isInitialized() == false )
+ if ( LdapApiServiceFactory.isInitialized() == false )
{
- LdapCodecServiceFactory.initialize( codec );
+ LdapApiServiceFactory.initialize( codec );
}
encoder = new LdapEncoder( codec );
}
Propchange: directory/shared/trunk/ldap/codec/standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/codec/standalone:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067784
/directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1068227
Modified: directory/shared/trunk/ldap/codec/standalone/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/pom.xml?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/pom.xml (original)
+++ directory/shared/trunk/ldap/codec/standalone/pom.xml Thu May 19 10:28:59 2011
@@ -57,33 +57,15 @@
<groupId>${project.groupId}</groupId>
<artifactId>shared-ldap-codec-core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-codec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <configuration>
- <systemPropertyVariables>
- <workingDirectory>${basedir}/target</workingDirectory>
- <felix.cache.rootdir>
- ${project.build.directory}
- </felix.cache.rootdir>
- <felix.cache.locking>
- false
- </felix.cache.locking>
- <org.osgi.framework.storage>
- osgi-cache
- </org.osgi.framework.storage>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java Thu May 19 10:28:59 2011
@@ -20,8 +20,10 @@
package org.apache.directory.shared.ldap.codec.osgi;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.shared.ldap.codec.api.LdapEncoder;
-import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService;
+import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapApiService;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -34,7 +36,7 @@ import org.junit.BeforeClass;
public abstract class AbstractCodecServiceTest
{
/** The codec service */
- protected static StandaloneLdapCodecService codec;
+ protected static LdapApiService codec;
/** The encoder instance */
protected static LdapEncoder encoder;
@@ -44,9 +46,37 @@ public abstract class AbstractCodecServi
* Initialize the codec service
*/
@BeforeClass
- public static void setupLdapCodecService()
+ public static void setupLdapApiService() throws Exception
{
- codec = new StandaloneLdapCodecService();
+ // Load the extension points
+ System.setProperty( StandaloneLdapApiService.DEFAULT_CONTROLS_LIST,
+ "org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory," +
+ "org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory," +
+ "org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory," +
+ "org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory," +
+ "org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory," +
+ "org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" );
+
+ System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST,
+ "org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory," +
+ "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," +
+ "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," +
+ "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnFactory," +
+ "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," +
+ "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" );
+
+ System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST,
+ "org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory," +
+ "org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory," +
+ "org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory," +
+ "org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" );
+
+ System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST,
+ "org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" );
+
+ System.setProperty( StandaloneLdapApiService.EXTRA_EXTENDED_OPERATION_LIST, "" );
+
+ codec = LdapApiServiceFactory.getSingleton();
encoder = new LdapEncoder( codec );
}
Propchange: directory/shared/trunk/ldap/extras/aci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/extras/aci:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
/directory/shared/trunk/ldap-extras/aci:1068228-1072732,1072797-1075328
Propchange: directory/shared/trunk/ldap/extras/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/extras/codec:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067784
/directory/shared/trunk/ldap-codec:1067785-1067995
Propchange: directory/shared/trunk/ldap/extras/codec-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -3,6 +3,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/extras/codec-api:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067784
/directory/shared/trunk/ldap-codec:1067785-1067995
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java Thu May 19 10:28:59 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.api.ControlFactory;
import org.apache.directory.shared.ldap.codec.api.ExtendedRequestFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.UnsolicitedResponseFactory;
import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
@@ -41,11 +41,11 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse;
import org.apache.directory.shared.ldap.extras.extended.GracefulShutdownRequest;
import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CancelFactory;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CertGenerationFactory;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulDisconnectFactory;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulShutdownFactory;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.StoredProcedureFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -67,8 +67,8 @@ public class ExtrasBundleActivator imple
*/
public void start( BundleContext context ) throws Exception
{
- codecServiceRef = context.getServiceReference( LdapCodecService.class.getName() );
- LdapCodecService codec = ( LdapCodecService ) context.getService( codecServiceRef );
+ codecServiceRef = context.getServiceReference( LdapApiService.class.getName() );
+ LdapApiService codec = ( LdapApiService ) context.getService( codecServiceRef );
registerExtrasControls( codec );
registerExtrasExtendedOps( codec );
}
@@ -79,7 +79,7 @@ public class ExtrasBundleActivator imple
*
* @param codec The codec service.
*/
- private void registerExtrasControls( LdapCodecService codec )
+ private void registerExtrasControls( LdapApiService codec )
{
ControlFactory<?,?> factory = new SyncDoneValueFactory( codec );
codec.registerControl( factory );
@@ -106,7 +106,7 @@ public class ExtrasBundleActivator imple
*
* @param codec The codec service.
*/
- private void registerExtrasExtendedOps( LdapCodecService codec )
+ private void registerExtrasExtendedOps( LdapApiService codec )
{
// --------------------------------------------------------------------
// Register Extended Request Factories
@@ -131,7 +131,7 @@ public class ExtrasBundleActivator imple
// --------------------------------------------------------------------
- UnsolicitedResponseFactory<?> unsolicitedResponseFactory = new GracefulDisconnectFactory();
+ UnsolicitedResponseFactory<?> unsolicitedResponseFactory = new GracefulDisconnectFactory( codec );
codec.registerUnsolicitedResponse( unsolicitedResponseFactory );
}
@@ -141,7 +141,7 @@ public class ExtrasBundleActivator imple
*/
public void stop( BundleContext context ) throws Exception
{
- LdapCodecService codec = ( LdapCodecService ) context.getService( codecServiceRef );
+ LdapApiService codec = ( LdapApiService ) context.getService( codecServiceRef );
codec.unregisterControl( SyncDoneValue.OID );
codec.unregisterControl( SyncInfoValue.OID );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyContainer.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyContainer.java Thu May 19 10:28:59 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
@@ -37,7 +37,7 @@ public class PasswordPolicyContainer ext
private PasswordPolicyDecorator control;
- public PasswordPolicyContainer( LdapCodecService codec )
+ public PasswordPolicyContainer( LdapApiService codec )
{
super();
control = new PasswordPolicyDecorator( codec, new PasswordPolicyImpl() );
@@ -47,7 +47,7 @@ public class PasswordPolicyContainer ext
}
- public PasswordPolicyContainer( LdapCodecService codec, PasswordPolicy ppolicyResponse )
+ public PasswordPolicyContainer( LdapApiService codec, PasswordPolicy ppolicyResponse )
{
super();
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyDecorator.java Thu May 19 10:28:59 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
/**
@@ -52,19 +52,19 @@ public class PasswordPolicyDecorator ext
private int graceAuthNsRemainingTagLength;
- public PasswordPolicyDecorator( LdapCodecService codec )
+ public PasswordPolicyDecorator( LdapApiService codec )
{
super( codec, new PasswordPolicyImpl() );
}
- public PasswordPolicyDecorator( LdapCodecService codec, boolean hasResponse )
+ public PasswordPolicyDecorator( LdapApiService codec, boolean hasResponse )
{
super( codec, new PasswordPolicyImpl( hasResponse ) );
}
- public PasswordPolicyDecorator( LdapCodecService codec, PasswordPolicy policy )
+ public PasswordPolicyDecorator( LdapApiService codec, PasswordPolicy policy )
{
super( codec, policy );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
@@ -34,14 +34,14 @@ import org.apache.directory.shared.ldap.
public class PasswordPolicyFactory implements ControlFactory<PasswordPolicy, PasswordPolicyDecorator>
{
- private LdapCodecService codec;
+ private LdapApiService codec;
/**
* Creates a new instance of PasswordPolicyFactory.
*
*/
- public PasswordPolicyFactory( LdapCodecService codec )
+ public PasswordPolicyFactory( LdapApiService codec )
{
this.codec = codec;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
/**
@@ -35,7 +35,7 @@ public class SyncDoneValueContainer exte
/** syncDoneValue*/
private SyncDoneValueDecorator control;
- private LdapCodecService codec;
+ private LdapApiService codec;
/**
@@ -43,7 +43,7 @@ public class SyncDoneValueContainer exte
* Creates a new SyncDoneValueControlContainer object.
*
*/
- public SyncDoneValueContainer( LdapCodecService codec )
+ public SyncDoneValueContainer( LdapApiService codec )
{
super();
this.codec = codec;
@@ -59,7 +59,7 @@ public class SyncDoneValueContainer exte
* Creates a new SyncDoneValueControlContainer object.
*
*/
- public SyncDoneValueContainer( LdapCodecService codec, SyncDoneValueDecorator control )
+ public SyncDoneValueContainer( LdapApiService codec, SyncDoneValueDecorator control )
{
super();
this.codec = codec;
@@ -91,7 +91,7 @@ public class SyncDoneValueContainer exte
}
- public LdapCodecService getCodecService()
+ public LdapApiService getCodecService()
{
return codec;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java Thu May 19 10:28:59 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
import org.apache.directory.shared.ldap.extras.controls.SyncDoneValueImpl;
@@ -54,7 +54,7 @@ public class SyncDoneValueDecorator exte
/**
* Creates a new instance of SyncDoneValueControlCodec.
*/
- public SyncDoneValueDecorator( LdapCodecService codec )
+ public SyncDoneValueDecorator( LdapApiService codec )
{
super( codec, new SyncDoneValueImpl() );
}
@@ -66,7 +66,7 @@ public class SyncDoneValueDecorator exte
* @param codec The LDAP codec
* @param control The control to be decorated
*/
- public SyncDoneValueDecorator( LdapCodecService codec, SyncDoneValue control )
+ public SyncDoneValueDecorator( LdapApiService codec, SyncDoneValue control )
{
super( codec, control );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
public class SyncDoneValueFactory implements ControlFactory<SyncDoneValue, SyncDoneValueDecorator>
{
/** The codec for this factory */
- private LdapCodecService codec;
+ private LdapApiService codec;
/**
@@ -42,7 +42,7 @@ public class SyncDoneValueFactory implem
*
* @param codec The codec for this factory.
*/
- public SyncDoneValueFactory( LdapCodecService codec )
+ public SyncDoneValueFactory( LdapApiService codec )
{
this.codec = codec;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
/**
@@ -34,14 +34,14 @@ public class SyncInfoValueContainer exte
/** SyncInfoValueControl */
private SyncInfoValueDecorator control;
- private LdapCodecService codec;
+ private LdapApiService codec;
/**
* Creates a new SyncInfoValueControlContainer object. We will store one grammar,
* it's enough ...
*/
- public SyncInfoValueContainer( LdapCodecService codec )
+ public SyncInfoValueContainer( LdapApiService codec )
{
super();
this.codec = codec;
@@ -56,7 +56,7 @@ public class SyncInfoValueContainer exte
* Creates a new SyncInfoValueControlContainer object. We will store one grammar,
* it's enough ...
*/
- public SyncInfoValueContainer( LdapCodecService codec, SyncInfoValueDecorator control )
+ public SyncInfoValueContainer( LdapApiService codec, SyncInfoValueDecorator control )
{
super();
this.codec = codec;
@@ -88,7 +88,7 @@ public class SyncInfoValueContainer exte
}
- public LdapCodecService getCodecService()
+ public LdapApiService getCodecService()
{
return codec;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java Thu May 19 10:28:59 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
import org.apache.directory.shared.ldap.extras.controls.SyncInfoValueImpl;
import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum;
@@ -57,7 +57,7 @@ public class SyncInfoValueDecorator exte
/**
* The constructor for this codec. Dont't forget to set the type.
*/
- public SyncInfoValueDecorator( LdapCodecService codec )
+ public SyncInfoValueDecorator( LdapApiService codec )
{
super( codec, new SyncInfoValueImpl() );
}
@@ -66,7 +66,7 @@ public class SyncInfoValueDecorator exte
/**
* The constructor for this codec. Dont't forget to set the type.
*/
- public SyncInfoValueDecorator( LdapCodecService codec, SyncInfoValue control )
+ public SyncInfoValueDecorator( LdapApiService codec, SyncInfoValue control )
{
super( codec, control );
}
@@ -77,7 +77,7 @@ public class SyncInfoValueDecorator exte
* @param type The kind of syncInfo we will store. Can be newCookie,
* refreshPresent, refreshDelete or syncIdSet
*/
- public SyncInfoValueDecorator( LdapCodecService codec, SynchronizationInfoEnum type )
+ public SyncInfoValueDecorator( LdapApiService codec, SynchronizationInfoEnum type )
{
this( codec );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
public class SyncInfoValueFactory implements ControlFactory<SyncInfoValue, SyncInfoValueDecorator>
{
- private LdapCodecService codec;
+ private LdapApiService codec;
/**
@@ -42,7 +42,7 @@ public class SyncInfoValueFactory implem
*
* @param codec The codec for this factory.
*/
- public SyncInfoValueFactory( LdapCodecService codec )
+ public SyncInfoValueFactory( LdapApiService codec )
{
this.codec = codec;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.ber.AbstractContainer;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
/**
@@ -39,7 +39,7 @@ public class SyncModifyDnContainer exten
* Creates a new SyncStateValueControlContainer object. We will store one grammar,
* it's enough ...
*/
- public SyncModifyDnContainer( LdapCodecService codec )
+ public SyncModifyDnContainer( LdapApiService codec )
{
super();
this.control = new SyncModifyDnDecorator( codec );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java Thu May 19 10:28:59 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
import org.apache.directory.shared.ldap.extras.controls.SyncModifyDn;
import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnImpl;
@@ -76,20 +76,20 @@ public class SyncModifyDnDecorator exten
private Asn1Decoder decoder = new Asn1Decoder();
- public SyncModifyDnDecorator( LdapCodecService codec )
+ public SyncModifyDnDecorator( LdapApiService codec )
{
super( codec, new SyncModifyDnImpl() );
}
- public SyncModifyDnDecorator( LdapCodecService codec, SyncModifyDnType type )
+ public SyncModifyDnDecorator( LdapApiService codec, SyncModifyDnType type )
{
this( codec );
this.modDnType = type;
}
- public SyncModifyDnDecorator( LdapCodecService codec, SyncModifyDn control )
+ public SyncModifyDnDecorator( LdapApiService codec, SyncModifyDn control )
{
super( codec, control );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.SyncModifyDn;
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
public class SyncModifyDnFactory implements ControlFactory<SyncModifyDn, SyncModifyDnDecorator>
{
- private LdapCodecService codec;
+ private LdapApiService codec;
/**
@@ -42,7 +42,7 @@ public class SyncModifyDnFactory impleme
*
* @param codec The codec for this factory.
*/
- public SyncModifyDnFactory( LdapCodecService codec )
+ public SyncModifyDnFactory( LdapApiService codec )
{
this.codec = codec;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java Thu May 19 10:28:59 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
import org.apache.directory.shared.ldap.extras.controls.SyncRequestValueImpl;
@@ -52,13 +52,13 @@ public class SyncRequestValueDecorator
private static final Asn1Decoder decoder = new Asn1Decoder();
- public SyncRequestValueDecorator( LdapCodecService codec )
+ public SyncRequestValueDecorator( LdapApiService codec )
{
super( codec, new SyncRequestValueImpl() );
}
- public SyncRequestValueDecorator( LdapCodecService codec, SyncRequestValue control )
+ public SyncRequestValueDecorator( LdapApiService codec, SyncRequestValue control )
{
super( codec, control );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
public class SyncRequestValueFactory implements ControlFactory<SyncRequestValue, SyncRequestValueDecorator>
{
/** The codec for this factory */
- private LdapCodecService codec;
+ private LdapApiService codec;
/**
@@ -42,7 +42,7 @@ public class SyncRequestValueFactory imp
*
* @param codec The codec for this factory.
*/
- public SyncRequestValueFactory( LdapCodecService codec )
+ public SyncRequestValueFactory( LdapApiService codec )
{
this.codec = codec;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java Thu May 19 10:28:59 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
import org.apache.directory.shared.ldap.extras.controls.SyncStateValueImpl;
@@ -51,13 +51,13 @@ public class SyncStateValueDecorator ext
private static final Asn1Decoder decoder = new Asn1Decoder();
- public SyncStateValueDecorator( LdapCodecService codec )
+ public SyncStateValueDecorator( LdapApiService codec )
{
super( codec, new SyncStateValueImpl() );
}
- public SyncStateValueDecorator( LdapCodecService codec, SyncStateValue value )
+ public SyncStateValueDecorator( LdapApiService codec, SyncStateValue value )
{
super( codec, value );
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.codec.api.ControlFactory;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
public class SyncStateValueFactory implements ControlFactory<SyncStateValue, SyncStateValueDecorator>
{
/** The codec for this factory */
- private LdapCodecService codec;
+ private LdapApiService codec;
/**
@@ -42,7 +42,7 @@ public class SyncStateValueFactory imple
*
* @param codec The codec for this factory.
*/
- public SyncStateValueFactory( LdapCodecService codec )
+ public SyncStateValueFactory( LdapApiService codec )
{
this.codec = codec;
}
Modified: directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestTest.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CancelRequestTest.java Thu May 19 10:28:59 2011
@@ -31,9 +31,9 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.Asn1Container;
import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.Cancel;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CancelContainer;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CancelDecoder;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.Cancel;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelDecoder;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java Thu May 19 10:28:59 2011
@@ -29,9 +29,10 @@ import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequestImpl;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.CertGenerationContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationRequestDecorator;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -107,7 +108,7 @@ public class CertGenerationRequestTest
}
CertGenerationRequestDecorator req = new CertGenerationRequestDecorator(
- LdapCodecServiceFactory.getSingleton(), new CertGenerationRequestImpl() );
+ LdapApiServiceFactory.getSingleton(), new CertGenerationRequestImpl() );
req = container.getCertGenerationObject();
assertEquals( dn, req.getTargetDN() );
assertEquals( dn, req.getIssuerDN() );
Modified: directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectTest.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectTest.java Thu May 19 10:28:59 2011
@@ -29,6 +29,9 @@ import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnect;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectDecoder;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownTest.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulShutdownTest.java Thu May 19 10:28:59 2011
@@ -29,8 +29,8 @@ import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulShutdown;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.GracefulShutdownContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdown;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownContainer;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/StoredProcedureTest.java Thu May 19 10:28:59 2011
@@ -32,8 +32,9 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.StoredProcedureContainer;
-import org.apache.directory.shared.ldap.extras.extended.ads_impl.StoredProcedureDecoder;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureContainer;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureDecoder;
+import org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureRequestDecorator;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
Propchange: directory/shared/trunk/ldap/extras/sp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/extras/sp:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
/directory/shared/trunk/ldap-extras/sp:1068228-1072732,1072797-1075328
Modified: directory/shared/trunk/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java (original)
+++ directory/shared/trunk/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java Thu May 19 10:28:59 2011
@@ -36,7 +36,7 @@ import javax.naming.ldap.LdapContext;
import org.apache.commons.lang.SerializationUtils;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequestImpl;
@@ -150,7 +150,7 @@ public final class JavaStoredProcUtils
* Call the stored procedure via the extended operation
* and get back its return value.
*/
- ExtendedRequest jndiReq = LdapCodecServiceFactory.getSingleton().toJndi( req );
+ ExtendedRequest jndiReq = LdapApiServiceFactory.getSingleton().toJndi( req );
ExtendedResponse resp = ctx.extendedOperation( jndiReq );
/**
Propchange: directory/shared/trunk/ldap/extras/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/extras/trigger:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
/directory/shared/trunk/ldap-extras/trigger:1068228-1072732,1072797-1075328
Propchange: directory/shared/trunk/ldap/extras/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/extras/util:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
/directory/shared/trunk/ldap-extras/util:1068228-1072732,1072797-1075328
Modified: directory/shared/trunk/ldap/extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java (original)
+++ directory/shared/trunk/ldap/extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java Thu May 19 10:28:59 2011
@@ -48,7 +48,7 @@ import javax.naming.ldap.LdapName;
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.model.exception.LdapAffectMultipleDsaException;
import org.apache.directory.shared.ldap.model.exception.LdapAliasDereferencingException;
import org.apache.directory.shared.ldap.model.exception.LdapAliasException;
@@ -94,7 +94,7 @@ public final class JndiUtils
// @TODO not really needed and can be moved out
- public static javax.naming.ldap.Control toJndiControl( LdapCodecService codec, Control control )
+ public static javax.naming.ldap.Control toJndiControl( LdapApiService codec, Control control )
throws EncoderException
{
return codec.toJndiControl( control );
@@ -102,7 +102,7 @@ public final class JndiUtils
// @TODO not really needed and can be moved out
- public static javax.naming.ldap.Control[] toJndiControls( LdapCodecService codec, Control... controls )
+ public static javax.naming.ldap.Control[] toJndiControls( LdapApiService codec, Control... controls )
throws EncoderException
{
if ( controls != null )
@@ -125,7 +125,7 @@ public final class JndiUtils
// @TODO not really needed and can be moved out
- public static Control fromJndiControl( LdapCodecService codec, javax.naming.ldap.Control jndiControl )
+ public static Control fromJndiControl( LdapApiService codec, javax.naming.ldap.Control jndiControl )
throws DecoderException
{
return codec.fromJndiControl( jndiControl );
@@ -133,7 +133,7 @@ public final class JndiUtils
// @TODO not really needed and can be moved out
- public static Control[] fromJndiControls( LdapCodecService codec, javax.naming.ldap.Control... jndiControls )
+ public static Control[] fromJndiControls( LdapApiService codec, javax.naming.ldap.Control... jndiControls )
throws DecoderException
{
if ( jndiControls != null )
Propchange: directory/shared/trunk/ldap/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/model:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067491
/directory/shared/trunk/ldap-model:1067492-1067995,1068025-1072732,1072797-1075328
Propchange: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -3,6 +3,7 @@
/directory/shared/branches/shared-codec-merge/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:982370-987558
/directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980352-980933
+/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1103720-1124653
/directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686
/directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347
/directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
Propchange: directory/shared/trunk/ldap/net/mina/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -3,6 +3,7 @@
/directory/shared/branches/shared-codec-merge/ldap:982370-987558
/directory/shared/branches/shared-config/ldap:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
+/directory/shared/branches/shared-osgi/ldap/net/mina:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067784
/directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1074636
Modified: directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java (original)
+++ directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.codec.protocol.mina;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -63,7 +63,7 @@ public class LdapProtocolCodecActivator
public void start( BundleContext bundleContext ) throws Exception
{
registration = bundleContext.registerService( LdapProtocolCodecFactory.class.getName(), factory, null );
- LdapCodecServiceFactory.getSingleton().registerProtocolCodecFactory( factory );
+ LdapApiServiceFactory.getSingleton().registerProtocolCodecFactory( factory );
}
Modified: directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java (original)
+++ directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java Thu May 19 10:28:59 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import java.nio.ByteBuffer;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.shared.ldap.codec.api.LdapEncoder;
import org.apache.directory.shared.ldap.model.message.Message;
import org.apache.mina.core.buffer.IoBuffer;
@@ -49,7 +49,7 @@ public class LdapProtocolEncoder impleme
*/
public LdapProtocolEncoder()
{
- this.encoder = new LdapEncoder( LdapCodecServiceFactory.getSingleton() );
+ this.encoder = new LdapEncoder( LdapApiServiceFactory.getSingleton() );
}
Propchange: directory/shared/trunk/ldap/schema/data/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -4,6 +4,7 @@
/directory/shared/branches/shared-codec-merge/ldap-schema:982370-987558
/directory/shared/branches/shared-config/ldap-schema:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap-schema:980352-980933
+/directory/shared/branches/shared-osgi/ldap/schema/data:1103720-1124653
/directory/shared/branches/shared-replication/ldap-schema:749791-764113
/directory/shared/branches/shared-schema/ldap-schema:806622-809054
/directory/shared/branches/shared-subtree/ldap-schema:965208-965686
Propchange: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -3,6 +3,7 @@
/directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:982370-987558
/directory/shared/branches/shared-config/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980352-980933
+/directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1103720-1124653
/directory/shared/branches/shared-replication/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:749791-764113
/directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-893998
/directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
Propchange: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -3,6 +3,7 @@
/directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:982370-987558
/directory/shared/branches/shared-config/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:1023444-1029061
/directory/shared/branches/shared-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980352-980933
+/directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1103720-1124653
/directory/shared/branches/shared-replication/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:749791-764113
/directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-893998
/directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686