Fixed the startup script for installers
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/trunk@1752394 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
index b054e1c..a14b630 100644
--- a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
+++ b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
@@ -375,6 +375,7 @@
echo " or start if it wasn't already running"
echo " status - Display the status of the instance (running or stopped)"
echo " dump - Request a JVM dump of the running process"
+ echo " repair - Try to repair the database before starting the server"
}
console() {
@@ -397,7 +398,7 @@
if [ "X$pid" = "X" ]
then
# The string passed to eval must handles spaces in paths correctly.
- COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" set.INSTANCE_DIRECTORY=\"$INSTANCE_DIRECTORY\" set.INSTANCE=\"$INSTANCE\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP"
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" set.INSTANCE_DIRECTORY=\"$INSTANCE_DIRECTORY\" set.APACHEDS_COMMAND=\"repair\" set.INSTANCE=\"$INSTANCE\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP"
eval $COMMAND_LINE
else
echo "$APP_LONG_NAME is already running."
@@ -411,7 +412,7 @@
if [ "X$pid" = "X" ]
then
# The string passed to eval must handles spaces in paths correctly.
- COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" wrapper.java.additional.1=repair \"$WRAPPER_CONF\" set.INSTANCE_DIRECTORY=\"$INSTANCE_DIRECTORY\" set.INSTANCE=\"$INSTANCE\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP"
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" wrapper.app.parameter.1=repair \"$WRAPPER_CONF\" set.INSTANCE_DIRECTORY=\"$INSTANCE_DIRECTORY\" set.INSTANCE=\"$INSTANCE\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $LOCKPROP"
eval $COMMAND_LINE
else
echo "$APP_LONG_NAME is already running."
@@ -531,6 +532,8 @@
exit 2
fi
+APACHEDS_COMMAND=$1
+
# Instance parameter
if [ "x$2" = "x" ];
then
@@ -582,7 +585,7 @@
;;
*)
- echo "Usage: $0 { console | start | stop | restart | status | dump } <instance name>"
+ echo "Usage: $0 { console | start | stop | restart | status | dump | repair } <instance name>"
exit 1
;;
esac
diff --git a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
index f5db3c1..51f3264 100644
--- a/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
+++ b/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
@@ -35,7 +35,6 @@
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=%REPAIR_COMMAND%
# Initial Java Heap Size (in MB)
#wrapper.java.initmemory=1024
@@ -45,6 +44,7 @@
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=${double.quote}%INSTANCE_DIRECTORY%${double.quote}
+wrapper.app.parameter.2=%APACHEDS_COMMAND%
#********************************************************************
# Wrapper Logging Properties
