updating support scripts

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 $@
 

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`

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

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

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

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

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

src/java/DmWebPortal/nbproject/private/private.properties

-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