directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1752394 - in /directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers: apacheds wrapper-installation.conf
Date Wed, 13 Jul 2016 11:34:09 GMT
Author: elecharny
Date: Wed Jul 13 11:34:09 2016
New Revision: 1752394

URL: http://svn.apache.org/viewvc?rev=1752394&view=rev
Log:
Fixed the startup script for installers

Modified:
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds?rev=1752394&r1=1752393&r2=1752394&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
(original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/apacheds
Wed Jul 13 11:34:09 2016
@@ -375,6 +375,7 @@ usage() {
     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 @@ start() {
      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 @@ repair() {
      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 @@ then
   exit 2
 fi
 
+APACHEDS_COMMAND=$1
+
 # Instance parameter
 if [ "x$2" = "x" ]; 
 then
@@ -582,7 +585,7 @@ case "$1" in
         ;;
 
     *)
-        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

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=1752394&r1=1752393&r2=1752394&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
Wed Jul 13 11:34:09 2016
@@ -35,7 +35,6 @@ 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=%REPAIR_COMMAND%
 
 # Initial Java Heap Size (in MB)
 #wrapper.java.initmemory=1024
@@ -45,6 +44,7 @@ wrapper.java.additional.6=%REPAIR_COMMAN
 
 # 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



Mime
View raw message