From bdfd0f575896c5066257ccbdb31e01c3297c1415 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Mon, 23 Jan 2017 22:09:13 +0000
Subject: [PATCH] updating support scripts
---
bin/dm-ant | 4 ++--
etc/init.d/dm-postgresql | 5 +++--
sbin/dm_create_db.sh | 2 +-
sbin/dm_destroy_db.sh | 2 +-
sbin/experiment_station.txt | 5 +++++
sbin/experiment_station_1id.txt | 4 ++++
sbin/upgrade_experiment.sh | 1 +
.../DmWebPortal/nbproject/private/private.properties | 9 ++-------
8 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/bin/dm-ant b/bin/dm-ant
index 633233f6..96f06205 100755
--- a/bin/dm-ant
+++ b/bin/dm-ant
@@ -13,8 +13,8 @@ if [ -z $DM_ROOT_DIR ]; then
fi
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-export JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
-export ANT_HOME=$DM_SUPPORT_DIR/ant
+export JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
+export ANT_HOME=$DM_OPT_DIR/ant
export PATH=$ANT_HOME/bin:$PATH
ant $@
diff --git a/etc/init.d/dm-postgresql b/etc/init.d/dm-postgresql
index 42857662..31b44379 100755
--- a/etc/init.d/dm-postgresql
+++ b/etc/init.d/dm-postgresql
@@ -20,7 +20,8 @@
### END INIT INFO
# PGVERSION is the full package version, e.g., 8.4.0
-PGVERSION=9.3.4
+#PGVERSION=9.3.4
+PGVERSION=9.6.1
# PGMAJORVERSION is major version, e.g., 8.4 (this should match PG_VERSION)
PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
@@ -68,7 +69,7 @@ if [ ! -f $DM_SETUP_FILE ]; then
fi
. $DM_SETUP_FILE > /dev/null
-PGROOT=$DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH
+PGROOT=$DM_OPT_DIR/postgresql/$DM_HOST_ARCH
PGENGINE=$PGROOT/bin
#PGUSER=dm
PGUSER=`whoami`
diff --git a/sbin/dm_create_db.sh b/sbin/dm_create_db.sh
index 52b3b6c0..7a1c8be2 100755
--- a/sbin/dm_create_db.sh
+++ b/sbin/dm_create_db.sh
@@ -69,7 +69,7 @@ fi
echo "Using DB scripts directory: $DM_DB_SCRIPTS_DIR"
-PG_DIR=$DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH
+PG_DIR=$DM_OPT_DIR/postgresql/$DM_HOST_ARCH
PG_CONTROL_SCRIPT=$DM_ROOT_DIR/etc/init.d/dm-postgresql
PG_DATA_DIR=$PG_DIR/data
PG_HBA_CONF=$PG_DATA_DIR/pg_hba.conf
diff --git a/sbin/dm_destroy_db.sh b/sbin/dm_destroy_db.sh
index f2454dbc..059e5222 100755
--- a/sbin/dm_destroy_db.sh
+++ b/sbin/dm_destroy_db.sh
@@ -35,7 +35,7 @@ if [ -z "$DM_SUPPORT_DIR" ]; then
echo "Invalid environment file ${DM_ENV_FILE}: DM_SUPPORT_DIR is not defined."
exit 1
fi
-PG_DIR=$DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH
+PG_DIR=$DM_OPT_DIR/postgresql/$DM_HOST_ARCH
PG_CONTROL_SCRIPT=$DM_ROOT_DIR/etc/init.d/dm-postgresql
PG_DATA_DIR=$PG_DIR/data
PG_HBA_CONF=$PG_DATA_DIR/pg_hba.conf
diff --git a/sbin/experiment_station.txt b/sbin/experiment_station.txt
index 31509656..c78a283e 100644
--- a/sbin/experiment_station.txt
+++ b/sbin/experiment_station.txt
@@ -10,6 +10,7 @@
"brown_aug14-files", 2
"brown_mar16-files", 2
"brown_oct12-files", 2
+"cinbiz_oct16-files", 2
"cchuang_jul16-files", 2
"cchuang_oct14-files", 2
"chuang_nov16-files", 2
@@ -27,9 +28,12 @@
"hufnagel_oct16-files", 2
"id1-test01-files", 2
"internal_aug16-files", 2
+"kaoumi_aug16-files", 2
"kaoumi_nov16-files", 2
+"kclan_apr16-files", 2
"kenneth_nov16-files", 2
"knauf_apr16-files", 2
+"knauf_dec16-files", 2
"kruzic_feb16-files", 2
"leyunwang_nov15-files", 2
"lind_jun16-files", 2
@@ -77,6 +81,7 @@
"stebner_jun16-files", 2
"stebner_nov16-files", 2
"stubbins_jun16-files", 2
+"styger_oct16-files", 2
"sun_jul16-files", 2
"sun_may14-files", 2
"sun_nov14-files", 2
diff --git a/sbin/experiment_station_1id.txt b/sbin/experiment_station_1id.txt
index 673c8588..ebdd3e2c 100644
--- a/sbin/experiment_station_1id.txt
+++ b/sbin/experiment_station_1id.txt
@@ -13,6 +13,7 @@
"cchuang_jul16-files", 2
"cchuang_oct14-files", 2
"chuang_nov16-files", 2
+"cinbiz_oct16-files", 2
"clausen_jul16-files", 2
"coratella_feb15-files", 2
"cp-test-001-files", 2
@@ -28,6 +29,8 @@
"id1-test01-files", 2
"internal_aug16-files", 2
"kaoumi_nov16-files", 2
+"kaoumi_aug16-files", 2
+"kclan_apr16-files", 2
"kenneth_nov16-files", 2
"knauf_apr16-files", 2
"kruzic_feb16-files", 2
@@ -77,6 +80,7 @@
"stebner_jun16-files", 2
"stebner_nov16-files", 2
"stubbins_jun16-files", 2
+"styger_oct16-files", 2
"sun_jul16-files", 2
"sun_may14-files", 2
"sun_nov14-files", 2
diff --git a/sbin/upgrade_experiment.sh b/sbin/upgrade_experiment.sh
index b7e2188d..21370dfd 100755
--- a/sbin/upgrade_experiment.sh
+++ b/sbin/upgrade_experiment.sh
@@ -20,6 +20,7 @@ eval $cmd || exit 1
for e in $experimentList; do
eName=`echo $e | sed "s?'??g" | sed "s?,??g"`
echo "Working on experiment $eName"
+ echo "Executing: cat $EXPERIMENT_STATION_FILE | grep $eName | head -1 | cut -f2 -d','"
stationId=`cat $EXPERIMENT_STATION_FILE | grep $eName | head -1 | cut -f2 -d','`
if [ -z "$stationId" ]; then
stationId=1 # test station id
diff --git a/src/java/DmWebPortal/nbproject/private/private.properties b/src/java/DmWebPortal/nbproject/private/private.properties
index 6bcbd127..2d526986 100644
--- a/src/java/DmWebPortal/nbproject/private/private.properties
+++ b/src/java/DmWebPortal/nbproject/private/private.properties
@@ -1,7 +1,2 @@
-deploy.ant.properties.file=/home/sveseli/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3-334529135.properties
-j2ee.platform.is.jsr109=true
-j2ee.server.domain=/home/sveseli/Work/netbeans/glassfish-4.1.1/glassfish/domains/domain1
-j2ee.server.home=/home/sveseli/Work/netbeans/glassfish-4.1.1/glassfish
-j2ee.server.instance=[/home/sveseli/Work/netbeans/glassfish-4.1.1/glassfish:/home/sveseli/Work/netbeans/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848
-j2ee.server.middleware=/home/sveseli/Work/netbeans/glassfish-4.1.1
-user.properties.file=/home/sveseli/.netbeans/8.2/build.properties
+j2ee.server.home=/home/dm/support/opt/glassfish/glassfish
+j2ee.server.middleware=/home/dm/support/opt/glassfish
--
GitLab