merge from 1.0

doc/RELEASE_NOTES.txt

@@ -8,6 +8,7 @@ Release 1.0 (01/31/2017)
   for a given station
 - Cleaned up web portal by removing unused views, and enabled station 
   management functionality
+- Extrepid has replaced xstor as the main APS storage
 
 Release 0.15 (11/01/2016)
 =============================

etc/init.d/dm-daq-services

+#!/bin/sh
+
+# Helper script to start and stop DAQ node services
+
+MYDIR=`dirname $0` && cd $MYDIR && MYDIR=`pwd`
+
+# The list below defines order of starting/stopping services
+startList="mongodb mongo-express daq-web-service cat-web-service"
+stopList="cat-web-service daq-web-service mongo-express mongodb"
+restartList=$startList
+statusList=$startList
+
+# Check action
+action=$1
+case $action in
+    start|stop|restart|status)
+    ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart}"
+        exit 1
+esac
+
+# Perform action
+cd $MYDIR
+serviceList="\$"${action}List
+serviceList=`eval "echo $serviceList"`
+for service in $serviceList; do
+    dm-$service $action 
+    sleep 1
+done
+

etc/init.d/dm-ds-services

+#!/bin/sh
+
+# Helper script to start and stop DAQ node services
+
+MYDIR=`dirname $0` && cd $MYDIR && MYDIR=`pwd`
+
+# The list below defines order of starting/stopping services
+startList="postgresql glassfish ds-web-service"
+stopList="ds-web-service glassfish postgresql"
+restartList=$startList
+statusList=$startList
+
+# Check action
+action=$1
+case $action in
+    start|stop|restart|status)
+    ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart}"
+        exit 1
+esac
+
+# Perform action
+cd $MYDIR
+serviceList="\$"${action}List
+serviceList=`eval "echo $serviceList"`
+for service in $serviceList; do
+    dm-$service $action 
+    sleep 1
+done
+

etc/init.d/dm-mongo-express

@@ -22,6 +22,8 @@
 
 # Arguments
 ACTION=$1
+DM_DB_NAME=$2
+DM_DB_NAME=${DM_DB_NAME:=dm}
 
 # Set root to default if needed.
 MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
@@ -44,11 +46,11 @@ mkdir -p ${DM_INSTALL_DIR}/var/log
 
 DM_MONGODB_HOST=${DM_MONGODB_HOST:=127.0.0.1}
 DM_MONGODB_PORT=${DM_MONGODB_PORT:=27017}
-DM_NODE_DIR=${DM_SUPPORT_DIR}/node/${DM_HOST_ARCH}
+DM_NODE_DIR=${DM_OPT_DIR}/node
 DM_FOREVER_DIR=${DM_NODE_DIR}/bin/node_modules/forever
 DM_MONGO_EXPRESS_DIR=${DM_NODE_DIR}/bin/node_modules/mongo-express
 
-DM_DAEMON_NAME="DM Mongo Express"
+DM_DAEMON_NAME="${DM_DB_NAME}.MongoExpress"
 DM_DAEMON_CMD=${DM_FOREVER_DIR}/bin/forever
 DM_DAEMON_WORK_DIR=${DM_INSTALL_DIR}/var/run/mongo-express
 DM_DAEMON_PID_FILE=${DM_INSTALL_DIR}/var/run/mongo-express.pid

etc/init.d/dm-mongodb

@@ -22,6 +22,8 @@
 
 # Arguments
 ACTION=$1
+DM_DB_NAME=$2
+DM_DB_NAME=${DM_DB_NAME:=dm}
 
 # Set root to default if needed.
 MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
@@ -44,11 +46,11 @@ mkdir -p ${DM_INSTALL_DIR}/var/log
 
 DM_MONGODB_HOST=${DM_MONGODB_HOST:=127.0.0.1}
 DM_MONGODB_PORT=${DM_MONGODB_PORT:=27017}
-DM_MONGODB_DIR=${DM_SUPPORT_DIR}/mongodb/${DM_HOST_ARCH}
+DM_MONGODB_DIR=${DM_OPT_DIR}/mongodb/${DM_HOST_ARCH}
 DM_MONGODB_DATA_DIR=${DM_MONGODB_DIR}/data
 mkdir -p ${DM_MONGODB_DATA_DIR}
 
-DM_DAEMON_NAME="DM MongoDB"
+DM_DAEMON_NAME="${DM_DB_NAME}.MongoDB"
 DM_DAEMON_CMD=${DM_MONGODB_DIR}/bin/mongod
 DM_DAEMON_PID_FILE=${DM_INSTALL_DIR}/var/run/mongodb.pid
 DM_DAEMON_LOG_FILE=${DM_INSTALL_DIR}/var/log/mongodb.log

setup.sh

@@ -54,7 +54,7 @@ prependPathIfDirExists() {
 }
 
 # Setup path and other variables
-prependPathIfDirExists $DM_OPT_DIR/node/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_OPT_DIR/node/bin
 prependPathIfDirExists $DM_OPT_DIR/mongodb/$DM_HOST_ARCH/bin
 prependPathIfDirExists $DM_OPT_DIR/postgresql/$DM_HOST_ARCH/bin
 prependPathIfDirExists $DM_OPT_DIR/java/$DM_HOST_ARCH/bin

src/python/dm/__init__.py

-__version__ = "1.0 (2017.01.23)"
+__version__ = "1.0 (2017.01.24)"