merge from 1.0

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-glassfish

@@ -31,9 +31,9 @@ if [ ! -f ${DM_ENV_FILE} ]; then
 fi
 . ${DM_ENV_FILE} > /dev/null
 
-export AS_JAVA=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
-DM_GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
-DERBY_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH/javadb/bin
+export AS_JAVA=$DM_OPT_DIR/java/$DM_HOST_ARCH
+DM_GLASSFISH_DIR=$DM_OPT_DIR/glassfish
+DERBY_DIR=$DM_OPT_DIR/glassfish/javadb/bin
 
 DM_DAEMON_NAME=glassfish
 DM_DAEMON_CONTROL_CMD=$DM_GLASSFISH_DIR/bin/asadmin

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_configure_web_portal.sh

@@ -41,8 +41,8 @@ DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
 DM_SYSTEM_PASSWORD_FILE=${DM_INSTALL_DIR}/etc/${DM_SYSTEM_USER}.system.passwd
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 
-GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
-JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
+JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_OPT_DIR/glassfish
 
 export AS_JAVA=$JAVA_HOME
 ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin 

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_deploy_web_portal.sh

@@ -37,11 +37,11 @@ else
     echo "Deployment config file $deployConfigFile not found, using defaults"
 fi
 
-JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
+JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 DM_HOSTNAME=`hostname -f`
 DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_OPT_DIR/glassfish
 DM_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
 DM_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
 DM_BUILD_WAR_FILE=DmWebPortal.war

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/dm_unconfigure_web_portal.sh

@@ -38,8 +38,8 @@ else
 fi
 
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
-JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
+JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_OPT_DIR/glassfish
 
 export AS_JAVA=$JAVA_HOME
 ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin 

sbin/dm_undeploy_web_portal.sh

@@ -39,12 +39,12 @@ fi
 
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
+JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
+GLASSFISH_DIR=$DM_OPT_DIR/glassfish
 DM_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
 DM_APP_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/applications/$DM_CONTEXT_ROOT
 DM_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
 DM_WAR_FILE=$DM_CONTEXT_ROOT.war
-JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
 
 export AS_JAVA=$JAVA_HOME
 ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin

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

setup.sh

@@ -35,13 +35,14 @@ if [ -z $DM_SUPPORT_DIR ]; then
         export DM_SUPPORT_DIR=`pwd`
     fi
 fi
+
 if [ ! -d $DM_SUPPORT_DIR ]; then
     echo "ERROR: $DM_SUPPORT_DIR directory does not exist. Developers should point DM_SUPPORT_DIR to the desired area." 
     unset DM_SUPPORT_DIR
     return 1
-else
-    export DM_GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
 fi
+export DM_OPT_DIR=$DM_SUPPORT_DIR/opt
+export DM_GLASSFISH_DIR=$DM_OPT_DIR/glassfish
 
 
 # Add to path only if directory exists.
@@ -53,11 +54,11 @@ prependPathIfDirExists() {
 }
 
 # Setup path and other variables
-prependPathIfDirExists $DM_SUPPORT_DIR/node/$DM_HOST_ARCH/bin
-prependPathIfDirExists $DM_SUPPORT_DIR/mongodb/$DM_HOST_ARCH/bin
-prependPathIfDirExists $DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH/bin
-prependPathIfDirExists $DM_SUPPORT_DIR/java/$DM_HOST_ARCH/bin
-prependPathIfDirExists $DM_SUPPORT_DIR/ant/bin
+prependPathIfDirExists $DM_OPT_DIR/node/$DM_HOST_ARCH/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
+prependPathIfDirExists $DM_OPT_DIR/ant/bin
 prependPathIfDirExists $DM_ROOT_DIR/bin
 PATH=.:$PATH
 export PATH
@@ -72,7 +73,7 @@ export LD_LIBRARY_PATH
 # Setup python path. 
 # Check if we have local python
 if [ -z $DM_PYTHON_DIR ]; then
-    pythonDir=$DM_SUPPORT_DIR/python/$DM_HOST_ARCH
+    pythonDir=$DM_OPT_DIR/python/$DM_HOST_ARCH
 else
     pythonDir=$DM_PYTHON_DIR
 fi
@@ -93,7 +94,7 @@ export PYTHONPATH
 
 # Setup postgres. 
 if [ -z $DM_POSTGRESQL_DIR ]; then
-    postgresqlDir=$DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH
+    postgresqlDir=$DM_OPT_DIR/postgresql/$DM_HOST_ARCH
 else
     postgresqlDir=$DM_POSTGRESQL_DIR 
 fi
@@ -106,7 +107,7 @@ if [ -d $postgresqlDir ]; then
 fi
 
 # Setup oracle libraries. 
-oracleDir=$DM_SUPPORT_DIR/opt/oracle-client/$DM_HOST_ARCH
+oracleDir=$DM_OPT_DIR/oracle-client/$DM_HOST_ARCH
 if [ -d $oracleDir ]; then
     LD_LIBRARY_PATH=$oracleDir:$LD_LIBRARY_PATH
     PATH=$oracleDir:$PATH

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

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

-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
-javac.debug=true
-javadoc.preview=true
-selected.browser=default
-user.properties.file=/home/sveseli/.netbeans/8.2/build.properties

src/java/DmWebPortal/src/java/dm.portal.properties

@@ -5,6 +5,6 @@
 dm.portal.ldapUrl=ldaps://dmid-vm.xray.aps.anl.gov:636
 dm.portal.ldapDnString=uid=USERNAME,ou=DM,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov
 
-dm.dsWebService.url=https://xstor-devel:22236/dm
+dm.dsWebService.url=https://apsgpfs08:22236/dm
 dm.system.user=dm
-dm.system.passwordFile=DM_INSTALL_DIR/etc/DM_SYSTEM_USER.system.passwd
+dm.system.passwordFile=DM_INSTALL_DIR/etc/DM_SYSTEM_USER.system.passwd
\ No newline at end of file

src/python/dm/__init__.py

-__version__ = "0.16 (2017.01.05)"
+__version__ = "1.0 (2017.01.23)"

src/python/dm/aps_user_db/cli/updateUserFromApsDbCli.py

@@ -23,7 +23,7 @@ class UpdateUserFromApsDbCli(DmCli):
         if configFile is None:
             raise InvalidRequest('Config file must be provided.')
         if not os.path.exists(configFile):
-            raise InvalidArgument('Invalid config file: %s.', configFile)
+            raise InvalidArgument('Invalid config file: %s.' % configFile)
 
     def getBadge(self):
         return self.options.badge

src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py

@@ -27,7 +27,7 @@ class UpdateUsersFromApsDbCli(DmCli):
         if configFile is None:
             raise InvalidRequest('Config file must be provided.')
         if not os.path.exists(configFile):
-            raise InvalidArgument('Invalid config file: %s.', configFile)
+            raise InvalidArgument('Invalid config file: %s.' % configFile)
 
     def runCommand(self):
         self.parseArgs(usage="""