remove DM_DATA_DIR; consistently use DM_STORAGE_DIR; introduce cat service...

remove DM_DATA_DIR; consistently use DM_STORAGE_DIR; introduce cat service configuration for development

sbin/dm_prepare_dev_config.sh

@@ -28,12 +28,14 @@ DM_DS_WEB_SERVICE_CONFIG_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.ds-web-service.conf
 DM_DS_WEB_SERVICE_LOG_FILE=${DM_LOG_DIR}/${DM_DB_NAME}.ds-web-service.log
 DM_DAQ_WEB_SERVICE_CONFIG_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.daq-web-service.conf
 DM_DAQ_WEB_SERVICE_LOG_FILE=${DM_LOG_DIR}/${DM_DB_NAME}.daq-web-service.log
+DM_CAT_WEB_SERVICE_CONFIG_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.cat-web-service.conf
+DM_CAT_WEB_SERVICE_LOG_FILE=${DM_LOG_DIR}/${DM_DB_NAME}.cat-web-service.log
 DM_DB_PASSWORD_FILE=$DM_INSTALL_DIR/etc/${DM_DB_NAME}.db.passwd
 DM_SYSTEM_USER=dm
 DM_SYSTEM_PASSWORD_FILE=$DM_INSTALL_DIR/etc/$DM_SYSTEM_USER.system.passwd
 DM_DS_WEB_SERVICE_PORT=22236
 DM_DS_WEB_SERVICE_HOST=localhost
-DM_STORAGE_DIR=$DM_DATA_DIR
+DM_STORAGE_DIR=${DM_STORAGE_DIR:=$DM_INSTALL_DIR/storage}
 
 echo "Preparing development configuration"
 mkdir -p $DM_ETC_DIR
@@ -41,9 +43,6 @@ mkdir -p $DM_LOG_DIR
 
 #echo "Modifying glassfish-web config file"
 portalSrcDir=$DM_ROOT_DIR/src/java/DmWebPortal
-#configFile=$portalSrcDir/web/WEB-INF/glassfish-web.xml
-#cmd="cat $configFile.template | sed 's?DM_DATA_DIR?$DM_DATA_DIR?g' > $configFile"
-#eval $cmd || exit 1
 
 echo "Configuring glassfish db access"
 if [ ! -f $DM_DB_PASSWORD_FILE ]; then
@@ -79,25 +78,40 @@ cmd="cat $DM_ROOT_DIR/etc/ds-web-service.conf.template \
     | sed 's?sslKeyFile=.*??g' \
     | sed 's?DM_STORAGE_DIR?$DM_STORAGE_DIR?g' \
     | sed 's?DM_INSTALL_DIR?$DM_INSTALL_DIR?g' \
-    | sed 's?DM_DATA_DIR?$DM_DATA_DIR?g' \
     | sed 's?DM_DB_NAME?$DM_DB_NAME?g' \
     | sed 's?handler=TimedRotatingFileLoggingHandler.*?handler=TimedRotatingFileLoggingHandler(\"$DM_DS_WEB_SERVICE_LOG_FILE\")?g' \
     > $DM_DS_WEB_SERVICE_CONFIG_FILE"
 eval $cmd || exit 1
+
 cmd="cat $DM_ROOT_DIR/etc/daq-web-service.conf.template \
     | sed 's?sslCaCertFile=.*??g' \
     | sed 's?sslCertFile=.*??g' \
     | sed 's?sslKeyFile=.*??g' \
     | sed 's?DM_SYSTEM_USER?$DM_SYSTEM_USER?g' \
     | sed 's?DM_SYSTEM_PASSWORD_FILE?$DM_SYSTEM_PASSWORD_FILE?g' \
-    | sed 's?DM_DS_WEB_SERVICE_PROTOCOL?http?g' \
     | sed 's?DM_DS_WEB_SERVICE_PORT?$DM_DS_WEB_SERVICE_PORT?g' \
     | sed 's?DM_DS_WEB_SERVICE_HOST?$DM_DS_WEB_SERVICE_HOST?g' \
+    | sed 's?DM_WEB_SERVICE_PROTOCOL?http?g' \
     | sed 's?DM_INSTALL_DIR?$DM_INSTALL_DIR?g' \
-    | sed 's?DM_DATA_DIR?$DM_DATA_DIR?g' \
     | sed 's?DM_DB_NAME?$DM_DB_NAME?g' \
     | sed 's?handler=TimedRotatingFileLoggingHandler.*?handler=TimedRotatingFileLoggingHandler(\"$DM_DAQ_WEB_SERVICE_LOG_FILE\")?g' \
     > $DM_DAQ_WEB_SERVICE_CONFIG_FILE"
 eval $cmd || exit 1
 
+cmd="cat $DM_ROOT_DIR/etc/cat-web-service.conf.template \
+    | sed 's?sslCaCertFile=.*??g' \
+    | sed 's?sslCertFile=.*??g' \
+    | sed 's?sslKeyFile=.*??g' \
+    | sed 's?handler=TimedRotatingFileLoggingHandler.*?handler=TimedRotatingFileLoggingHandler(\"$DM_CAT_WEB_SERVICE_LOG_FILE\")?g' \
+    | sed 's?DM_INSTALL_DIR?$DM_INSTALL_DIR?g' \
+    | sed 's?DM_SYSTEM_USER?$DM_SYSTEM_USER?g' \
+    | sed 's?DM_DS_WEB_SERVICE_HOST?$DM_DS_WEB_SERVICE_HOST?g' \
+    | sed 's?DM_DS_WEB_SERVICE_PORT?$DM_DS_WEB_SERVICE_PORT?g' \
+    | sed 's?DM_WEB_SERVICE_PROTOCOL?$DM_WEB_SERVICE_PROTOCOL?g' \
+    | sed 's?DM_DS_WEB_SERVICE_PROTOCOL?http?g' \
+    | sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \
+    | sed 's?DM_DB_NAME?$DM_DB_NAME?g' \
+    > $DM_CAT_WEB_SERVICE_CONFIG_FILE"
+eval $cmd || exit 1
+
 echo "Done preparing development configuration"