You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2018/03/18 15:40:34 UTC
[directory-server] branch master updated: Fix startup scripts:
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 83e7c47 Fix startup scripts:
83e7c47 is described below
commit 83e7c478e5c53cca77ed8f0fa90487803232c257
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Mar 18 16:38:15 2018 +0100
Fix startup scripts:
* Package name of SyncInfoValueFactory was changed so startup failed
* Remove all explicit listed controls and extended operations, they are loaded by default by CodecFactoryUtil anyway
* Add ADS_INTERMEDIATE_RESPONSES to be consistent
---
.../directory/server/installers/archive/apacheds.sh | 20 +++++++++++++-------
service/ApacheDS.launch | 2 +-
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh
index 2dae41b..56300d6 100644
--- a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh
+++ b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/archive/apacheds.sh
@@ -37,6 +37,10 @@
#
# ADS_EXTENDED_OPERATIONS
# Extended operations to register.
+#
+# ADS_INTERMEDIATE_RESPONSES
+# Intermediate responses to register.
+#
# ADS_SHUTDOWN_PORT
# (Optional) If specified, it must be a valid port number
# between 1024 and 65536 on which ApacheDS will listen for
@@ -126,9 +130,11 @@ if $cygwin; then
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-[ -z "$ADS_CONTROLS" ] && 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.proxiedauthz.ProxiedAuthzFactory,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.control [...]
+[ -z "$ADS_CONTROLS" ] && ADS_CONTROLS="-Dapacheds.controls="
+
+[ -z "$ADS_EXTENDED_OPERATIONS" ] && ADS_EXTENDED_OPERATIONS="-Dapacheds.extendedOperations="
-[ -z "$ADS_EXTENDED_OPERATIONS" ] && 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.exten [...]
+[ -z "$ADS_INTERMEDIATE_RESPONSES" ] && ADS_INTERMEDIATE_RESPONSES="-Dapacheds.intermediateResponses="
if [ $HAVE_TTY -eq 1 ]; then
echo "Using ADS_HOME: $ADS_HOME"
@@ -149,7 +155,7 @@ if [ "$ADS_ACTION" = "start" ]; then
fi
# Launching ApacheDS
- eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS \
+ eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS $ADS_INTERMEDIATE_RESPONSES \
-Dlog4j.configuration="\"file:$ADS_INSTANCE/conf/log4j.properties\"" \
-Dapacheds.shutdown.port="\"$ADS_SHUTDOWN_PORT\"" \
-Dapacheds.log.dir="\"$ADS_INSTANCE/log\"" \
@@ -170,7 +176,7 @@ elif [ "$ADS_ACTION" = "repair" ]; then
fi
# Repairing ApacheDS
- eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS \
+ eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS $ADS_INTERMEDIATE_RESPONSES \
-Dlog4j.configuration="\"file:$ADS_INSTANCE/conf/log4j.properties\"" \
-Dapacheds.shutdown.port="\"$ADS_SHUTDOWN_PORT\"" \
-Dapacheds.log.dir="\"$ADS_INSTANCE/log\"" \
@@ -182,7 +188,7 @@ elif [ "$ADS_ACTION" = "repair" ]; then
[ $HAVE_TTY -eq 1 ] && echo "Starting ApacheDS instance '$ADS_INSTANCE_NAME'..."
# Launching ApacheDS
- eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS \
+ eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS $ADS_INTERMEDIATE_RESPONSES \
-Dlog4j.configuration="\"file:$ADS_INSTANCE/conf/log4j.properties\"" \
-Dapacheds.shutdown.port="\"$ADS_SHUTDOWN_PORT\"" \
-Dapacheds.log.dir="\"$ADS_INSTANCE/log\"" \
@@ -195,7 +201,7 @@ elif [ "$ADS_ACTION" = "run" ]; then
[ $HAVE_TTY -eq 1 ] && echo "Running ApacheDS instance '$ADS_INSTANCE_NAME'..."
# Launching ApacheDS
- eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS \
+ eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS $ADS_INTERMEDIATE_RESPONSES \
-Dlog4j.configuration="\"file:$ADS_INSTANCE/conf/log4j.properties\"" \
-Dapacheds.log.dir="\"$ADS_INSTANCE/log\"" \
-Dapacheds.shutdown.port="\"$ADS_SHUTDOWN_PORT\"" \
@@ -220,7 +226,7 @@ elif [ "$ADS_ACTION" = "stop" ]; then
# Terminate the process
if [ $ADS_SHUTDOWN_PORT -ge 0 ]; then
- eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS \
+ eval "\"$RUN_JAVA\"" $JAVA_OPTS $ADS_CONTROLS $ADS_EXTENDED_OPERATIONS $ADS_INTERMEDIATE_RESPONSES \
-Dlog4j.configuration="\"file:$ADS_INSTANCE/conf/log4j.properties\"" \
-Dapacheds.log.dir="\"$ADS_INSTANCE/log\"" \
-Dapacheds.shutdown.port="\"$ADS_SHUTDOWN_PORT\"" \
diff --git a/service/ApacheDS.launch b/service/ApacheDS.launch
index 4a77595..35e09b2 100644
--- a/service/ApacheDS.launch
+++ b/service/ApacheDS.launch
@@ -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 -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.proxiedauthz.ProxiedAuthzFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache. [...]
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configuration=file:./log4j.properties -Dapacheds.log.dir=./target/instance/log -Dapacheds.controls= -Dapacheds.extendedOperations= -Dapacheds.extendedOperations= -Dapacheds.intermediateResponses="/>
</launchConfiguration>
--
To stop receiving notification emails like this one, please contact
seelmann@apache.org.