You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2013/08/02 18:07:08 UTC
svn commit: r1509755 [1/2] - in /directory:
apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/
apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/
apac...
Author: pamarcelot
Date: Fri Aug 2 16:07:07 2013
New Revision: 1509755
URL: http://svn.apache.org/r1509755
Log:
Part of a fix for DIRAPI-151 (Result codes from extended operations are lost).
Simplified the system properties used for controls and extended operations (distinction between default/extra was useless).
Added:
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java
- copied, changed from r1509247, directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestFactory.java
Removed:
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestFactory.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/UnsolicitedResponseFactory.java
Modified:
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
directory/apacheds/trunk/service/ApacheDS.launch
directory/apacheds/trunk/service/apacheds.bat
directory/apacheds/trunk/service/apacheds.sh
directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.bat Fri Aug 2 16:07:07 2013
@@ -33,13 +33,9 @@ REM Dynamically build the classpath
set ADS_CLASSPATH=
for %%i in (..\lib\*.jar) do call cpappend.bat %%i
-set DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory"
+set ADS_CONTROLS="-Dapacheds.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
-set EXT_CTRLS="-Dextra.controls=org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
-
-set DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory"
-
-set DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
+set ADS_EXTENDED_OPERATIONS="-Dapacheds.extendedOperations=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
REM Launching ApacheDS
-java %DEF_CTRLS% %EXT_CTRLS% %DEF_EXT_OP_REQ% %DEF_EXT_OP_RESP% -Dlog4j.configuration="file:../instances/%INSTANCE_NAME%/conf/log4j.properties" -Dapacheds.log.dir=../instances/%INSTANCE_NAME%/log -cp %ADS_CLASSPATH% org.apache.directory.server.UberjarMain ../instances/%INSTANCE_NAME%
+java %ADS_CONTROLS% %ADS_EXTENDED_OPERATIONS% -Dlog4j.configuration="file:../instances/%INSTANCE_NAME%/conf/log4j.properties" -Dapacheds.log.dir=../instances/%INSTANCE_NAME%/log -cp %ADS_CLASSPATH% org.apache.directory.server.UberjarMain ../instances/%INSTANCE_NAME%
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh Fri Aug 2 16:07:07 2013
@@ -60,13 +60,9 @@ do
ADS_CP=${ADS_CP}:$ADS_PWD/lib/${i}
done
-DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory"
+ADS_CONTROLS="-Dapacheds.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
-EXT_CTRLS="-Dextra.controls=org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
-
-DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory"
-
-DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
+ADS_EXTENDED_OPERATIONS="-Dapacheds.extendedOperations=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
# Launching ApacheDS
-java $JAVA_OPTS $DEF_CTRLS $EXT_CTRLS $DEF_EXT_OP_REQ $DEF_EXT_OP_RESP -Dlog4j.configuration=file:$ADS_PWD/instances/$ADS_INSTANCE_NAME/conf/log4j.properties -Dapacheds.log.dir=$ADS_PWD/instances/$ADS_INSTANCE_NAME/log -cp $ADS_CP org.apache.directory.server.UberjarMain $ADS_PWD/instances/$ADS_INSTANCE_NAME
\ No newline at end of file
+java $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS -Dlog4j.configuration=file:$ADS_PWD/instances/$ADS_INSTANCE_NAME/conf/log4j.properties -Dapacheds.log.dir=$ADS_PWD/instances/$ADS_INSTANCE_NAME/log -cp $ADS_CP org.apache.directory.server.UberjarMain $ADS_PWD/instances/$ADS_INSTANCE_NAME
\ No newline at end of file
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf Fri Aug 2 16:07:07 2013
@@ -35,10 +35,8 @@ wrapper.java.additional.2=-Dapacheds.var
wrapper.java.additional.3=-Dapacheds.log.dir=${double.quote}%INSTANCE_DIRECTORY%/log${double.quote}
wrapper.java.additional.4=-Dapacheds.run.dir=${double.quote}%INSTANCE_DIRECTORY%/run${double.quote}
wrapper.java.additional.5=-Dapacheds.instance=${double.quote}%INSTANCE%${double.quote}
-wrapper.java.additional.6=-Ddefault.controls=${double.quote}org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory${double.quote}
-wrapper.java.additional.7=-Dextra.controls=${double.quote}org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory${double.quote}
-wrapper.java.additional.8=-Ddefault.extendedOperation.requests=${double.quote}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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory${double.quote}
-wrapper.java.additional.9=-Ddefault.extendedOperation.responses=${double.quote}org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory${double.quote}
+wrapper.java.additional.6=-Dapacheds.controls=${double.quote}org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory${double.quote}
+wrapper.java.additional.8=-Dapacheds.extendedOperations=${double.quote}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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory${double.quote}
# Initial Java Heap Size (in MB)
#wrapper.java.initmemory=384
Modified: directory/apacheds/trunk/service/ApacheDS.launch
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/ApacheDS.launch?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/apacheds/trunk/service/ApacheDS.launch (original)
+++ directory/apacheds/trunk/service/ApacheDS.launch Fri Aug 2 16:07:07 2013
@@ -13,5 +13,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.directory.server.UberjarMain"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="./target/instance"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="apacheds-service"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configuration=file:./log4j.properties -Dapacheds.log.dir=./target/instance/log -Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory -Dextra.controls=org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueF
actory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory -Ddefault.extendedOperation.requests=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory -Ddefault.extendedOperation.responses=org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configuration=file:./log4j.properties -Dapacheds.log.dir=./target/instance/log -Dapacheds.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apach
e.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory -Dapacheds.extendedOperations=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"/>
</launchConfiguration>
Modified: directory/apacheds/trunk/service/apacheds.bat
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/apacheds.bat?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/apacheds/trunk/service/apacheds.bat (original)
+++ directory/apacheds/trunk/service/apacheds.bat Fri Aug 2 16:07:07 2013
@@ -36,13 +36,9 @@ IF NOT exist target/apacheds-service-2.0
md target/instance/partitions
md target/instance/log
-set DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory"
+set ADS_CONTROLS="-Dapacheds.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
-set EXT_CTRLS="-Dextra.controls=org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
+set ADS_EXTENDED_OPERATIONS="-Dapacheds.extendedOperations=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
-set DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory"
-
-set DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
-
-java %DEF_CTRLS% %EXT_CTRLS% %DEF_EXT_OP_REQ% %DEF_EXT_OP_RESP% -Dlog4j.configuration="file:///%cd%/target/instance/conf/log4j.properties" -jar target/apacheds-service-2.0.0-M11.jar %cd%/target/instance
+java %ADS_CONTROLS% %ADS_EXTENDED_OPERATIONS% -Dlog4j.configuration="file:///%cd%/target/instance/conf/log4j.properties" -jar target/apacheds-service-2.0.0-M11.jar %cd%/target/instance
Modified: directory/apacheds/trunk/service/apacheds.sh
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/apacheds.sh?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/apacheds/trunk/service/apacheds.sh (original)
+++ directory/apacheds/trunk/service/apacheds.sh Fri Aug 2 16:07:07 2013
@@ -40,12 +40,8 @@ if [ "$1" = -debug ] ; then
JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8008 -Xnoagent -Djava.compiler=NONE"
fi
-DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory"
+ADS_CONTROLS="-Dapacheds.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
-EXT_CTRLS="-Dextra.controls=org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory"
+ADS_EXTENDED_OPERATIONS="-Dapacheds.extendedOperations=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
-DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=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.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory"
-
-DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
-
-java $JAVA_OPTS $DEF_CTRLS $EXT_CTRLS $DEF_EXT_OP_REQ $DEF_EXT_OP_RESP -Dlog4j.configuration=file:./target/instance/conf/log4j.properties -Dapacheds.log.dir=./target/instance/log -jar $JAR ./target/instance
+java $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS -Dlog4j.configuration=file:./target/instance/conf/log4j.properties -Dapacheds.log.dir=./target/instance/log -jar $JAR ./target/instance
Modified: directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java (original)
+++ directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java Fri Aug 2 16:07:07 2013
@@ -82,31 +82,27 @@ public class FrameworkRunner extends Blo
static
{
// Load the extension points
- System.setProperty( StandaloneLdapApiService.DEFAULT_CONTROLS_LIST,
+ System.setProperty( StandaloneLdapApiService.CONTROLS_LIST,
"org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory," +
"org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory," +
"org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory," +
"org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory," +
"org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory," +
- "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" );
-
- System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST,
- "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
+ "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory," +
+ "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" );
- System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST,
+ 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.gracefulShutdown.GracefulShutdownFactory," +
"org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory," +
- "org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory"
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory," +
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
);
-
- System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST,
- "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" );
}
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/codec/api/StandaloneLdapCodecServiceTest.java Fri Aug 2 16:07:07 2013
@@ -44,33 +44,27 @@ public class StandaloneLdapCodecServiceT
public static void setupLdapApiService() throws Exception
{
// Load the extension points
- System.setProperty( StandaloneLdapApiService.DEFAULT_CONTROLS_LIST,
+ System.setProperty( StandaloneLdapApiService.CONTROLS_LIST,
"org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory," +
"org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory," +
"org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory," +
"org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory," +
"org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory," +
- "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" );
-
- System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST,
- "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
+ "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory," +
+ "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" );
- System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST,
+ 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.gracefulShutdown.GracefulShutdownFactory," +
"org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory," +
- "org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory"
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory," +
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"
);
-
- System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST,
- "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" );
-
- System.setProperty( StandaloneLdapApiService.EXTRA_EXTENDED_OPERATION_LIST, "" );
}
Copied: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java (from r1509247, directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestFactory.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java?p2=directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java&p1=directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestFactory.java&r1=1509247&r2=1509755&rev=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedRequestFactory.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/ExtendedOperationFactory.java Fri Aug 2 16:07:07 2013
@@ -26,13 +26,13 @@ import org.apache.directory.api.ldap.mod
/**
- * The factor interface, defined by the codec API for creating new
- * ExtendedRequests.
+ * The factory interface, defined by the codec API, for creating new
+ * requests/responses for extended operations.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public interface ExtendedRequestFactory<Q extends ExtendedRequest<P>, P extends ExtendedResponse>
+public interface ExtendedOperationFactory<Q extends ExtendedRequest<P>, P extends ExtendedResponse>
{
/**
* Gets the OID of the extended requests this factory generates.
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapApiService.java Fri Aug 2 16:07:07 2013
@@ -131,23 +131,23 @@ public interface LdapApiService
/**
- * Registers an {@link ExtendedRequestFactory} for generating extended request
+ * Registers an {@link ExtendedOperationFactory} for generating extended request
* response pairs.
*
* @param factory The extended request factory
* @return The displaced factory if one existed for the oid
*/
- ExtendedRequestFactory<?, ?> registerExtendedRequest( ExtendedRequestFactory<?, ?> factory );
+ ExtendedOperationFactory<?, ?> registerExtendedRequest( ExtendedOperationFactory<?, ?> factory );
/**
- * Unregisters an {@link ExtendedRequestFactory} for generating extended
+ * Unregisters an {@link ExtendedOperationFactory} for generating extended
* request response pairs.
*
* @param oid The extended request oid
* @return The displaced factory if one existed for the oid
*/
- ExtendedRequestFactory<?, ?> unregisterExtendedRequest( String oid );
+ ExtendedOperationFactory<?, ?> unregisterExtendedRequest( String oid );
/**
@@ -165,34 +165,6 @@ public interface LdapApiService
// ------------------------------------------------------------------------
/**
- * Returns an Iterator over the OID Strings of registered unsolicited
- * extended responses.
- *
- * @return The registered unsolicited extended response OID Strings
- */
- Iterator<String> registeredUnsolicitedResponses();
-
-
- /**
- * Registers an {@link UnsolicitedResponseFactory} for generating extended
- * responses sent by servers without an extended request.
- *
- * @param factory The unsolicited response creating factory
- * @return The displaced factory if one existed for the oid
- */
- UnsolicitedResponseFactory<?> registerUnsolicitedResponse( UnsolicitedResponseFactory<?> factory );
-
-
- /**
- * Unregisters an {@link UnsolicitedResponseFactory} for generating
- * extended responses sent by servers without an extended request.
- *
- * @param oid The unsolicited response oid
- */
- UnsolicitedResponseFactory<?> unregisterUnsolicitedResponse( String oid );
-
-
- /**
* Creates a model ExtendedResponse from the JNDI ExtendedResponse.
*
* @param jndiResponse The JNDI ExtendedResponse
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java Fri Aug 2 16:07:07 2013
@@ -35,12 +35,11 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.api.CodecControl;
import org.apache.directory.api.ldap.codec.api.ControlFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.api.MessageDecorator;
-import org.apache.directory.api.ldap.codec.api.UnsolicitedResponseFactory;
import org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory;
import org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory;
import org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory;
@@ -75,11 +74,8 @@ public class DefaultLdapCodecService imp
/** The map of registered {@link org.apache.directory.api.ldap.codec.api.ControlFactory}'s */
private Map<String, ControlFactory<?, ?>> controlFactories = new HashMap<String, ControlFactory<?, ?>>();
- /** The map of registered {@link org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory}'s by request OID */
- private Map<String, ExtendedRequestFactory<?, ?>> extReqFactories = new HashMap<String, ExtendedRequestFactory<?, ?>>();
-
- /** The map of registered {@link UnsolicitedResponseFactory}'s by request OID */
- private Map<String, UnsolicitedResponseFactory<?>> unsolicitedFactories = new HashMap<String, UnsolicitedResponseFactory<?>>();
+ /** The map of registered {@link org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory}'s by request OID */
+ private Map<String, ExtendedOperationFactory<?, ?>> extendedOperationsFactories = new HashMap<String, ExtendedOperationFactory<?, ?>>();
/** The registered ProtocolCodecFactory */
private ProtocolCodecFactory protocolCodecFactory;
@@ -170,16 +166,16 @@ public class DefaultLdapCodecService imp
*/
public Iterator<String> registeredExtendedRequests()
{
- return Collections.unmodifiableSet( extReqFactories.keySet() ).iterator();
+ return Collections.unmodifiableSet( extendedOperationsFactories.keySet() ).iterator();
}
/**
* {@inheritDoc}
*/
- public ExtendedRequestFactory<?, ?> registerExtendedRequest( ExtendedRequestFactory<?, ?> factory )
+ public ExtendedOperationFactory<?, ?> registerExtendedRequest( ExtendedOperationFactory<?, ?> factory )
{
- return extReqFactories.put( factory.getOid(), factory );
+ return extendedOperationsFactories.put( factory.getOid(), factory );
}
@@ -299,36 +295,9 @@ public class DefaultLdapCodecService imp
/**
* {@inheritDoc}
*/
- public ExtendedRequestFactory<?, ?> unregisterExtendedRequest( String oid )
- {
- return extReqFactories.remove( oid );
- }
-
-
- /**
- * {@inheritDoc}
- */
- public Iterator<String> registeredUnsolicitedResponses()
- {
- return Collections.unmodifiableSet( unsolicitedFactories.keySet() ).iterator();
- }
-
-
- /**
- * {@inheritDoc}
- */
- public UnsolicitedResponseFactory<?> registerUnsolicitedResponse( UnsolicitedResponseFactory<?> factory )
- {
- return unsolicitedFactories.put( factory.getOid(), factory );
- }
-
-
- /**
- * {@inheritDoc}
- */
- public UnsolicitedResponseFactory<?> unregisterUnsolicitedResponse( String oid )
+ public ExtendedOperationFactory<?, ?> unregisterExtendedRequest( String oid )
{
- return unsolicitedFactories.remove( oid );
+ return extendedOperationsFactories.remove( oid );
}
@@ -377,7 +346,8 @@ public class DefaultLdapCodecService imp
else
{
// have to ask the factory to decorate for us - can't do it ourselves
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( modelRequest.getRequestName() );
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( modelRequest
+ .getRequestName() );
ExtendedRequestDecorator<?, ?> decorator = extendedRequestFactory.decorate( modelRequest );
value = decorator.getRequestValue();
}
@@ -402,7 +372,7 @@ public class DefaultLdapCodecService imp
public javax.naming.ldap.ExtendedResponse createExtendedResponse( String id, byte[] berValue, int offset,
int length ) throws NamingException
{
- ExtendedRequestFactory<?, ?> factory = extReqFactories.get( modelRequest.getRequestName() );
+ ExtendedOperationFactory<?, ?> factory = extendedOperationsFactories.get( modelRequest.getRequestName() );
try
{
@@ -455,7 +425,7 @@ public class DefaultLdapCodecService imp
{
ExtendedResponseDecorator<ExtendedResponse> resp;
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( responseName );
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( responseName );
if ( extendedRequestFactory != null )
{
resp = ( ExtendedResponseDecorator<ExtendedResponse> ) extendedRequestFactory
@@ -481,7 +451,7 @@ public class DefaultLdapCodecService imp
{
ExtendedRequest<?> req = null;
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( oid );
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( oid );
if ( extendedRequestFactory != null )
{
req = extendedRequestFactory.newRequest( value );
@@ -508,7 +478,8 @@ public class DefaultLdapCodecService imp
{
ExtendedRequestDecorator<?, ?> req = null;
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( decoratedMessage.getRequestName() );
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( decoratedMessage
+ .getRequestName() );
if ( extendedRequestFactory != null )
{
req = extendedRequestFactory.decorate( decoratedMessage );
@@ -530,17 +501,12 @@ public class DefaultLdapCodecService imp
{
ExtendedResponseDecorator<?> resp = null;
- UnsolicitedResponseFactory<?> unsolicitedResponseFactory = unsolicitedFactories.get( decoratedMessage
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendedOperationsFactories.get( decoratedMessage
.getResponseName() );
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( decoratedMessage.getResponseName() );
if ( extendedRequestFactory != null )
{
resp = extendedRequestFactory.decorate( decoratedMessage );
}
- else if ( unsolicitedResponseFactory != null )
- {
- resp = unsolicitedResponseFactory.decorate( decoratedMessage );
- }
else
{
resp = new ExtendedResponseDecorator<ExtendedResponse>( this, decoratedMessage );
@@ -555,6 +521,6 @@ public class DefaultLdapCodecService imp
*/
public boolean isExtendedOperationRegistered( String oid )
{
- return extReqFactories.containsKey( oid ) || unsolicitedFactories.containsKey( oid );
+ return extendedOperationsFactories.containsKey( oid );
}
}
Modified: directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java Fri Aug 2 16:07:07 2013
@@ -37,12 +37,11 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.api.CodecControl;
import org.apache.directory.api.ldap.codec.api.ControlFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.api.MessageDecorator;
-import org.apache.directory.api.ldap.codec.api.UnsolicitedResponseFactory;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.ExtendedRequest;
import org.apache.directory.api.ldap.model.message.ExtendedRequestImpl;
@@ -71,30 +70,17 @@ public class StandaloneLdapApiService im
/** The map of registered {@link org.apache.directory.api.ldap.codec.api.ControlFactory}'s */
private Map<String, ControlFactory<?, ?>> controlFactories = new HashMap<String, ControlFactory<?, ?>>();
- /** The map of registered {@link org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory}'s by request OID */
- private Map<String, ExtendedRequestFactory<?, ?>> extReqFactories =
- new HashMap<String, ExtendedRequestFactory<?, ?>>();
-
- /** The map of registered {@link UnsolicitedResponseFactory}'s by request OID */
- private Map<String, UnsolicitedResponseFactory<?>> unsolicitedFactories = new HashMap<String, UnsolicitedResponseFactory<?>>();
+ /** The map of registered {@link org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory}'s by request OID */
+ private Map<String, ExtendedOperationFactory<?, ?>> extendendOperationsFactories = new HashMap<String, ExtendedOperationFactory<?, ?>>();
/** The LDAP {@link ProtocolCodecFactory} implementation used */
private ProtocolCodecFactory protocolCodecFactory;
- /** The list of default controls to load at startup */
- public static final String DEFAULT_CONTROLS_LIST = "default.controls";
-
- /** The list of extra controls to load at startup */
- public static final String EXTRA_CONTROLS_LIST = "extra.controls";
-
- /** The list of default extended operation requests to load at startup */
- public static final String DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST = "default.extendedOperation.requests";
-
- /** The list of default extended operation responses to load at startup */
- public static final String DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST = "default.extendedOperation.responses";
+ /** The list of controls to load at startup */
+ public static final String CONTROLS_LIST = "apacheds.controls";
- /** The list of extra controls to load at startup */
- public static final String EXTRA_EXTENDED_OPERATION_LIST = "extra.extendedOperations";
+ /** The list of extended operations to load at startup */
+ public static final String EXTENDED_OPERATIONS_LIST = "apacheds.extendedOperations";
/**
@@ -192,21 +178,8 @@ public class StandaloneLdapApiService im
*/
private void loadControls() throws Exception
{
- // first load the default controls
- loadDefaultControls();
-
- // The load the extra controls
- loadExtraControls();
- }
-
-
- /**
- * Loads the Controls implemented out of the box in the codec.
- */
- private void loadDefaultControls() throws Exception
- {
- // Load defaults from command line properties if it exists
- String defaultControlsList = System.getProperty( DEFAULT_CONTROLS_LIST );
+ // Load from command line properties if it exists
+ String defaultControlsList = System.getProperty( CONTROLS_LIST );
if ( Strings.isEmpty( defaultControlsList ) )
{
@@ -231,55 +204,14 @@ public class StandaloneLdapApiService im
/**
- * Loads the extra Controls
- */
- private void loadExtraControls() throws Exception
- {
- // Load extra from command line properties if it exists
- String extraControlsList = System.getProperty( EXTRA_CONTROLS_LIST );
-
- if ( Strings.isEmpty( extraControlsList ) )
- {
- return;
- }
-
- for ( String control : extraControlsList.split( "," ) )
- {
- Class<?>[] types = new Class<?>[]
- { LdapApiService.class };
- @SuppressWarnings("unchecked")
- Class<? extends ControlFactory<?, ?>> clazz = ( Class<? extends ControlFactory<?, ?>> ) Class
- .forName( control );
- Constructor<?> constructor = clazz.getConstructor( types );
-
- ControlFactory<?, ?> factory = ( ControlFactory<?, ?> ) constructor.newInstance( new Object[]
- { this } );
- controlFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
- }
- }
-
-
- /**
* Load the extended operations
*
* @throws Exception
*/
private void loadExtendedOperations() throws Exception
{
- loadDefaultExtendedOperationRequests();
- loadDefaultExtendedOperationResponses();
- loadExtraExtendedOperations();
- }
-
-
- /**
- * Loads the default extended operation requests
- */
- private void loadDefaultExtendedOperationRequests() throws Exception
- {
// Load from command line properties if it exists
- String defaultExtendedOperationsList = System.getProperty( DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST );
+ String defaultExtendedOperationsList = System.getProperty( EXTENDED_OPERATIONS_LIST );
if ( Strings.isEmpty( defaultExtendedOperationsList ) )
{
@@ -291,60 +223,20 @@ public class StandaloneLdapApiService im
Class<?>[] types = new Class<?>[]
{ LdapApiService.class };
@SuppressWarnings("unchecked")
- Class<? extends ExtendedRequestFactory<?, ?>> clazz = ( Class<? extends ExtendedRequestFactory<?, ?>> ) Class
+ Class<? extends ExtendedOperationFactory<?, ?>> clazz = ( Class<? extends ExtendedOperationFactory<?, ?>> ) Class
.forName( extendedOperation );
Constructor<?> constructor = clazz.getConstructor( types );
@SuppressWarnings("unchecked")
- ExtendedRequestFactory<ExtendedRequest<ExtendedResponse>, ExtendedResponse> factory = ( ExtendedRequestFactory<ExtendedRequest<ExtendedResponse>, ExtendedResponse> ) constructor
+ ExtendedOperationFactory<ExtendedRequest<ExtendedResponse>, ExtendedResponse> factory = ( ExtendedOperationFactory<ExtendedRequest<ExtendedResponse>, ExtendedResponse> ) constructor
.newInstance( new Object[]
{ this } );
- extReqFactories.put( factory.getOid(), factory );
+ extendendOperationsFactories.put( factory.getOid(), factory );
LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
}
}
- /**
- * Loads the default extended operation responses
- */
- private void loadDefaultExtendedOperationResponses() throws Exception
- {
- // Load from command line properties if it exists
- String defaultExtendedOperationsList = System.getProperty( DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST );
-
- if ( Strings.isEmpty( defaultExtendedOperationsList ) )
- {
- return;
- }
-
- for ( String extendedOperation : defaultExtendedOperationsList.split( "," ) )
- {
- Class<?>[] types = new Class<?>[]
- { LdapApiService.class };
- @SuppressWarnings("unchecked")
- Class<? extends UnsolicitedResponseFactory<?>> clazz = ( Class<? extends UnsolicitedResponseFactory<?>> ) Class
- .forName( extendedOperation );
- Constructor<?> constructor = clazz.getConstructor( types );
-
- UnsolicitedResponseFactory<?> factory = ( UnsolicitedResponseFactory<?> ) constructor
- .newInstance( new Object[]
- { this } );
- unsolicitedFactories.put( factory.getOid(), factory );
- LOG.info( "Registered pre-bundled extended operation factory: {}", factory.getOid() );
- }
- }
-
-
- /**
- * Loads the extra extended operations
- */
- private void loadExtraExtendedOperations()
- {
-
- }
-
-
//-------------------------------------------------------------------------
// LdapCodecService implementation methods
//-------------------------------------------------------------------------
@@ -389,17 +281,17 @@ public class StandaloneLdapApiService im
*/
public Iterator<String> registeredExtendedRequests()
{
- return Collections.unmodifiableSet( extReqFactories.keySet() ).iterator();
+ return Collections.unmodifiableSet( extendendOperationsFactories.keySet() ).iterator();
}
/**
* {@inheritDoc}
*/
- public ExtendedRequestFactory<?, ?>
- registerExtendedRequest( ExtendedRequestFactory<?, ?> factory )
+ public ExtendedOperationFactory<?, ?>
+ registerExtendedRequest( ExtendedOperationFactory<?, ?> factory )
{
- return extReqFactories.put( factory.getOid(), factory );
+ return extendendOperationsFactories.put( factory.getOid(), factory );
}
@@ -523,24 +415,6 @@ public class StandaloneLdapApiService im
/**
* {@inheritDoc}
*/
- public Iterator<String> registeredUnsolicitedResponses()
- {
- return Collections.unmodifiableSet( unsolicitedFactories.keySet() ).iterator();
- }
-
-
- /**
- * {@inheritDoc}
- */
- public UnsolicitedResponseFactory<?> registerUnsolicitedResponse( UnsolicitedResponseFactory<?> factory )
- {
- return unsolicitedFactories.put( factory.getOid(), factory );
- }
-
-
- /**
- * {@inheritDoc}
- */
public javax.naming.ldap.ExtendedResponse toJndi( final ExtendedResponse modelResponse ) throws EncoderException
{
throw new NotImplementedException( "Figure out how to transform" );
@@ -559,19 +433,10 @@ public class StandaloneLdapApiService im
/**
* {@inheritDoc}
*/
- public ExtendedRequestFactory<?, ?> unregisterExtendedRequest(
+ public ExtendedOperationFactory<?, ?> unregisterExtendedRequest(
String oid )
{
- return extReqFactories.remove( oid );
- }
-
-
- /**
- * {@inheritDoc}
- */
- public UnsolicitedResponseFactory<?> unregisterUnsolicitedResponse( String oid )
- {
- return unsolicitedFactories.remove( oid );
+ return extendendOperationsFactories.remove( oid );
}
@@ -602,7 +467,8 @@ public class StandaloneLdapApiService im
else
{
// have to ask the factory to decorate for us - can't do it ourselves
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( modelRequest.getRequestName() );
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendendOperationsFactories.get( modelRequest
+ .getRequestName() );
ExtendedRequestDecorator<?, ?> decorator = extendedRequestFactory.decorate( modelRequest );
value = decorator.getRequestValue();
}
@@ -627,7 +493,7 @@ public class StandaloneLdapApiService im
public javax.naming.ldap.ExtendedResponse createExtendedResponse( String id, byte[] berValue, int offset,
int length ) throws NamingException
{
- ExtendedRequestFactory<?, ?> factory = extReqFactories.get( modelRequest.getRequestName() );
+ ExtendedOperationFactory<?, ?> factory = extendendOperationsFactories.get( modelRequest.getRequestName() );
try
{
@@ -677,7 +543,7 @@ public class StandaloneLdapApiService im
{
ExtendedResponseDecorator<ExtendedResponse> resp;
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( responseName );
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendendOperationsFactories.get( responseName );
if ( extendedRequestFactory != null )
{
@@ -705,7 +571,7 @@ public class StandaloneLdapApiService im
{
ExtendedRequest<?> req = null;
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendendOperationsFactories
.get( oid );
if ( extendedRequestFactory != null )
@@ -741,7 +607,8 @@ public class StandaloneLdapApiService im
{
ExtendedRequestDecorator<?, ?> req = null;
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( decoratedMessage.getRequestName() );
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendendOperationsFactories.get( decoratedMessage
+ .getRequestName() );
if ( extendedRequestFactory != null )
{
@@ -764,18 +631,13 @@ public class StandaloneLdapApiService im
{
ExtendedResponseDecorator<?> resp = null;
- UnsolicitedResponseFactory<?> unsolicitedResponseFactory = unsolicitedFactories.get( decoratedMessage
+ ExtendedOperationFactory<?, ?> extendedRequestFactory = extendendOperationsFactories.get( decoratedMessage
.getResponseName() );
- ExtendedRequestFactory<?, ?> extendedRequestFactory = extReqFactories.get( decoratedMessage.getResponseName() );
if ( extendedRequestFactory != null )
{
resp = extendedRequestFactory.decorate( decoratedMessage );
}
- else if ( unsolicitedResponseFactory != null )
- {
- resp = unsolicitedResponseFactory.decorate( decoratedMessage );
- }
else
{
resp = new ExtendedResponseDecorator<ExtendedResponse>( this, decoratedMessage );
@@ -790,6 +652,6 @@ public class StandaloneLdapApiService im
*/
public boolean isExtendedOperationRegistered( String oid )
{
- return extReqFactories.containsKey( oid ) || unsolicitedFactories.containsKey( oid );
+ return extendendOperationsFactories.containsKey( oid );
}
}
Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/api/ldap/codec/standalone/AbstractCodecServiceTest.java Fri Aug 2 16:07:07 2013
@@ -48,32 +48,26 @@ public abstract class AbstractCodecServi
public static void setupLdapApiService() throws Exception
{
// Load the extension points
- System.setProperty( StandaloneLdapApiService.DEFAULT_CONTROLS_LIST,
+ System.setProperty( StandaloneLdapApiService.CONTROLS_LIST,
"org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory," +
"org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory," +
"org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory," +
"org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory," +
"org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory," +
- "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" );
-
- System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST,
- "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
+ "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory," +
+ "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," +
"org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" );
- System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST,
+ 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.gracefulShutdown.GracefulShutdownFactory," +
"org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory," +
- "org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory" );
-
- System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST,
- "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" );
-
- System.setProperty( StandaloneLdapApiService.EXTRA_EXTENDED_OPERATION_LIST, "" );
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify.PasswordModifyFactory," +
+ "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" );
codec = LdapApiServiceFactory.getSingleton();
encoder = new LdapEncoder( codec );
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/ExtrasBundleActivator.java Fri Aug 2 16:07:07 2013
@@ -21,9 +21,8 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.ldap.codec.api.ControlFactory;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.UnsolicitedResponseFactory;
import org.apache.directory.api.ldap.extras.controls.SyncDoneValue;
import org.apache.directory.api.ldap.extras.controls.SyncInfoValue;
import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
@@ -108,7 +107,7 @@ public class ExtrasBundleActivator imple
// Register Extended Request Factories
// --------------------------------------------------------------------
- ExtendedRequestFactory<?, ?> extReqfactory = new CancelFactory( codec );
+ ExtendedOperationFactory<?, ?> extReqfactory = new CancelFactory( codec );
codec.registerExtendedRequest( extReqfactory );
extReqfactory = new CertGenerationFactory( codec );
@@ -123,12 +122,8 @@ public class ExtrasBundleActivator imple
extReqfactory = new PasswordModifyFactory( codec );
codec.registerExtendedRequest( extReqfactory );
- // --------------------------------------------------------------------
- // Register Unsolicited Response Factories
- // --------------------------------------------------------------------
-
- UnsolicitedResponseFactory<?> unsolicitedResponseFactory = new GracefulDisconnectFactory( codec );
- codec.registerUnsolicitedResponse( unsolicitedResponseFactory );
+ extReqfactory = new GracefulDisconnectFactory( codec );
+ codec.registerExtendedRequest( extReqfactory );
}
@@ -149,7 +144,6 @@ public class ExtrasBundleActivator imple
codec.unregisterExtendedRequest( CertGenerationRequest.EXTENSION_OID );
codec.unregisterExtendedRequest( GracefulShutdownRequest.EXTENSION_OID );
codec.unregisterExtendedRequest( StoredProcedureRequest.EXTENSION_OID );
-
- codec.unregisterUnsolicitedResponse( GracefulDisconnectResponse.EXTENSION_OID );
+ codec.unregisterExtendedRequest( GracefulDisconnectResponse.EXTENSION_OID );
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/cancel/CancelFactory.java Fri Aug 2 16:07:07 2013
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.CancelRequest;
@@ -34,12 +34,12 @@ import org.apache.directory.api.ldap.mod
/**
- * An {@link ExtendedRequestFactory} for creating cancel extended request response
+ * An {@link ExtendedOperationFactory} for creating cancel extended request response
* pairs.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CancelFactory implements ExtendedRequestFactory<CancelRequest, CancelResponse>
+public class CancelFactory implements ExtendedOperationFactory<CancelRequest, CancelResponse>
{
private LdapApiService codec;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/certGeneration/CertGenerationFactory.java Fri Aug 2 16:07:07 2013
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.CertGenerationRequest;
@@ -34,13 +34,13 @@ import org.apache.directory.api.ldap.mod
/**
- * An {@link ExtendedRequestFactory} for creating certificate generation extended request response
+ * An {@link ExtendedOperationFactory} for creating certificate generation extended request response
* pairs.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CertGenerationFactory
- implements ExtendedRequestFactory<CertGenerationRequest, CertGenerationResponse>
+ implements ExtendedOperationFactory<CertGenerationRequest, CertGenerationResponse>
{
private LdapApiService codec;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulDisconnect/GracefulDisconnectFactory.java Fri Aug 2 16:07:07 2013
@@ -21,22 +21,23 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.codec.api.UnsolicitedResponseFactory;
import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponse;
-import org.apache.directory.api.ldap.extras.extended.GracefulDisconnectResponseImpl;
+import org.apache.directory.api.ldap.model.message.ExtendedRequest;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
/**
- * An {@link ExtendedRequestFactory} for creating cancel extended request response
+ * An {@link ExtendedOperationFactory} for creating cancel extended request response
* pairs.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class GracefulDisconnectFactory implements UnsolicitedResponseFactory<GracefulDisconnectResponse>
+public class GracefulDisconnectFactory implements
+ ExtendedOperationFactory<ExtendedRequest<GracefulDisconnectResponse>, GracefulDisconnectResponse>
{
private LdapApiService codec;
@@ -50,6 +51,31 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
+ public ExtendedRequestDecorator<ExtendedRequest<GracefulDisconnectResponse>, GracefulDisconnectResponse> decorate(
+ ExtendedRequest<?> modelRequest )
+ {
+ // Nothing to do (there's no request associated to GracefulDisconnectResponse)
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ExtendedResponseDecorator<GracefulDisconnectResponse> decorate( ExtendedResponse decoratedMessage )
+ {
+ if ( decoratedMessage instanceof GracefulDisconnectResponseDecorator )
+ {
+ return ( GracefulDisconnectResponseDecorator ) decoratedMessage;
+ }
+
+ return new GracefulDisconnectResponseDecorator( codec, ( GracefulDisconnectResponse ) decoratedMessage );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
public String getOid()
{
return GracefulDisconnectResponse.EXTENSION_OID;
@@ -59,31 +85,28 @@ public class GracefulDisconnectFactory i
/**
* {@inheritDoc}
*/
- public GracefulDisconnectResponse newRequest()
+ public ExtendedRequest<GracefulDisconnectResponse> newRequest()
{
- return new GracefulDisconnectResponseDecorator( codec, new GracefulDisconnectResponseImpl() );
+ // Nothing to do (there's no request associated to GracefulDisconnectResponse)
+ return null;
}
/**
* {@inheritDoc}
*/
- public GracefulDisconnectResponse newResponse( byte[] encodedValue ) throws DecoderException
+ public ExtendedRequest<GracefulDisconnectResponse> newRequest( byte[] value )
{
- return new GracefulDisconnectResponseDecorator( codec, encodedValue );
+ // Nothing to do (there's no request associated to GracefulDisconnectResponse)
+ return null;
}
/**
* {@inheritDoc}
*/
- public ExtendedResponseDecorator<GracefulDisconnectResponse> decorate( ExtendedResponse decoratedMessage )
+ public GracefulDisconnectResponse newResponse( byte[] encodedValue ) throws DecoderException
{
- if ( decoratedMessage instanceof GracefulDisconnectResponseDecorator )
- {
- return ( GracefulDisconnectResponseDecorator ) decoratedMessage;
- }
-
- return new GracefulDisconnectResponseDecorator( codec, ( GracefulDisconnectResponse ) decoratedMessage );
+ return new GracefulDisconnectResponseDecorator( codec, encodedValue );
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/gracefulShutdown/GracefulShutdownFactory.java Fri Aug 2 16:07:07 2013
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.GracefulShutdownRequest;
@@ -34,13 +34,13 @@ import org.apache.directory.api.ldap.mod
/**
- * An {@link ExtendedRequestFactory} for creating cancel extended request response
+ * An {@link ExtendedOperationFactory} for creating cancel extended request response
* pairs.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class GracefulShutdownFactory
- implements ExtendedRequestFactory<GracefulShutdownRequest, GracefulShutdownResponse>
+ implements ExtendedOperationFactory<GracefulShutdownRequest, GracefulShutdownResponse>
{
private LdapApiService codec;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/pwdModify/PasswordModifyFactory.java Fri Aug 2 16:07:07 2013
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.PwdModifyRequest;
@@ -34,12 +34,12 @@ import org.apache.directory.api.ldap.mod
/**
- * An {@link ExtendedRequestFactory} for creating PwdModify extended request response
+ * An {@link ExtendedOperationFactory} for creating PwdModify extended request response
* pairs.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PasswordModifyFactory implements ExtendedRequestFactory<PwdModifyRequest, PwdModifyResponse>
+public class PasswordModifyFactory implements ExtendedOperationFactory<PwdModifyRequest, PwdModifyResponse>
{
private LdapApiService codec;
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java?rev=1509755&r1=1509754&r2=1509755&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureFactory.java Fri Aug 2 16:07:07 2013
@@ -22,7 +22,7 @@ package org.apache.directory.api.ldap.ex
import org.apache.directory.api.asn1.DecoderException;
import org.apache.directory.api.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.api.ldap.codec.api.ExtendedRequestFactory;
+import org.apache.directory.api.ldap.codec.api.ExtendedOperationFactory;
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.extras.extended.StoredProcedureRequest;
@@ -33,12 +33,12 @@ import org.apache.directory.api.ldap.mod
/**
- * An {@link ExtendedRequestFactory} for creating cancel extended request response
+ * An {@link ExtendedOperationFactory} for creating cancel extended request response
* pairs.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoredProcedureFactory implements ExtendedRequestFactory<StoredProcedureRequest, StoredProcedureResponse>
+public class StoredProcedureFactory implements ExtendedOperationFactory<StoredProcedureRequest, StoredProcedureResponse>
{
private LdapApiService codec;