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 2018/02/01 22:21:25 UTC
[directory-ldap-api] branch master updated: o Declared the
EndTransaction extended operation for OSGi usage
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
The following commit(s) were added to refs/heads/master by this push:
new e06d0b7 o Declared the EndTransaction extended operation for OSGi usage
e06d0b7 is described below
commit e06d0b71843a0afa1f79ffe6042f919dbd943862
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Thu Feb 1 23:21:14 2018 +0100
o Declared the EndTransaction extended operation for OSGi usage
---
.../api/ldap/codec/api/StandaloneLdapCodecServiceTest.java | 1 +
.../directory/api/ldap/codec/standalone/CodecFactoryUtil.java | 5 +++++
.../api/ldap/codec/standalone/AbstractCodecServiceTest.java | 1 +
ldap/extras/codec/pom.xml | 2 ++
.../org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java | 6 ++++++
5 files changed, 15 insertions(+)
diff --git a/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java b/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
index 6c7eda1..d8db847 100644
--- a/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
+++ b/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
@@ -72,6 +72,7 @@ public class StandaloneLdapCodecServiceTest
StandaloneLdapApiService.EXTENDED_OPERATIONS_LIST,
"org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory,"
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,"
+ + "org.apache.directory.api.ldap.extras.extended.ads_impl.endTransaction.EndTransactionFactory,"
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory,"
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,"
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory,"
diff --git a/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java b/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java
index 46d17bf..d421a5c 100644
--- a/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java
+++ b/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/CodecFactoryUtil.java
@@ -63,6 +63,7 @@ import org.apache.directory.api.ldap.extras.controls.vlv_impl.VirtualListViewReq
import org.apache.directory.api.ldap.extras.controls.vlv_impl.VirtualListViewResponseFactory;
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.endTransaction.EndTransactionFactory;
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;
@@ -228,6 +229,10 @@ public final class CodecFactoryUtil
extendendOperationsFactories.put( certGenerationFactory.getOid(), certGenerationFactory );
LOG.info( "Registered pre-bundled extended operation factory: {}", certGenerationFactory.getOid() );
+ EndTransactionFactory endTransactionFactory = new EndTransactionFactory( apiService );
+ extendendOperationsFactories.put( endTransactionFactory.getOid(), endTransactionFactory );
+ LOG.info( "Registered pre-bundled extended operation factory: {}", endTransactionFactory.getOid() );
+
GracefulDisconnectFactory gracefulDisconnectFactory = new GracefulDisconnectFactory( apiService );
extendendOperationsFactories.put( gracefulDisconnectFactory.getOid(), gracefulDisconnectFactory );
LOG.info( "Registered pre-bundled extended operation factory: {}", gracefulDisconnectFactory.getOid() );
diff --git a/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java b/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java
index e8c1811..fe759a6 100644
--- a/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java
+++ b/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java
@@ -74,6 +74,7 @@ public abstract class AbstractCodecServiceTest
System.setProperty( StandaloneLdapApiService.EXTENDED_OPERATIONS_LIST,
"org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory," +
"org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory," +
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.endTransaction.EndTransactionFactory" +
"org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" +
"org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory," +
"org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory," +
diff --git a/ldap/extras/codec/pom.xml b/ldap/extras/codec/pom.xml
index b6c4fcb..97b659c 100644
--- a/ldap/extras/codec/pom.xml
+++ b/ldap/extras/codec/pom.xml
@@ -113,6 +113,7 @@
org.apache.directory.api.ldap.extras.controls.vlv_impl;version=${project.version};-noimport:=true,
org.apache.directory.api.ldap.extras.extended.ads_impl.cancel;version=${project.version};-noimport:=true,
org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration;version=${project.version};-noimport:=true,
+ org.apache.directory.api.ldap.extras.extended.ads_impl.endTransaction;version=${project.version};-noimport:=true,
org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect;version=${project.version};-noimport:=true,
org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown;version=${project.version};-noimport:=true,
org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify;version=${project.version};-noimport:=true,
@@ -141,6 +142,7 @@
org.apache.directory.api.ldap.extras.controls.vlv;version=${project.version},
org.apache.directory.api.ldap.extras.extended.cancel;version=${project.version},
org.apache.directory.api.ldap.extras.extended.certGeneration;version=${project.version},
+ org.apache.directory.api.ldap.extras.extended.endTransaction;version=${project.version},
org.apache.directory.api.ldap.extras.extended.gracefulDisconnect;version=${project.version},
org.apache.directory.api.ldap.extras.extended.gracefulShutdown;version=${project.version},
org.apache.directory.api.ldap.extras.extended.pwdModify;version=${project.version},
diff --git a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
index f2ff0a0..a1a308d 100644
--- a/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
+++ b/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
@@ -50,6 +50,7 @@ import org.apache.directory.api.ldap.extras.controls.vlv_impl.VirtualListViewReq
import org.apache.directory.api.ldap.extras.controls.vlv_impl.VirtualListViewResponseFactory;
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.endTransaction.EndTransactionFactory;
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;
@@ -59,6 +60,7 @@ import org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.St
import org.apache.directory.api.ldap.extras.extended.ads_impl.whoAmI.WhoAmIFactory;
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.endTransaction.EndTransactionRequest;
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.pwdModify.PasswordModifyRequest;
@@ -136,6 +138,9 @@ public class ExtrasBundleActivator implements BundleActivator
CertGenerationFactory certGenerationFactory = new CertGenerationFactory( codec );
codec.registerExtendedRequest( certGenerationFactory );
+ EndTransactionFactory endTransactionFactory = new EndTransactionFactory( codec );
+ codec.registerExtendedRequest( endTransactionFactory );
+
GracefulDisconnectFactory gracefulDisconnectFactory = new GracefulDisconnectFactory( codec );
codec.registerExtendedRequest( gracefulDisconnectFactory );
@@ -181,6 +186,7 @@ public class ExtrasBundleActivator implements BundleActivator
{
codec.unregisterExtendedRequest( CancelRequest.EXTENSION_OID );
codec.unregisterExtendedRequest( CertGenerationRequest.EXTENSION_OID );
+ codec.unregisterExtendedRequest( EndTransactionRequest.EXTENSION_OID );
codec.unregisterExtendedRequest( GracefulShutdownRequest.EXTENSION_OID );
codec.unregisterExtendedRequest( GracefulDisconnectResponse.EXTENSION_OID );
codec.unregisterExtendedRequest( PasswordModifyRequest.EXTENSION_OID );
--
To stop receiving notification emails like this one, please contact
elecharny@apache.org.