[05/10] incubator-trafodion git commit: convert all MY_SQROOT to TRAF_HOME

[li...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/install_traf_components
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_traf_components b/core/sqf/sql/scripts/install_traf_components
index cd8e8af..650d5bc 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -21,23 +21,23 @@
 #### Script to install and configure DCS, REST and Phoenix tests...
 
 # Location of hadoop install
-MY_SW_ROOT=$MY_SQROOT/sql/local_hadoop
+MY_SW_ROOT=$TRAF_HOME/sql/local_hadoop
 MY_LOG_FILE=$MY_SW_ROOT/log/install_traf_components_$(date +%F_%T).log
 
 # Source in script to get the list of ports
-if [ -f $MY_SQROOT/sql/scripts/sw_env.sh ]; then
-   . $MY_SQROOT/sql/scripts/sw_env.sh
+if [ -f $TRAF_HOME/sql/scripts/sw_env.sh ]; then
+   . $TRAF_HOME/sql/scripts/sw_env.sh
 else
-   echo "Unable to find $MY_SQROOT/sql/scripts/sw_env.sh to get the list of ports"
+   echo "Unable to find $TRAF_HOME/sql/scripts/sw_env.sh to get the list of ports"
    exit 1;
 fi
 
 # Default location of Trafodion, DCS, REST and Phoenix src folders
-TRAF_SRC=$MY_SQROOT/../../
-DCS_SRC=$MY_SQROOT/../../dcs
-REST_SRC=$MY_SQROOT/../rest
-PHX_SRC=$MY_SQROOT/../../tests/phx
-TRAF_TARS=$MY_SQROOT/../../distribution
+TRAF_SRC=$TRAF_HOME/../../
+DCS_SRC=$TRAF_HOME/../../dcs
+REST_SRC=$TRAF_HOME/../rest
+PHX_SRC=$TRAF_HOME/../../tests/phx
+TRAF_TARS=$TRAF_HOME/../../distribution
 
 if [ -z "$DCS_BLD" ]; then
   DCS_BLD=$(ls -d $DCS_SRC/target/dcs-*/dcs-* 2>/dev/null)
@@ -110,13 +110,13 @@ else
   elif [[ -d $DCS_SRC ]]; then
       echo "DCS built target was not found in $DCS_SRC" | tee -a ${MY_LOG_FILE}
       echo "Building DCS" | tee -a ${MY_LOG_FILE}
-      if [[ -f $MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
+      if [[ -f $TRAF_HOME/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
          echo "JDBCT4 jar file exist. Proceeding to build DCS from $DCS_SRC" | tee -a ${MY_LOG_FILE}
          cd $DCS_SRC
          ${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
          cd $MY_SW_ROOT
       else
-         echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. " | tee -a ${MY_LOG_FILE}
+         echo "JDBCT4 jar file does not exist $TRAF_HOME/export/lib folder. " | tee -a ${MY_LOG_FILE}
          echo "Please build the core Trafodion component"  | tee -a ${MY_LOG_FILE}
          exit 2
       fi
@@ -140,12 +140,12 @@ else
     grep -v 'DCS_INSTALL_DIR=' ~/.trafodion.orig > ~/.trafodion
   fi
   DCSDIR=${DCS_HOME##*/}
-  echo "export DCS_INSTALL_DIR=\${MY_SQROOT}/sql/local_hadoop/$DCSDIR" >> ~/.trafodion | tee -a ${MY_LOG_FILE}
+  echo "export DCS_INSTALL_DIR=\${TRAF_HOME}/sql/local_hadoop/$DCSDIR" >> ~/.trafodion | tee -a ${MY_LOG_FILE}
 
   echo "Setting DCS env and site.xml file" | tee -a ${MY_LOG_FILE}
   cd $DCS_HOME/conf/
   mv dcs-env.sh dcs-env.sh.orig
-  echo "MY_SQROOT=$MY_SQROOT" > dcs-env.sh
+  echo "TRAF_HOME=$TRAF_HOME" > dcs-env.sh
   sed -e "s@#[ ]*export DCS_MANAGES_ZK=true@export DCS_MANAGES_ZK=false@" dcs-env.sh.orig >> dcs-env.sh
   mv -f dcs-site.xml dcs-site.xml.orig
   sed -e "s@</configuration>@@" dcs-site.xml.orig > dcs-site.xml
@@ -193,13 +193,13 @@ else
   elif [[ -d $REST_SRC ]]; then
       echo "REST built target was not found in $REST_SRC" | tee -a ${MY_LOG_FILE}
       echo "Building REST" | tee -a ${MY_LOG_FILE}
-      if [[ -f $MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
+      if [[ -f $TRAF_HOME/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
          echo "JDBCT4 jar file exist. Proceeding to build REST from $REST_SRC" | tee -a ${MY_LOG_FILE}
          cd $REST_SRC
          ${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
          cd $MY_SW_ROOT
        else
-         echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. Please build the core Trafodion components" | tee -a ${MY_LOG_FILE}
+         echo "JDBCT4 jar file does not exist $TRAF_HOME/export/lib folder. Please build the core Trafodion components" | tee -a ${MY_LOG_FILE}
        exit 2
       fi
       REST_BLD=$(ls -d $REST_SRC/target/rest-*/rest-* 2>/dev/null)
@@ -223,12 +223,12 @@ else
     grep -v 'REST_INSTALL_DIR=' ~/.trafodion.orig >> ~/.trafodion
   fi
   RESTDIR=${REST_HOME##*/}
-  echo "export REST_INSTALL_DIR=\${MY_SQROOT}/sql/local_hadoop/$RESTDIR" >> ~/.trafodion  | tee -a ${MY_LOG_FILE}
+  echo "export REST_INSTALL_DIR=\${TRAF_HOME}/sql/local_hadoop/$RESTDIR" >> ~/.trafodion  | tee -a ${MY_LOG_FILE}
   echo "Setting REST env and site.xml "  | tee -a ${MY_LOG_FILE}
   cd $REST_HOME/conf/
   mv rest-env.sh rest-env.sh.orig
 
-  echo "MY_SQROOT=$MY_SQROOT" > rest-env.sh
+  echo "TRAF_HOME=$TRAF_HOME" > rest-env.sh
   sed -e "s@#[ ]*export REST_MANAGES_ZK=true@export REST_MANAGES_ZK=false@" rest-env.sh.orig >> rest-env.sh
   mv -f rest-site.xml rest-site.xml.orig
   sed -e "s@</configuration>@@" rest-site.xml.orig > rest-site.xml
@@ -253,7 +253,7 @@ EOF
 
   echo "Configured $REST_HOME/conf/rest-site.xml" | tee -a ${MY_LOG_FILE}
   echo "Adding swrest script..." | tee -a ${MY_LOG_FILE}
-  cat <<EOF >$MY_SQROOT/sql/scripts/swrest
+  cat <<EOF >$TRAF_HOME/sql/scripts/swrest
 #!/bin/sh
 # command to run rest tests
 #Displays the status of configured servers
@@ -272,7 +272,7 @@ curl -X GET -H "Accept: application/json" http://localhost:$MY_REST_SERVER_PORT/
 curl -X GET -H "Accept: application/json" http://localhost:$MY_REST_SERVER_PORT/v1/servers/dcs/connections | python -m json.tool
 EOF
 
-     chmod +x $MY_SQROOT/sql/scripts/swrest
+     chmod +x $TRAF_HOME/sql/scripts/swrest
 fi
 
 # End of setup for REST
@@ -283,19 +283,19 @@ echo | tee -a ${MY_LOG_FILE}
 # Begin setup of TRAFCI
 
 echo "Configuring TRAFCI " | tee -a ${MY_LOG_FILE}
-TRAFCI_BIN_DIR=$MY_SQROOT/trafci/bin
+TRAFCI_BIN_DIR=$TRAF_HOME/trafci/bin
 if [[ -f $TRAFCI_BIN_DIR/trafci ]]
 then
   mv $TRAFCI_BIN_DIR/trafci  $TRAFCI_BIN_DIR/trafci.orig | tee -a ${MY_LOG_FILE}
   sed -e "s@localhost:23400@localhost:$MY_DCS_MASTER_PORT@" $TRAFCI_BIN_DIR/trafci.orig >> $TRAFCI_BIN_DIR/trafci | tee -a ${MY_LOG_FILE}
   chmod +x $TRAFCI_BIN_DIR/trafci | tee -a ${MY_LOG_FILE}
   echo "Adding swtrafci script..." | tee -a ${MY_LOG_FILE}
-  cat <<EOF >$MY_SQROOT/sql/scripts/swtrafci
+  cat <<EOF >$TRAF_HOME/sql/scripts/swtrafci
 #!/bin/sh
 # command to run trafci
-$MY_SQROOT/trafci/bin/trafci.sh -h localhost:$MY_DCS_MASTER_PORT -u zz -p zz
+$TRAF_HOME/trafci/bin/trafci.sh -h localhost:$MY_DCS_MASTER_PORT -u zz -p zz
 EOF
-  chmod +x $MY_SQROOT/sql/scripts/swtrafci
+  chmod +x $TRAF_HOME/sql/scripts/swtrafci
 else
   echo "$TRAFCI_BIN_DIR not found" | tee -a ${MY_LOG_FILE}
 fi
@@ -321,7 +321,7 @@ else
 
   if [[ -d $PHXDIR ]]; then
      echo "Adding swphoenix script..." | tee -a ${MY_LOG_FILE}
-     cat <<EOF >$MY_SQROOT/sql/scripts/swphoenix
+     cat <<EOF >$TRAF_HOME/sql/scripts/swphoenix
 #!/bin/sh
 # command to run phoenix tests
 
@@ -329,12 +329,12 @@ cd $PHXDIR
 if [[ \$1 == "t4" ]]
 then
   ./phoenix_test.py --target=localhost:$MY_DCS_MASTER_PORT --user=dontcare --pw=dontcare \\
-     --targettype=TR --javahome=\$JAVA_HOME --jdbccp=\$MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar
+     --targettype=TR --javahome=\$JAVA_HOME --jdbccp=\$TRAF_HOME/export/lib/jdbcT4-${TRAFODION_VER}.jar
 elif [[ \$1 == "t2" ]]
 then
-  export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$MY_SQROOT/export/lib\$SQ_MBTYPE/libseabasesig.so
+  export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$TRAF_HOME/export/lib\$SQ_MBTYPE/libseabasesig.so
   ./phoenix_test.py --targettype=TR --javahome=\$JAVA_HOME \\
-     --jdbccp=\$MY_SQROOT/export/lib/jdbcT2.jar --jdbctype=T2 \\
+     --jdbccp=\$TRAF_HOME/export/lib/jdbcT2.jar --jdbctype=T2 \\
      --nomvntest --tests="AlterTableTest,ArithmeticQueryTest,BinaryRowKeyTest,CoalesceFunctionTest,CompareDecimalToLongTest,CustomEntityDataTest,DeleteRangeTest,DescColumnSortOrderTest,DistinctCountTest,ExtendedQueryExecTest,FunkyNamesTest,IsNullTest,OrderByTest,QueryExecTest,SaltedTableTest,SaltedTableUpsertSelectTest,SaltedTableVarLengthRowKeyTest,SkipScanQueryTest,UpsertSelectAutoCommitTest,UpsertSelectTest,UpsertValuesTest],AutoCommitTest,CreateTableTest,ExecuteStatementsTest,GroupByCaseTest,IndexTest,KeyOnlyTest,MultiCfQueryExecTest,ProductMetricsTest,QueryExecWithoutSCNTest,QueryPlanTest,ReadIsolationLevelTest,ServerExceptionTest,StatementHintsTest,StddevTest,ToCharFunctionTest,ToNumberFunctionTest,TopNTest,UpsertBigValuesTest,VariableLengthPKTest,SaltedTableUpsertSelectTest"
 else
   echo "Usage: swphoenix (t2|t4)"
@@ -342,7 +342,7 @@ else
 fi
 EOF
 
-     chmod +x $MY_SQROOT/sql/scripts/swphoenix
+     chmod +x $TRAF_HOME/sql/scripts/swphoenix
   fi 
 fi
 
@@ -373,7 +373,7 @@ EOF
     cd .. 
     mv TRAFDSN TRAFDSN.orig 
     sed -e "s@TCP:localhost:23400@TCP:localhost:$MY_DCS_MASTER_PORT@" TRAFDSN.orig >> TRAFDSN 
-    cp -p TRAFDSN $MY_SQROOT/samples
+    cp -p TRAFDSN $TRAF_HOME/samples
     echo "Successfully installed linux driver in $LNXDRVR"| tee -a ${MY_LOG_FILE}
     echo "Creating odbcinst.ini file..." |tee -a ${MY_LOG_FILE}
     cat <<EOF >$LNXDRVR/odbcinst.ini
@@ -414,14 +414,14 @@ SQL_QUERY_TIMEOUT           = NO_TIMEOUT
 
 EOF
     echo "Adding swlnx script..." | tee -a ${MY_LOG_FILE}
-  cat <<EOF >$MY_SQROOT/sql/scripts/swlnx
+  cat <<EOF >$TRAF_HOME/sql/scripts/swlnx
 #!/bin/sh
 # command to run lnx sample
   cd $LNXDRVR
   g++ -g connect_test.cpp -L$LNXDRVR -I/usr/include/odbc -ltrafodbc64 -o connect_test
   ./connect_test -d Default_DataSource -u ss -p ss
 EOF
-  chmod +x $MY_SQROOT/sql/scripts/swlnx
+  chmod +x $TRAF_HOME/sql/scripts/swlnx
   fi
 fi
 
@@ -444,7 +444,7 @@ else
     tar -xzf $ODB_TAR | tee -a ${MY_LOG_FILE}
     echo "Successfully installed ODB tool in $ODBLOC"| tee -a ${MY_LOG_FILE}
     echo "Adding swodb script..." | tee -a ${MY_LOG_FILE}
-  cat <<EOF >$MY_SQROOT/sql/scripts/swodb
+  cat <<EOF >$TRAF_HOME/sql/scripts/swodb
 #!/bin/sh
 # command to run odb sample
 cd $ODBLOC/bin
@@ -457,7 +457,7 @@ export LD_LIBRARY_PATH=\$ODBCHOME:$LD_LIBRARY_PATH
 
 ./odb64luo -d traf -u ss -p ss -i
 EOF
-  chmod +x $MY_SQROOT/sql/scripts/swodb
+  chmod +x $TRAF_HOME/sql/scripts/swodb
   fi
 fi
 
@@ -490,19 +490,19 @@ else
 
   if [[ -d $DCSTEST_DIR ]]; then
      echo "Adding swjdbc script...." | tee -a ${MY_LOG_FILE}
-     cat <<EOF >$MY_SQROOT/sql/scripts/swjdbc
+     cat <<EOF >$TRAF_HOME/sql/scripts/swjdbc
 #!/bin/sh
 # command to run JDBC tests
 cd $JDBCTEST_DIR
 ./jdbc_test.py --appid=jdbc_test --user=SOMEUSER --pw=SOMEPASSWORD --javahome=\$JAVA_HOME \\
   --target=localhost:$MY_DCS_MASTER_PORT --dbmaj=\$TRAFODION_VER_MAJOR --dbmin=\$TRAFODION_VER_MINOR \\
-  --jdbctype=T4 --jdbccp=\$MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar "\$@"
+  --jdbctype=T4 --jdbccp=\$TRAF_HOME/export/lib/jdbcT4-${TRAFODION_VER}.jar "\$@"
 EOF
-    chmod +x $MY_SQROOT/sql/scripts/swjdbc
+    chmod +x $TRAF_HOME/sql/scripts/swjdbc
 
     if [[ -f $LNXDRVR_TAR ]]; then
        echo "Linux driver exists. Adding swpyodbc script...." | tee -a ${MY_LOG_FILE}
-       cat <<EOF >$MY_SQROOT/sql/scripts/swpyodbc
+       cat <<EOF >$TRAF_HOME/sql/scripts/swpyodbc
 #!/bin/sh
 # command to run Python ODBC tests
 cd $PYODBCTEST_DIR
@@ -510,7 +510,7 @@ cd $PYODBCTEST_DIR
 tox -e py27
 
 EOF
-       chmod +x $MY_SQROOT/sql/scripts/swpyodbc
+       chmod +x $TRAF_HOME/sql/scripts/swpyodbc
     fi 
   fi
 fi

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/krb5check
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/krb5check b/core/sqf/sql/scripts/krb5check
index cbe3a95..2ab8c2c 100755
--- a/core/sqf/sql/scripts/krb5check
+++ b/core/sqf/sql/scripts/krb5check
@@ -31,8 +31,8 @@ function msg
 # ******* main ******
 WAIT_INTERVAL=300
 REPORT_INTERVAL=12
-LOCK_FILE=$MY_SQROOT/tmp/krb5check
-LOG_FILE=$MY_SQROOT/logs/krb5check
+LOCK_FILE=$TRAF_HOME/tmp/krb5check
+LOG_FILE=$TRAF_HOME/logs/krb5check
 CACHE_FILE=""
 HOST_NAME=`hostname -f`
 getKeytab

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/krb5functions
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/krb5functions b/core/sqf/sql/scripts/krb5functions
index 178e4f2..8cb2670 100755
--- a/core/sqf/sql/scripts/krb5functions
+++ b/core/sqf/sql/scripts/krb5functions
@@ -114,12 +114,12 @@ function getStatus
 
 function getLogFile
 {
-  LOG_FILE=$MY_SQROOT/logs/krb5check
+  LOG_FILE=$TRAF_HOME/logs/krb5check
 }
 
 function getLockFile
 {
-  LOCK_FILE=$MY_SQROOT/tmp/krb5check
+  LOCK_FILE=$TRAF_HOME/tmp/krb5check
 }
 
 function getKeytab

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/krb5service
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/krb5service b/core/sqf/sql/scripts/krb5service
index 6169273..31049ed 100755
--- a/core/sqf/sql/scripts/krb5service
+++ b/core/sqf/sql/scripts/krb5service
@@ -47,9 +47,9 @@
 #   stop    - stops the ticket renewal service
 #
 # Location attributes (see krb5functions to change these values):
-#  [LOG_FILE]  : $MY_SQROOT/logs/krb5check - log where all events are stored
+#  [LOG_FILE]  : $TRAF_HOME/logs/krb5check - log where all events are stored
 #    (the log file is recreated each time the krb5service is started)
-#  [LOCK_FILE] : $MY_SQROOT/tmp/krb5check - file to keep track of krb5check process
+#  [LOCK_FILE] : $TRAF_HOME/tmp/krb5check - file to keep track of krb5check process
 #    (acts as a semiphore to prevent multiple occurrances from running)
 #  [CACHE_FILE]: /tmp/krb5cc_(trafodion linux UID) - default location for Kerberos
 #    cache ticket store (CACHE_FILE)
@@ -228,7 +228,7 @@ if [ $doStart -eq 1 ]; then
   fi
 
   # remove log, may want to handle log garbage collection differently 
-  rm $MY_SQROOT/logs/krb5check 
+  rm $TRAF_HOME/logs/krb5check 
 
   # kick off a process that wakes up once in a while and check for 
   # ticket expirations
@@ -240,7 +240,7 @@ if [ $doStart -eq 1 ]; then
   getStatus
   msg "starting service (krb5check)"
   msg "$TICKET_STATUS"
-  $MY_SQROOT/sql/scripts/krb5check -r 2 -w 300 &
+  $TRAF_HOME/sql/scripts/krb5check -r 2 -w 300 &
   krb5checkPID=`echo $!`
 
   # see if process started successfully

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/makemsg.ksh
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/makemsg.ksh b/core/sqf/sql/scripts/makemsg.ksh
index 5d24853..8079ac1 100755
--- a/core/sqf/sql/scripts/makemsg.ksh
+++ b/core/sqf/sql/scripts/makemsg.ksh
@@ -23,7 +23,7 @@
 #
 function GetSQcnfg {
 # Get SQ Node configuration
- TempList=`grep -o 'node-name=.[^A-Za-z].[0-9]*' $MY_SQROOT/sql/scripts/sqconfig | cut -d "=" -f 2 | cut -d ";" -f 1 | sort -u`
+ TempList=`grep -o 'node-name=.[^A-Za-z].[0-9]*' $TRAF_HOME/sql/scripts/sqconfig | cut -d "=" -f 2 | cut -d ";" -f 1 | sort -u`
 
  i=0
  for NODE in $TempList
@@ -43,7 +43,7 @@ function GetSQcnfg {
  
  else
      echo
-     echo "Could not parse $MY_SQROOT/sql/scripts/sqconfig file."
+     echo "Could not parse $TRAF_HOME/sql/scripts/sqconfig file."
      echo "Please ensure sqenv.sh has been sourced and the sqconfig file is valid.  Then, re-run sqgen."
      echo
      exit 1;
@@ -57,8 +57,8 @@ if [ -n "$MY_NODES" -a -e $SQ_PDCP ]; then
 
 fi
 
-error_txt=$MY_SQROOT/export/include/sql/SqlciErrors.txt
-error_cat=$MY_SQROOT/export/bin$SQ_MBTYPE/mxcierrors.cat
+error_txt=$TRAF_HOME/export/include/sql/SqlciErrors.txt
+error_cat=$TRAF_HOME/export/bin$SQ_MBTYPE/mxcierrors.cat
 
 # generate catalog only if it doesn't exist or $error_txt is older
 if [ $error_txt -nt $error_cat ]; then

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/qmmstart
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/qmmstart b/core/sqf/sql/scripts/qmmstart
index 8285792..3343ebc 100755
--- a/core/sqf/sql/scripts/qmmstart
+++ b/core/sqf/sql/scripts/qmmstart
@@ -32,7 +32,7 @@
 
 # -- tdm_arkqmm location
 typeset qmmloc
-qmmloc="$MY_SQROOT/export/bin32"
+qmmloc="$TRAF_HOME/export/bin32"
 
 #--QMM process name
 qmmName="ZQM0000"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/rmscheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/rmscheck b/core/sqf/sql/scripts/rmscheck
index ac06524..f631655 100755
--- a/core/sqf/sql/scripts/rmscheck
+++ b/core/sqf/sql/scripts/rmscheck
@@ -24,4 +24,4 @@
 # Most of this was stolen from WMScheck...  which may have started as NDCScheck
 
 echo "Timestamp                           Id    Status "
-sqlci -i $MY_SQROOT/sql/scripts/rmscheck.sql | grep 'Node\|ERROR' | grep -v varchar
+sqlci -i $TRAF_HOME/sql/scripts/rmscheck.sql | grep 'Node\|ERROR' | grep -v varchar

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/runbats
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/runbats b/core/sqf/sql/scripts/runbats
index 00272d1..1128cfc 100755
--- a/core/sqf/sql/scripts/runbats
+++ b/core/sqf/sql/scripts/runbats
@@ -41,22 +41,22 @@ else
 fi
 
 # Run monitor development tests
-cd $MY_SQROOT/sql/scripts
-echo $MY_SQROOT/sql/scripts/bats/runmonitorbats.$enviroment
-$MY_SQROOT/sql/scripts/bats/runmonitorbats.$enviroment
+cd $TRAF_HOME/sql/scripts
+echo $TRAF_HOME/sql/scripts/bats/runmonitorbats.$enviroment
+$TRAF_HOME/sql/scripts/bats/runmonitorbats.$enviroment
 
 # Run monitor development tests
-cd $MY_SQROOT/sql/scripts
-echo $MY_SQROOT/sql/scripts/bats/runseabedbats.$enviroment
-$MY_SQROOT/sql/scripts/bats/runseabedbats.$enviroment
+cd $TRAF_HOME/sql/scripts
+echo $TRAF_HOME/sql/scripts/bats/runseabedbats.$enviroment
+$TRAF_HOME/sql/scripts/bats/runseabedbats.$enviroment
 
 # Run monitor development tests (not working yet)
-cd $MY_SQROOT/sql/scripts
-echo $MY_SQROOT/sql/scripts/bats/runtmbats.$enviroment
-$MY_SQROOT/sql/scripts/bats/runtmbats.$enviroment
+cd $TRAF_HOME/sql/scripts
+echo $TRAF_HOME/sql/scripts/bats/runtmbats.$enviroment
+$TRAF_HOME/sql/scripts/bats/runtmbats.$enviroment
 
 # Run FULL SQL regressions
-cd $MY_SQROOT/sql/scripts
-echo $MY_SQROOT/sql/scripts/bats/runsqlreg.$enviroment
-$MY_SQROOT/sql/scripts/bats/runsqlreg.$enviroment
+cd $TRAF_HOME/sql/scripts
+echo $TRAF_HOME/sql/scripts/bats/runsqlreg.$enviroment
+$TRAF_HOME/sql/scripts/bats/runsqlreg.$enviroment
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheck b/core/sqf/sql/scripts/sqcheck
index 7fbc958..bdb3d94 100755
--- a/core/sqf/sql/scripts/sqcheck
+++ b/core/sqf/sql/scripts/sqcheck
@@ -252,7 +252,7 @@ let cmp_result=0
 let sq_up=0
 
 if [[ -z $SQSCRIPTS_DIR ]]; then
-    SQSCRIPTS_DIR=$MY_SQROOT/sql/scripts
+    SQSCRIPTS_DIR=$TRAF_HOME/sql/scripts
 fi
 
 SQSCRIPT_FILE="$SQSCRIPTS_DIR/gomon.cold"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqcheckmon
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheckmon b/core/sqf/sql/scripts/sqcheckmon
index b280de4..406ee6c 100755
--- a/core/sqf/sql/scripts/sqcheckmon
+++ b/core/sqf/sql/scripts/sqcheckmon
@@ -29,7 +29,7 @@ let lv_sleep_time=5
 let lv_first_time=1
 
 while [ $lv_sqmonitor_up '==' 0 ]; do
-    sqshell -a <<EOF >$MY_SQROOT/logs/sqcheckmon.log 2>&1
+    sqshell -a <<EOF >$TRAF_HOME/logs/sqcheckmon.log 2>&1
 EOF
     let lv_sqshell_ret=$?
     if [ $lv_sqshell_ret '==' 0 ]; then

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqconfig
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqconfig b/core/sqf/sql/scripts/sqconfig
index 393600f..985d6d4 100644
--- a/core/sqf/sql/scripts/sqconfig
+++ b/core/sqf/sql/scripts/sqconfig
@@ -41,14 +41,14 @@ end role_node_map
 #enc-2=n015,n016,n017,n018,n019,n020,n021,n022,n023,n024,n025,n026
 #end enclosure
 
-storage_loc $MY_SQROOT/sql/database
+storage_loc $TRAF_HOME/sql/database
 
 # Please note that if you have mirroring turned ON, you must specify
 # the mirror storage locations.  You can either specify a global
 # mirror location by uncommenting and changing the line below, or
 # you can configure mirror locations on a per volume basis.
 
-#storage_mir_loc $MY_SQROOT/sql/databasem
+#storage_mir_loc $TRAF_HOME/sql/databasem
 
 # Extents are for data audit volumes only, not $TLOG
 # Minimum is 1550
@@ -100,7 +100,7 @@ end tse
 
 # Overflow directories for ssd and hdd. Format: [overflow type] [directory]
 begin overflow
-hdd $MY_SQROOT/tmp
+hdd $TRAF_HOME/tmp
 #ssd /ssd/directory
 end overflow
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqconfig.sample
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqconfig.sample b/core/sqf/sql/scripts/sqconfig.sample
index 31e166e..ed158fb 100644
--- a/core/sqf/sql/scripts/sqconfig.sample
+++ b/core/sqf/sql/scripts/sqconfig.sample
@@ -85,8 +85,8 @@ end role_node_map
 #
 ################################################################
 
-storage_loc $MY_SQROOT/sql/database
-storage_mir_loc $MY_SQROOT/sql/databasem
+storage_loc $TRAF_HOME/sql/database
+storage_mir_loc $TRAF_HOME/sql/databasem
 
 # Extents are for data audit volumes only, not $TLOG
 # Minimum is 1550
@@ -153,7 +153,7 @@ end ase
 #
 ################################################################
 
-storage_loc $MY_SQROOT/sql/database
+storage_loc $TRAF_HOME/sql/database
 
 ################################################################
 #

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqcore
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcore b/core/sqf/sql/scripts/sqcore
index bbff31c..acc90cf 100755
--- a/core/sqf/sql/scripts/sqcore
+++ b/core/sqf/sql/scripts/sqcore
@@ -22,7 +22,7 @@
 # @@@ END COPYRIGHT @@@
 #
 #
-# sqcore - script to collect any user core files generated in /database or $MY_SQROOT 
+# sqcore - script to collect any user core files generated in /database or $TRAF_HOME 
 # across the cluster, and move them to a central location on the head node. Currently, 
 # the script assumes it is run on the head node. The script assumes that the user
 # will take space limitations into consideration.
@@ -34,7 +34,7 @@ function Usage {
     echo "Usage: $0 [ -d <directory> | -q | -r | -h  ]"
     echo 
     echo "-d        Head node directory where the users cluster core files are to be moved"
-    echo "          The default location is \$MY_SQROOT/logs"
+    echo "          The default location is \$TRAF_HOME/logs"
     echo "-q        Quiet mode (no prompts)"
     echo "-r        Remove all of a users cluster core files (excluding head node)"
     echo "-h        Help"
@@ -93,7 +93,7 @@ declare -i SQ_REMOVE=0
 declare -i ERR_FLAG=0
 head=`headnode`
 current=`uname -n`
-to_path=$MY_SQROOT/logs
+to_path=$TRAF_HOME/logs
 
 GetOpts $@
 
@@ -128,20 +128,20 @@ if [ $SQ_QUIET '==' 0 ]; then
     echo
 fi
 
-# Create a list of directory to check for core files (/database and $MY_SQROOT/sql searches.
+# Create a list of directory to check for core files (/database and $TRAF_HOME/sql searches.
 # Note that '$' is used as the field separator to parse out node, volume, and path
 
 # The following can be used to pull the database locations from the sqconfig file,
 # which assumes that the file is correctly configured. Note, that if used the zero-based
 # node calculation should be un-commented from the below "if" statement.
-#dirlist=`grep database $MY_SQROOT/sql/scripts/sqconfig | /bin/gawk '{print $2"$"$3"/"$1}'; $SQ_PDSH -a "find -L $MY_SQROOT/sql -name core\.\* | /bin/gawk -F\/core '{print \\\$1}' | uniq" | /bin/gawk '{sub(":",""); print substr($1,2)"$"$2}'`
+#dirlist=`grep database $TRAF_HOME/sql/scripts/sqconfig | /bin/gawk '{print $2"$"$3"/"$1}'; $SQ_PDSH -a "find -L $TRAF_HOME/sql -name core\.\* | /bin/gawk -F\/core '{print \\\$1}' | uniq" | /bin/gawk '{sub(":",""); print substr($1,2)"$"$2}'`
 
 MY_NODES_PRM=" -a "
 if [ -n "$MY_NODES" ];then
     MY_NODES_PRM=$MY_NODES
 fi
 
-dirlist=`$PDSH $MY_NODES_PRM $PDSH_SSH_CMD "find -L $MY_SQROOT/sql -name core\.\* 2> /dev/null | /bin/gawk -F\/core '{print \\\$1}' | uniq; find -L $MY_SQROOT/export -name core\.\* 2> /dev/null | /bin/gawk -F\/core '{print \\\$1}' | uniq; find -L /database/u*/$USER -name core\.\* 2> /dev/null | /bin/gawk -F \/core '{print \\\$1}'" | /bin/gawk '{sub(":",""); print substr($1,2)"$"$2}' 2> /dev/null`
+dirlist=`$PDSH $MY_NODES_PRM $PDSH_SSH_CMD "find -L $TRAF_HOME/sql -name core\.\* 2> /dev/null | /bin/gawk -F\/core '{print \\\$1}' | uniq; find -L $TRAF_HOME/export -name core\.\* 2> /dev/null | /bin/gawk -F\/core '{print \\\$1}' | uniq; find -L /database/u*/$USER -name core\.\* 2> /dev/null | /bin/gawk -F \/core '{print \\\$1}'" | /bin/gawk '{sub(":",""); print substr($1,2)"$"$2}' 2> /dev/null`
 
 if [[ $dirlist == "" ]]; then
     echo "No core files were found. Exiting..."
@@ -189,7 +189,7 @@ do
                         if [[ $volume != "" ]]; then
                             scp n$node:$path/$j $head:$to_path/$file.n$node.$volume &> /dev/null
                         else
-                            scp n$node:$path/$j $head:$to_path/$file.n$node.MY_SQROOT &> /dev/null
+                            scp n$node:$path/$j $head:$to_path/$file.n$node.TRAF_HOME &> /dev/null
                         fi
 		        if [[ $? != 0 ]]; then
                             echo "  Error while moving n$node:$path/$j..."

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqcorefile
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcorefile b/core/sqf/sql/scripts/sqcorefile
index f8522de..92c49d2 100755
--- a/core/sqf/sql/scripts/sqcorefile
+++ b/core/sqf/sql/scripts/sqcorefile
@@ -46,7 +46,7 @@ coreinfo_environ
 eof
 	rc=$?
 	if [ $rc = 0 ]; then
-		croot=`grep '^MY_SQROOT=' $TMP`
+		croot=`grep '^TRAF_HOME=' $TMP`
 		if [ -z "$croot" ]; then
 			rc=1
 		fi
@@ -88,7 +88,7 @@ eof
 #
 function chk_core_hard {
 	from=`file -L $core | sed "s|^.*from '|'|"`
-	args="-s MY_SQROOT="
+	args="-s TRAF_HOME="
 	if [ $ldpath = 1 ]; then
 		args="$args -s LD_LIBRARY_PATH="
 	fi
@@ -101,7 +101,7 @@ function chk_core_hard {
 	    	LD_LIBRARY_PATH=*)
 			cldpath=$cd
 			;;
-	    	MY_SQROOT=*)
+	    	TRAF_HOME=*)
 			croot=$cd
 			;;
 	    	PATH=*)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqgen
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqgen b/core/sqf/sql/scripts/sqgen
index a761f08..627194c 100755
--- a/core/sqf/sql/scripts/sqgen
+++ b/core/sqf/sql/scripts/sqgen
@@ -26,11 +26,11 @@
 function Usage {
     script_name=`/bin/basename $0`
     echo
-    echo $script_name generates various Trafodion files in the $MY_SQROOT/sql/scripts directory.
+    echo $script_name generates various Trafodion files in the $TRAF_HOME/sql/scripts directory.
     echo
     echo "Usage: $script_name {-ft | -perf | [sqconfig_filename] | -h}"
     echo "  -h    Help"
-    echo "  [sqconfig_filename] Name of the SQ config file (in $MY_SQROOT/sql/scripts directory)(defaults to 'sqconfig')"
+    echo "  [sqconfig_filename] Name of the SQ config file (in $TRAF_HOME/sql/scripts directory)(defaults to 'sqconfig')"
     echo
     exit 1;
 }
@@ -39,7 +39,7 @@ function Usage {
 
 function GetSQcnfg {
 # Get SQ Node configuration
- TempList=`grep -o 'node-name=.[A-Za-z0-9\.\-]*' $MY_SQROOT/sql/scripts/sqconfig | cut -d "=" -f 2 | cut -d ";" -f 1 | sort -u`
+ TempList=`grep -o 'node-name=.[A-Za-z0-9\.\-]*' $TRAF_HOME/sql/scripts/sqconfig | cut -d "=" -f 2 | cut -d ";" -f 1 | sort -u`
 
  i=0
  for NODE in $TempList
@@ -59,7 +59,7 @@ function GetSQcnfg {
  
  else
      echo
-     echo "Could not parse $MY_SQROOT/sql/scripts/sqconfig file."
+     echo "Could not parse $TRAF_HOME/sql/scripts/sqconfig file."
      echo "Please ensure sqenv.sh has been sourced and the sqconfig file is valid.  Then, re-run sqgen."
      echo
      exit 1;
@@ -75,9 +75,9 @@ FT_FLAG=1
 PERF_FLAG=0
 SQCONFIG_FILE=sqconfig
 
-if [ -z $MY_SQROOT ]; then
+if [ -z $TRAF_HOME ]; then
     echo
-    echo "The MY_SQROOT environment variable does not exist."
+    echo "The TRAF_HOME environment variable does not exist."
     echo "Please ensure sqenv.sh has been sourced."
     echo
     exit 1;
@@ -99,7 +99,7 @@ elif [[ $sq_stat == 2 ]]; then
 fi
 
 # Make sure sqgen uses the latest environment
-cd $MY_SQROOT
+cd $TRAF_HOME
 if [ "$SQ_BUILD_TYPE" == "release" -a -f sqenvr.sh ]; then
   . ./sqenvr.sh
 else
@@ -115,7 +115,7 @@ if [ -n "$CHANGED_SQ_ENV_RESTART_SHELL" ]; then
   exit 1
 fi
 
-cd $MY_SQROOT/sql/scripts
+cd $TRAF_HOME/sql/scripts
 
 # Check to make sure this is a real cluster
 if  [[ -n "$node_count" ]] && [[ "$node_count" -gt "1" ]]; then 
@@ -139,8 +139,8 @@ while [ $# != 0 ]
     shift
   done
 
-export SQETC_DIR=$MY_SQROOT/etc
-export SQLOG_DIR=$MY_SQROOT/logs
+export SQETC_DIR=$TRAF_HOME/etc
+export SQLOG_DIR=$TRAF_HOME/logs
 mkdir -p $SQETC_DIR
 mkdir -p $SQLOG_DIR
 mkdir -p $MPI_TMPDIR
@@ -167,7 +167,7 @@ fi
 
 SQSCRIPT_FILE=./gomon
 SQCLUSTERCONF_FILE=$MPI_TMPDIR/cluster.conf
-SQESPENV_FILE=$MY_SQROOT/sql/scripts/tdm_arkesp.env
+SQESPENV_FILE=$TRAF_HOME/sql/scripts/tdm_arkesp.env
 
 echo
 if [ -f $SQETC_DIR/ms.env ]; then
@@ -218,24 +218,24 @@ sq_seamonster=$SQ_SEAMONSTER
 if [ -f $SQESPENV_FILE ]; then
     if [[ $sq_seamonster == 1 ]]; then 
         echo
-        echo "Enabling tdm_arkesp.env file in $MY_SQROOT/etc/ms.env"
-        echo "cat $MY_SQROOT/etc/ms.env | sed -e "s@^# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $MY_SQROOT/etc/ms.env.TEMP"
-        if [ -f $MY_SQROOT/etc/ms.env.TEMP ]; then
-            rm $MY_SQROOT/etc/ms.env.TEMP
+        echo "Enabling tdm_arkesp.env file in $TRAF_HOME/etc/ms.env"
+        echo "cat $TRAF_HOME/etc/ms.env | sed -e "s@^# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $TRAF_HOME/etc/ms.env.TEMP"
+        if [ -f $TRAF_HOME/etc/ms.env.TEMP ]; then
+            rm $TRAF_HOME/etc/ms.env.TEMP
         fi
-        cat $MY_SQROOT/etc/ms.env | sed -e "s@^# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $MY_SQROOT/etc/ms.env.TEMP
-        cp $MY_SQROOT/etc/ms.env.TEMP $MY_SQROOT/etc/ms.env
-        rm $MY_SQROOT/etc/ms.env.TEMP
+        cat $TRAF_HOME/etc/ms.env | sed -e "s@^# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $TRAF_HOME/etc/ms.env.TEMP
+        cp $TRAF_HOME/etc/ms.env.TEMP $TRAF_HOME/etc/ms.env
+        rm $TRAF_HOME/etc/ms.env.TEMP
     else
         echo
-        echo "Disabling tdm_arkesp.env file in $MY_SQROOT/etc/ms.env"
-        echo "cat $MY_SQROOT/etc/ms.env | sed -e "s@^SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $MY_SQROOT/etc/ms.env.TEMP"
-        if [ -f $MY_SQROOT/etc/ms.env.TEMP ]; then
-            rm $MY_SQROOT/etc/ms.env.TEMP
+        echo "Disabling tdm_arkesp.env file in $TRAF_HOME/etc/ms.env"
+        echo "cat $TRAF_HOME/etc/ms.env | sed -e "s@^SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $TRAF_HOME/etc/ms.env.TEMP"
+        if [ -f $TRAF_HOME/etc/ms.env.TEMP ]; then
+            rm $TRAF_HOME/etc/ms.env.TEMP
         fi
-        cat $MY_SQROOT/etc/ms.env | sed -e "s@^SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $MY_SQROOT/etc/ms.env.TEMP
-        cp $MY_SQROOT/etc/ms.env.TEMP $MY_SQROOT/etc/ms.env
-        rm $MY_SQROOT/etc/ms.env.TEMP
+        cat $TRAF_HOME/etc/ms.env | sed -e "s@^SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@# SQ_PROPS_TDM_ARKESP=tdm_arkesp.env@" > $TRAF_HOME/etc/ms.env.TEMP
+        cp $TRAF_HOME/etc/ms.env.TEMP $TRAF_HOME/etc/ms.env
+        rm $TRAF_HOME/etc/ms.env.TEMP
     fi
 fi
 
@@ -267,9 +267,9 @@ if  [[ -n "$node_count" ]] && [[ "$node_count" -gt "1" ]]; then
     if [[ $sq_seamonster == 1 ]]; then 
         if [ -f $SQESPENV_FILE ]; then
             echo
-            echo "Copying $SQESPENV_FILE to $MY_SQROOT/sql/scripts of all the nodes"
-            echo "$PDCP -w ${ExNodeList[@]} -x `uname -n` $SQESPENV_FILE   $MY_SQROOT/sql/scripts "
-            $PDCP -w ${ExNodeList[@]} -x `uname -n` $SQESPENV_FILE   $MY_SQROOT/sql/scripts
+            echo "Copying $SQESPENV_FILE to $TRAF_HOME/sql/scripts of all the nodes"
+            echo "$PDCP -w ${ExNodeList[@]} -x `uname -n` $SQESPENV_FILE   $TRAF_HOME/sql/scripts "
+            $PDCP -w ${ExNodeList[@]} -x `uname -n` $SQESPENV_FILE   $TRAF_HOME/sql/scripts
         fi
     fi
 
@@ -293,12 +293,12 @@ echo
 echo "******* Generate public/private certificates *******"
 echo
 # Generate certificates for ODBC, ...
-if (test -f $MY_SQROOT/sql/scripts/sqcertgen); then
-   $MY_SQROOT/sql/scripts/sqcertgen 2>/dev/null
+if (test -f $TRAF_HOME/sql/scripts/sqcertgen); then
+   $TRAF_HOME/sql/scripts/sqcertgen 2>/dev/null
    echo
 else
    echo
-   echo "ERROR: Certificate generation script (sqcertgen) does not exist in $MY_SQROOT/sql/scripts folder"
+   echo "ERROR: Certificate generation script (sqcertgen) does not exist in $TRAF_HOME/sql/scripts folder"
    echo
    exit 1
 fi

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqnodeipcrm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqnodeipcrm b/core/sqf/sql/scripts/sqnodeipcrm
index 00e9153..233bff7 100755
--- a/core/sqf/sql/scripts/sqnodeipcrm
+++ b/core/sqf/sql/scripts/sqnodeipcrm
@@ -59,13 +59,13 @@ function rm_shm {
 }
 
 declare -i portFilesCount
-let portFilesCount=`ls $MY_SQROOT/tmp/monitor.port.*.bak 2>/dev/null | wc -l`
+let portFilesCount=`ls $TRAF_HOME/tmp/monitor.port.*.bak 2>/dev/null | wc -l`
 if ( [ "$portFilesCount" '==' 0 ] ); then
    echo "Unable to get the monitor port number"
    exit 1
 fi
 
-portFiles=`ls $MY_SQROOT/tmp/monitor.port.*.bak`
+portFiles=`ls $TRAF_HOME/tmp/monitor.port.*.bak`
 for portFile in $portFiles; do
     rm_shm $portFile
 done

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqsmdstats
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqsmdstats b/core/sqf/sql/scripts/sqsmdstats
index a14182d..a0802c9 100755
--- a/core/sqf/sql/scripts/sqsmdstats
+++ b/core/sqf/sql/scripts/sqsmdstats
@@ -75,15 +75,15 @@ function printHelp {
 # check to see if the Trafodion environment is up
 function chkInstance
 {
-  if [ -z $MY_SQROOT ]; then
-     echo "ERROR: You need to set up the MY_SQROOT environment variable "
+  if [ -z $TRAF_HOME ]; then
+     echo "ERROR: You need to set up the TRAF_HOME environment variable "
      echo "to continue using this script."
      echo
      echo "Exiting the sqsmdstats script." 
      exit 1;
   fi
 
-  $MY_SQROOT/sql/scripts/sqcheck -i 1 -d 1 > /dev/null 2>&1
+  $TRAF_HOME/sql/scripts/sqcheck -i 1 -d 1 > /dev/null 2>&1
   sqcheck_result=$?
 
   if   [ $sqcheck_result -eq 0 ]; then
@@ -279,7 +279,7 @@ function generateOutput
 # **************************************************************************
 # FUNCTION: adjustSavedFiles
 # removes old versions of saved files, only retain $archiveCount versions
-# copies final list of files to $MY_SQROOT/logs/sqsmdstats_logs directory
+# copies final list of files to $TRAF_HOME/logs/sqsmdstats_logs directory
 #   on all nodes
 function adjustSavedFiles
 {
@@ -499,7 +499,7 @@ fi
  
 # set up script location, name of results file, etc.
 if [ "$scriptAndLogLoc" = "" ]; then
-   scriptAndLogLoc=$MY_SQROOT/logs/sqsmdstats_logs
+   scriptAndLogLoc=$TRAF_HOME/logs/sqsmdstats_logs
 fi
 
 resultsFile=$scriptAndLogLoc/sqsmdstats_details_$scriptStartTime.log

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqstart
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqstart b/core/sqf/sql/scripts/sqstart
index e231ee0..83f676e 100755
--- a/core/sqf/sql/scripts/sqstart
+++ b/core/sqf/sql/scripts/sqstart
@@ -25,7 +25,7 @@
 #SQ Startup Driver Script. Use sqgen prior to this to generate various files required for startup.
 
 function LogIt {
-    echo  "`date`: $1" >> $MY_SQROOT/logs/startup.log
+    echo  "`date`: $1" >> $TRAF_HOME/logs/startup.log
 }
 
 function Usage {
@@ -115,10 +115,10 @@ function CheckMonitorLink {
 
     if [ ! -e monitor ]; then
         if [ -h monitor ]; then
-            echoLog "The monitor link $MY_SQROOT/sql/scripts/monitor points to a non-existent target:"
+            echoLog "The monitor link $TRAF_HOME/sql/scripts/monitor points to a non-existent target:"
             ls -al monitor
         else
-            echoLog "A soft link to 'monitor' is missing in $MY_SQROOT/sql/scripts"
+            echoLog "A soft link to 'monitor' is missing in $TRAF_HOME/sql/scripts"
         fi
         echoLog "Aborting startup."
         LogIt "End $script_name $sq_start, exit code: 1"
@@ -295,11 +295,11 @@ STARTtime=$(date +%s)
 
 GetOpts $BASH_ARGV
 
-if [ ! -z $MY_SQROOT ]; then
-    cd $MY_SQROOT/sql/scripts
+if [ ! -z $TRAF_HOME ]; then
+    cd $TRAF_HOME/sql/scripts
 else
     echoLog
-    echoLog "The MY_SQROOT environment variable does not exist."
+    echoLog "The TRAF_HOME environment variable does not exist."
     echoLog "Please ensure sqenv.sh has been sourced, and re-run $script_name."
     echoLog
     exit 1;
@@ -312,7 +312,7 @@ if [[ $SQ_SEAMONSTER == "1" ]]; then
     echoLog
     echoLog "SeaMonster is enabled, checking SeaMonster Kernel Module installed version..."
     echoLog
-    sminfo_out=`$MY_SQROOT/export/bin${SQ_MBTYPE}/sminfo 2>&1`
+    sminfo_out=`$TRAF_HOME/export/bin${SQ_MBTYPE}/sminfo 2>&1`
     if [ $? -gt 0 ]; then
        echoLog "$sminfo_out"
        lv_msg="Correct SeaMonster Kernel Module in not installed; please resolve this issue and re-run $script_name!"
@@ -325,7 +325,7 @@ if [[ $SQ_SEAMONSTER == "1" ]]; then
     echoLog
 fi
 
-if [[ ! -e $MY_SQROOT/sql/scripts/sw_env.sh ]]; then
+if [[ ! -e $TRAF_HOME/sql/scripts/sw_env.sh ]]; then
    checkKerberos
    if [[ $? -ne 0 ]]; then
       echo
@@ -340,9 +340,9 @@ fi
 declare -i lv_len_mysqroot
 declare -i lv_max_mysqroot_len
 lv_max_mysqroot_len=78
-lv_len_mysqroot=${#MY_SQROOT}
+lv_len_mysqroot=${#TRAF_HOME}
 if [ $lv_len_mysqroot '>' $lv_max_mysqroot_len ]; then
-    lv_msg="Length of the string \$MY_SQROOT ($MY_SQROOT) should be less than $lv_max_mysqroot_len. Exiting...";
+    lv_msg="Length of the string \$TRAF_HOME ($TRAF_HOME) should be less than $lv_max_mysqroot_len. Exiting...";
     echoLog "$lv_msg"
     LogIt "End $script_name $sq_start, exit code: 1, $lv_msg"
     exit 1;
@@ -366,7 +366,7 @@ fi
 SQCheckOrphanProcesses
 
 if [[ $run_chk_dbperms == 1 ]]; then
-    chk_dbperms=$MY_SQROOT/sql/scripts/chk_dbperms
+    chk_dbperms=$TRAF_HOME/sql/scripts/chk_dbperms
     if [ -x $chk_dbperms ]; then
         echo
         echo "Checking ownership and permissions."
@@ -386,12 +386,12 @@ fi
 
 
 
-SQLOG_DIR=$MY_SQROOT/logs
+SQLOG_DIR=$TRAF_HOME/logs
 SQMON_LOG=$SQLOG_DIR/sqmon.log
 SQSTART_EXIT_STATUS=./sqstart.exit_status
 
 if [[ -z $SQSCRIPTS_DIR ]]; then
-    SQSCRIPTS_DIR=$MY_SQROOT/sql/scripts
+    SQSCRIPTS_DIR=$TRAF_HOME/sql/scripts
 fi
 
 mkdir -p $SQLOG_DIR
@@ -450,7 +450,7 @@ rm -f $MPI_TMPDIR/monitor.port.*
 setup_sqpdsh
 
 # Clear unique strings
-$SQPDSHA 'cd $MY_SQROOT/sql/scripts; utilConfigDb -u'
+$SQPDSHA 'cd $TRAF_HOME/sql/scripts; utilConfigDb -u'
 
 echoLog "Executing sqipcrm (output to sqipcrm.out)"
 sqipcrm > sqipcrm.out
@@ -492,8 +492,8 @@ let lv_num_checks=0
 #Long recoveries on a cluster could delay TX services
 let lv_max_checks=600
 # Check if resource is a work station
-if [[ -e ${MY_SQROOT}/etc/ms.env ]] ; then
-   VIRT_NODES=`awk '/SQ_VIRTUAL_NODES=/ { fields=split($0,virt,"=");  if ( fields == 2 ) { virtnodes=virt[2];}} END {print  virtnodes}' < $MY_SQROOT/etc/ms.env`
+if [[ -e ${TRAF_HOME}/etc/ms.env ]] ; then
+   VIRT_NODES=`awk '/SQ_VIRTUAL_NODES=/ { fields=split($0,virt,"=");  if ( fields == 2 ) { virtnodes=virt[2];}} END {print  virtnodes}' < $TRAF_HOME/etc/ms.env`
    if [[ -n "$VIRT_NODES" ]] ; then
       #Some utilities on workstations will timeout if we wait too long
       lv_max_checks=360

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqstop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqstop b/core/sqf/sql/scripts/sqstop
index e4ecbb1..c09169b 100755
--- a/core/sqf/sql/scripts/sqstop
+++ b/core/sqf/sql/scripts/sqstop
@@ -35,7 +35,7 @@ function Usage {
 }
 
 function LogIt {
-    echo  "`date`: $1" >> $MY_SQROOT/logs/startup.log
+    echo  "`date`: $1" >> $TRAF_HOME/logs/startup.log
 }
 
 function echoLog {
@@ -44,10 +44,10 @@ function echoLog {
 }
 
 script_name=`/bin/basename $0`
-SQLOG_DIR=$MY_SQROOT/logs
+SQLOG_DIR=$TRAF_HOME/logs
 SQMON_LOG=$SQLOG_DIR/sqmon.log
-SQGOMON_FILE=$MY_SQROOT/sql/scripts/gomon.cold
-SQSTOP_EXIT_STATUS=$MY_SQROOT/sql/scripts/sqstop.exit_status
+SQGOMON_FILE=$TRAF_HOME/sql/scripts/gomon.cold
+SQSTOP_EXIT_STATUS=$TRAF_HOME/sql/scripts/sqstop.exit_status
 
 if [ $# -eq 0 ]; then
     shutdowntype=normal
@@ -197,17 +197,17 @@ $L_PDSH rm -f /dev/shm/sem.rms* 2>/dev/null
 # Clean up Floating IP bound
 if (test -n "${CLUSTERNAME}"); then
 	# Check whether floating ip is configured.
-	gv_floating_ip=`grep -i "begin floating_ip" $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#'`
+	gv_floating_ip=`grep -i "begin floating_ip" $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#'`
 	if [ -n "$gv_floating_ip" ]; then
 		echoLog "Clean up Floating IP..."
 
 		cmd_timeout="-u 30"
 
 		# Get floating ip addresses.
-		gv_float_external_ip=`sed -n '/begin floating_ip/,/end floating_ip/p' $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#' | grep external-ip | awk 'BEGIN{FS=";"}{split($3, ary, "="); print ary[2];}'`
-		gv_float_external_interface=`sed -n '/begin floating_ip/,/end floating_ip/p' $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#' | grep external-ip | awk 'BEGIN{FS=";"}{split($2, ary, "="); print ary[2];}'`
-		gv_float_internal_ip=`sed -n '/begin floating_ip/,/end floating_ip/p' $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#' | grep internal-ip | awk 'BEGIN{FS=";"}{split($3, ary, "="); print ary[2];}'`
-		gv_float_internal_interface=`sed -n '/begin floating_ip/,/end floating_ip/p' $MY_SQROOT/sql/scripts/sqconfig | grep -v '^#' | grep internal-ip | awk 'BEGIN{FS=";"}{split($2, ary, "="); print ary[2];}'`
+		gv_float_external_ip=`sed -n '/begin floating_ip/,/end floating_ip/p' $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#' | grep external-ip | awk 'BEGIN{FS=";"}{split($3, ary, "="); print ary[2];}'`
+		gv_float_external_interface=`sed -n '/begin floating_ip/,/end floating_ip/p' $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#' | grep external-ip | awk 'BEGIN{FS=";"}{split($2, ary, "="); print ary[2];}'`
+		gv_float_internal_ip=`sed -n '/begin floating_ip/,/end floating_ip/p' $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#' | grep internal-ip | awk 'BEGIN{FS=";"}{split($3, ary, "="); print ary[2];}'`
+		gv_float_internal_interface=`sed -n '/begin floating_ip/,/end floating_ip/p' $TRAF_HOME/sql/scripts/sqconfig | grep -v '^#' | grep internal-ip | awk 'BEGIN{FS=";"}{split($2, ary, "="); print ary[2];}'`
 
 		# Check and get all the nodes that the ext/int IP address have been set. And do the unbind.
 		
@@ -221,7 +221,7 @@ if (test -n "${CLUSTERNAME}"); then
 					unbindip=`echo "$match_ip_interface"|awk '{print $2}'`
 					unbindlb=`echo "$match_ip_interface"|awk '{print $NF}'`
 					echoLog "pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb"
-					pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb >> $MY_SQROOT/logs/ndcsunbind.log
+					pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb >> $TRAF_HOME/logs/ndcsunbind.log
 				fi
 	       done
 	   done
@@ -236,7 +236,7 @@ if (test -n "${CLUSTERNAME}"); then
 					unbindip=`echo "$match_ip_interface"|awk '{print $2}'`
 					unbindlb=`echo "$match_ip_interface"|awk '{print $NF}'`
 					echoLog "pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb"
-					pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb >> $MY_SQROOT/logs/ndcsunbind.log
+					pdsh $cmd_timeout -S -w $curnode sudo ip addr del $unbindip dev $myinterface label $unbindlb >> $TRAF_HOME/logs/ndcsunbind.log
 			   fi
 		   done
 	   done

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/sqsystem.pm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqsystem.pm b/core/sqf/sql/scripts/sqsystem.pm
index b380b79..f44144b 100755
--- a/core/sqf/sql/scripts/sqsystem.pm
+++ b/core/sqf/sql/scripts/sqsystem.pm
@@ -40,10 +40,10 @@ sub isProd
 
 sub isSingleNode
 {
-   my $MY_SQROOT = $ENV{'MY_SQROOT'};
+   my $TRAF_HOME = $ENV{'TRAF_HOME'};
 
    # Get the number of nodes in the instance
-   my $TempList = `grep 'node-name=.[^A-Za-z].[0-9]*' $MY_SQROOT/sql/scripts/sqconfig | grep -v "\#" | cut -d"=" -f3 | cut -d";" -f1 | sort -u`;
+   my $TempList = `grep 'node-name=.[^A-Za-z].[0-9]*' $TRAF_HOME/sql/scripts/sqconfig | grep -v "\#" | cut -d"=" -f3 | cut -d";" -f1 | sort -u`;
    if (!$TempList)
      {# Single-node development system
       return 1;  # true

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/traf_authentication_config
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/traf_authentication_config b/core/sqf/sql/scripts/traf_authentication_config
index 4165603..62cbc5c 100755
--- a/core/sqf/sql/scripts/traf_authentication_config
+++ b/core/sqf/sql/scripts/traf_authentication_config
@@ -24,9 +24,9 @@
 # directory service configuration.
 #
 # To use authentication in Trafodion, this file must be configured
-# as described below and placed in $MY_SQROOT/sql/scripts and be named
+# as described below and placed in $TRAF_HOME/sql/scripts and be named
 # .traf_authentication_config.  You must also enable authentication by
-# running the script traf_authentication_setup in $MY_SQROOT/sql/scripts.
+# running the script traf_authentication_setup in $TRAF_HOME/sql/scripts.
 #
 # NOTE: the format of this configuration file is expected to change in the 
 # next release of Trafodion.  Backward compatilibity is not guaranteed.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/traf_authentication_setup
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/traf_authentication_setup b/core/sqf/sql/scripts/traf_authentication_setup
index 98ead6f..650a7a0 100755
--- a/core/sqf/sql/scripts/traf_authentication_setup
+++ b/core/sqf/sql/scripts/traf_authentication_setup
@@ -33,7 +33,7 @@
 #    --file <name> (OPTIONAL) 
 #        ==> specifies the name of the ldap configuration file that
 #            will be used to contact the identity store
-#            defaults to:  $MY_SQROOT/sql/script/.traf_authentication_config 
+#            defaults to:  $TRAF_HOME/sql/script/.traf_authentication_config 
 #
 #   When specifying --setup or --on, the script:
 #      ==> verifies that the configuration file exists
@@ -41,9 +41,9 @@
 #      ==> calls ldapcheck to test a connection to LDAP
 #      ==> if all is good then:
 #         ==> sets the environment variable TRAFODION_ENABLE_AUTHENTICATION to
-#             YES in $MY_SQROOT/sqenvcom.sh
-#         ==> copies $MY_SQROOT/sqenvcom.sh to all nodes in cluster
-#         ==> propagates $MY_SQROOT/sql/script/.traf_authentication_config to
+#             YES in $TRAF_HOME/sqenvcom.sh
+#         ==> copies $TRAF_HOME/sqenvcom.sh to all nodes in cluster
+#         ==> propagates $TRAF_HOME/sql/script/.traf_authentication_config to
 #             all nodes in the cluster
 #
 #   When specifying --on 
@@ -54,8 +54,8 @@
 #
 #   When specifying --off, the script:
 #      ==> sets the environment variable TRAFODION_ENABLE_AUTHENTICATION = YES
-#          in $MY_SQROOT/sqenvcom.sh
-#      ==> copies $MY_SQROOT/sqenvcom.sh to all nodes in cluster
+#          in $TRAF_HOME/sqenvcom.sh
+#      ==> copies $TRAF_HOME/sqenvcom.sh to all nodes in cluster
 #
 # To know whether authentication is enable or not, specify:
 #    -- status
@@ -91,19 +91,19 @@ EOF
 function change_sqenvcom 
 {
   echo "INFO: Modifying sqenvcom.sh to adjust the authentication default"
-  cp $MY_SQROOT/sqenvcom.sh sqenvcom.sh_temp
+  cp $TRAF_HOME/sqenvcom.sh sqenvcom.sh_temp
   if [ $authOn -eq 1 ]; then
-    sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=NO@TRAFODION_ENABLE_AUTHENTICATION=YES@" <sqenvcom.sh_temp >$MY_SQROOT/sqenvcom.sh
+    sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=NO@TRAFODION_ENABLE_AUTHENTICATION=YES@" <sqenvcom.sh_temp >$TRAF_HOME/sqenvcom.sh
     echo "INFO: Authentication has been enabled"
   else
-    sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=YES@TRAFODION_ENABLE_AUTHENTICATION=NO@" <sqenvcom.sh_temp >$MY_SQROOT/sqenvcom.sh
+    sed -e "s@TRAFODION_ENABLE_AUTHENTICATION=YES@TRAFODION_ENABLE_AUTHENTICATION=NO@" <sqenvcom.sh_temp >$TRAF_HOME/sqenvcom.sh
     echo "INFO: Authentication has been disabled"
   fi
   rm sqenvcom.sh_temp > /dev/null 2>&1
 
   if [ $isCluster -eq 1 ]; then
-    #echo "pdcp -p -x $HOSTNAME $MY_NODES $MY_SQROOT/sqenvcom.sh $MY_SQROOT"
-    pdcp -p -x $HOSTNAME $MY_NODES $MY_SQROOT/sqenvcom.sh $MY_SQROOT
+    #echo "pdcp -p -x $HOSTNAME $MY_NODES $TRAF_HOME/sqenvcom.sh $TRAF_HOME"
+    pdcp -p -x $HOSTNAME $MY_NODES $TRAF_HOME/sqenvcom.sh $TRAF_HOME
   fi
 
 }
@@ -172,7 +172,7 @@ function copy_config
   fi
   rm auth_configcheck
 
-  # copy the configuration file to $MY_SQROOT/sql/scripts on
+  # copy the configuration file to $TRAF_HOME/sql/scripts on
   # all nodes in the cluster
 
   if [ $isCluster -eq 1 ]; then
@@ -189,7 +189,7 @@ function copy_config
 # =============================================================================
 function enable_authorization
 {
-  logLoc=$MY_SQROOT/logs
+  logLoc=$TRAF_HOME/logs
   rm $logLoc/authEnable.log > /dev/null 2>&1
   #gdb sqlci
   sqlci >> "$logLoc/authEnable.log" 2>&1 <<eof
@@ -216,7 +216,7 @@ eof
 # =============================================================================
 function disable_authorization
 {
-  logLoc=$MY_SQROOT/logs
+  logLoc=$TRAF_HOME/logs
   rm $logLoc/authDisable.log > /dev/null 2>&1
   sqlci >> "$logLoc/authDisable.log" 2>&1 <<eof
    values (current_timestamp);
@@ -243,7 +243,7 @@ eof
 # =============================================================================
 function status_authorization
 {
-  logLoc=$MY_SQROOT/logs
+  logLoc=$TRAF_HOME/logs
   rm $logLoc/authStatus.log > /dev/null 2>&1
   sqlci >> "$logLoc/authStatus.log" 2>&1 <<eof
    values (current_timestamp);
@@ -268,7 +268,7 @@ eof
 # main
 # =============================================================================
 
-defaultConfigFileDir="$MY_SQROOT/sql/scripts"
+defaultConfigFileDir="$TRAF_HOME/sql/scripts"
 defaultConfigFile="/.traf_authentication_config"
 configFileDir=$defaultConfigFileDir
 configFile=$defaultConfigFileDir$defaultConfigFile
@@ -282,9 +282,9 @@ doStatus=0
 statusSpecified=0
 
 # Make sure required env vars have been set first
-if [[ -z "$MY_SQROOT" ]]; then
+if [[ -z "$TRAF_HOME" ]]; then
     echo
-    echo "***ERROR: Environment variable MY_SQROOT has no value."
+    echo "***ERROR: Environment variable TRAF_HOME has no value."
     echo
     exit 1
 fi

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/trafnodestatus
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/trafnodestatus b/core/sqf/sql/scripts/trafnodestatus
index f7e5956..86e7d52 100755
--- a/core/sqf/sql/scripts/trafnodestatus
+++ b/core/sqf/sql/scripts/trafnodestatus
@@ -59,13 +59,13 @@ if [[ ! -z $1 ]]; then
     fi
 fi
 
-if [[ -z $MY_SQROOT ]]; then
+if [[ -z $TRAF_HOME ]]; then
     traf_echo "Looks like the Trafodion environment has not been configured. Exitting..."
     traf_exit 5;
 fi
 
 if [[ -z $SQSCRIPTS_DIR ]]; then
-    SQSCRIPTS_DIR=$MY_SQROOT/sql/scripts
+    SQSCRIPTS_DIR=$TRAF_HOME/sql/scripts
 fi
 SQCONFIGDB_FILE="$SQSCRIPTS_DIR/sqconfig.db"
 if [[ ! -e ${SQCONFIGDB_FILE} ]]; then
@@ -76,7 +76,7 @@ fi
 
 grep_out=`pstat | grep "monitor COLD" | grep -v mpirun`
 if [[ $? == '0' ]]; then
-   sqshell -c node info | awk -v jason_output=${lv_jason_output} -f $MY_SQROOT/sql/scripts/trafnodestatus.awk
+   sqshell -c node info | awk -v jason_output=${lv_jason_output} -f $TRAF_HOME/sql/scripts/trafnodestatus.awk
    traf_exit $?
 else
    traf_echo "Trafodion is not running on the current node: `hostname`"
@@ -89,12 +89,12 @@ if [[ ! -z ${SQ_VIRTUAL_NODES} ]]; then
     traf_exit 1
 fi
 
-grep_out_mon=`$MY_SQROOT/sql/scripts/cstat | grep "monitor COLD" `
+grep_out_mon=`$TRAF_HOME/sql/scripts/cstat | grep "monitor COLD" `
 lv_ret=$?
 if [[ $lv_ret == 0 ]]; then
     grep_out=`cstat | grep "monitor COLD" | grep -v mpirun | sort | cut -d: -f1`
     for lv_node in $grep_out; do
-	ssh $lv_node sqshell -c node info | awk -v jason_output=${lv_jason_output} -f $MY_SQROOT/sql/scripts/trafnodestatus.awk
+	ssh $lv_node sqshell -c node info | awk -v jason_output=${lv_jason_output} -f $TRAF_HOME/sql/scripts/trafnodestatus.awk
         lv_sqcheck_retcode=$?
         traf_exit ${lv_exit_code}
     done

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/uninstall_traf_components
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/uninstall_traf_components b/core/sqf/sql/scripts/uninstall_traf_components
index 2748413..20641e2 100755
--- a/core/sqf/sql/scripts/uninstall_traf_components
+++ b/core/sqf/sql/scripts/uninstall_traf_components
@@ -23,7 +23,7 @@
 RM='/bin/rm -rf'
 
 function usage() {
-   LOCAL_HADOOP_DIR=\$MY_SQROOT/sql/local_hadoop
+   LOCAL_HADOOP_DIR=\$TRAF_HOME/sql/local_hadoop
    prog=`basename $0`
    echo "$prog { all | dcs | rest | clients | tests }"
    echo "  all     --- Removes all the installed components (dcs, rest and clients) from $LOCAL_HADOOP_DIR"
@@ -54,7 +54,7 @@ function uninstall_rest() {
 
   if [[ -d $REST_INSTALL_DIR ]]; then
      echo "**** Uninstalling REST Server from $REST_INSTALL_DIR"
-     $RM $REST_INSTALL_DIR $MY_SQROOT/sql/scripts/swrest
+     $RM $REST_INSTALL_DIR $TRAF_HOME/sql/scripts/swrest
      status_code=$?
      if [[ $status_code != 0 ]]; then
         echo "**** Failed to uninstall REST from $REST_INSTALL_DIR :"  $status_code
@@ -70,12 +70,12 @@ function uninstall_rest() {
 
 function uninstall_clients_dir() {
 
-  CLIENTS_DIR=$MY_SQROOT/sql/local_hadoop/clients
-  LNXDRVR_DIR=$MY_SQROOT/sql/local_hadoop/lnxdrvr
-  ODB_DIR=$MY_SQROOT/sql/local_hadoop/odb
+  CLIENTS_DIR=$TRAF_HOME/sql/local_hadoop/clients
+  LNXDRVR_DIR=$TRAF_HOME/sql/local_hadoop/lnxdrvr
+  ODB_DIR=$TRAF_HOME/sql/local_hadoop/odb
   if [[ -d $CLIENTS_DIR ]]; then
      echo "**** Uninstalling clients (lnxdrvr and odb) from $CLIENTS_DIR"
-     $RM $CLIENTS_DIR $LNXDRVR_DIR $ODB_DIR $MY_SQROOT/sql/scripts/swodb $MY_SQROOT/sql/scripts/swlnx
+     $RM $CLIENTS_DIR $LNXDRVR_DIR $ODB_DIR $TRAF_HOME/sql/scripts/swodb $TRAF_HOME/sql/scripts/swlnx
      status_code=$?
      if [[ $status_code != 0 ]]; then
         echo "**** Failed to uninstall clients (lnxdrvr and odb) from $CLIENTS_DIR :"  $status_code
@@ -91,11 +91,11 @@ function uninstall_clients_dir() {
 
 function uninstall_tests_dir() {
 
-  DCSTEST_DIR=$MY_SQROOT/sql/local_hadoop/dcstests
-  TESTS_DIR=$MY_SQROOT/sql/local_hadoop/tests
+  DCSTEST_DIR=$TRAF_HOME/sql/local_hadoop/dcstests
+  TESTS_DIR=$TRAF_HOME/sql/local_hadoop/tests
   if [[ -d $DCSTEST_DIR ]]; then
      echo "**** Uninstalling dcs(jdbc/odbc) tests from $DCSTEST_DIR"
-     $RM $DCSTEST_DIR $MY_SQROOT/sql/scripts/swjdbc $MY_SQROOT/sql/scripts/swpyodbc
+     $RM $DCSTEST_DIR $TRAF_HOME/sql/scripts/swjdbc $TRAF_HOME/sql/scripts/swpyodbc
      status_code=$?
      if [[ $status_code != 0 ]]; then
         echo "**** Failed to uninstall odbc/jdbc tests directory from $DCSTEST_DIR :"  $status_code
@@ -110,7 +110,7 @@ function uninstall_tests_dir() {
 
   if [[ -d $TESTS_DIR ]]; then
      echo "**** Uninstalling phoenix tests from $TESTS_DIR"
-     $RM $TESTS_DIR $MY_SQROOT/sql/scripts/swphoenix
+     $RM $TESTS_DIR $TRAF_HOME/sql/scripts/swphoenix
      status_code=$?
      if [[ $status_code != 0 ]]; then
         echo "**** Failed to uninstall phoenix tests directory from $TESTS_DIR :"  $status_code
@@ -126,7 +126,7 @@ function uninstall_tests_dir() {
 
 #Main
 echo
-if [ ! -z ${MY_SQROOT} ]; then
+if [ ! -z ${TRAF_HOME} ]; then
    case "$1" in
       dcs)
         uninstall_dcs

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/update_hbase
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/update_hbase b/core/sqf/sql/scripts/update_hbase
index 7aa8e60..17b0669 100644
--- a/core/sqf/sql/scripts/update_hbase
+++ b/core/sqf/sql/scripts/update_hbase
@@ -27,7 +27,7 @@
 # Currently, it works for local_hadoop installations only.
 #
 
-if [ -d $MY_SQROOT/sql/local_hadoop/hbase ]; then
+if [ -d $TRAF_HOME/sql/local_hadoop/hbase ]; then
     echo "An existing Hadoop installation exists. Will:"
     echo "    - Stop HBase"
     echo "    - Copy TRX jar"
@@ -44,7 +44,7 @@ else
     exit 1
 fi
 
-cd $MY_SQROOT/sql/local_hadoop/
+cd $TRAF_HOME/sql/local_hadoop/
 echo "Stopping HBase"
 swstophbase
 # Let the HBase env settle down
@@ -54,8 +54,8 @@ HBASE_CONFIG_FILE=hbase/conf/hbase-site.xml
 HBASE_ENV_FILE=hbase/conf/hbase-env.sh
 
 # For HBase_Trx (for now)
-echo "Copied ${MY_SQROOT}/export/lib/${HBASE_TRX_JAR} to $PWD/hbase/lib"
-cp -p ${MY_SQROOT}/export/lib/${HBASE_TRX_JAR} hbase/lib
+echo "Copied ${TRAF_HOME}/export/lib/${HBASE_TRX_JAR} to $PWD/hbase/lib"
+cp -p ${TRAF_HOME}/export/lib/${HBASE_TRX_JAR} hbase/lib
 
 echo "Updating file $HBASE_CONFIG_FILE ..."
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sql/scripts/update_sql
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/update_sql b/core/sqf/sql/scripts/update_sql
index 3099c44..c244b57 100755
--- a/core/sqf/sql/scripts/update_sql
+++ b/core/sqf/sql/scripts/update_sql
@@ -22,7 +22,7 @@
 # @@@ END COPYRIGHT @@@
 #
 # update_sql - SQ Script to update sql/sqlmx (or a supplied directory) to all nodes. 
-# $MY_SQROOT should be sourced from sqenv.sh prior to running this script.
+# $TRAF_HOME should be sourced from sqenv.sh prior to running this script.
 #
 
 function Usage {
@@ -79,13 +79,13 @@ GetOpts $@
 
 # Default is to copy SQL files from current nodes sql/sqlmx if a -i dir isn't supplied
 if [ -z $SQ_COPY_FROM ]; then
-    SQ_COPY_FROM=$MY_SQROOT/sql/sqlmx
+    SQ_COPY_FROM=$TRAF_HOME/sql/sqlmx
     
-    if [ -e $MY_SQROOT ]; then
-        SQ_COPY_TO=$MY_SQROOT/sql/sqlmx
+    if [ -e $TRAF_HOME ]; then
+        SQ_COPY_TO=$TRAF_HOME/sql/sqlmx
     else 
         echo
-        echo "Error - MY_SQROOT env variable does not exist."
+        echo "Error - TRAF_HOME env variable does not exist."
         echo "        Source sqenv.sh and retry $0. Exiting..."
         echo
         exit 2

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/sqvers
----------------------------------------------------------------------
diff --git a/core/sqf/sqvers b/core/sqf/sqvers
index 313474f..a59ab0a 100755
--- a/core/sqf/sqvers
+++ b/core/sqf/sqvers
@@ -58,9 +58,9 @@ if (!$res) {
 	}
 }
 
-# get MY_SQROOT/who/host
+# get TRAF_HOME/who/host
 my $sq_pdsh = defined $ENV{'SQ_PDSH'} ? $ENV{'SQ_PDSH'} : '';
-my $my_sqroot = defined $ENV{'MY_SQROOT'} ? $ENV{'MY_SQROOT'} : '';
+my $traf_home = defined $ENV{'TRAF_HOME'} ? $ENV{'TRAF_HOME'} : '';
 my $java_home = defined $ENV{'JAVA_HOME'} ? $ENV{'JAVA_HOME'} : '';
 my $sq_mbtype = defined $ENV{'SQ_MBTYPE'} ? $ENV{'SQ_MBTYPE'} : '';
 my $host;
@@ -105,12 +105,12 @@ if (-r "/etc/redhat-release") {
     $dr=$susevers . "." . $susepatch
 }
 
-print "MY_SQROOT=$my_sqroot\n";
+print "TRAF_HOME=$traf_home\n";
 print "who\@host=$w\@$host\n";
 print "JAVA_HOME=$java_home\n";
 # can't do much if these two env variables are not setup
-if (!defined $ENV{'MY_SQROOT'}) {
-	die "MY_SQROOT is not set!";
+if (!defined $ENV{'TRAF_HOME'}) {
+	die "TRAF_HOME is not set!";
 }
 if (!defined $ENV{'JAVA_HOME'}) {
 	die "JAVA_HOME is not set!";
@@ -138,7 +138,7 @@ if ($utt) {
 
 sub find_elfs ($$) {
 	my ($dir, $so) = @_;
-	my $chdir = "$my_sqroot/$dir";
+	my $chdir = "$traf_home/$dir";
 	chdir($chdir) or die "can't chdir to $chdir $!";
 	my $ls;
 	if ($so) {
@@ -188,7 +188,7 @@ sub find_elfs ($$) {
 
 sub find_jars ($) {
 	my ($dir) = @_;
-	my $chdir = "$my_sqroot/$dir";
+	my $chdir = "$traf_home/$dir";
 	chdir($chdir) or die "can't chdir to $chdir $!";
 	my $ls = `ls *.jar`;
 	my @files = split(/\n/, $ls);
@@ -310,14 +310,14 @@ sub version_elf ($$) {
 		}
 	}
 	if (!$has_version) {
-		print "\$MY_SQROOT/$dir/$elf missing version string\n";
+		print "\$TRAF_HOME/$dir/$elf missing version string\n";
 	}
 }
 
 sub version_jar ($$) {
 	my ($dir, $jar) = @_;
 
-	my $cmd_vers = "$java_home/bin/java -jar $my_sqroot/export/lib/sqmanvers.jar $jar";
+	my $cmd_vers = "$java_home/bin/java -jar $traf_home/export/lib/sqmanvers.jar $jar";
 	if ($verbose) {
 		printf "v: cmd:$cmd_vers\n";
 	}
@@ -348,7 +348,7 @@ sub version_jar ($$) {
 	}
 	
 	if (!$utt && !$has_version) {
-		print "\$MY_SQROOT/$dir/$jar missing version string\n";
+		print "\$TRAF_HOME/$dir/$jar missing version string\n";
 	}
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/macros.gmk b/core/sqf/src/seabed/macros.gmk
index 8d24632..5e36a28 100644
--- a/core/sqf/src/seabed/macros.gmk
+++ b/core/sqf/src/seabed/macros.gmk
@@ -35,7 +35,7 @@ INCMISCDIR     += $(INCMONDIR)
 
 
 # export
-EXPROOT		= $(MY_SQROOT)/export
+EXPROOT		= $(TRAF_HOME)/export
 
 # seabed
 SBROOT		= ..

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/src/env.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/env.cpp b/core/sqf/src/seabed/src/env.cpp
index 06bb6cc..9b576b1 100644
--- a/core/sqf/src/seabed/src/env.cpp
+++ b/core/sqf/src/seabed/src/env.cpp
@@ -68,7 +68,7 @@ const char *gp_ms_env_sq_ic              = "SQ_IC";
 const char *gp_ms_env_sq_msgflow         = "SQ_MSGFLOW";
 const char *gp_ms_env_sq_snapshot_dir    = "SQ_SNAPSHOT_DIR";
 const char *gp_ms_env_sq_trans_sock      = "SQ_TRANS_SOCK";
-const char *gp_ms_env_sq_root            = "MY_SQROOT";
+const char *gp_ms_env_sq_root            = "TRAF_HOME";
 const char *gp_ms_env_sq_vnid            = "SQ_VIRTUAL_NID";
 const char *gp_ms_env_sq_vnodes          = "SQ_VIRTUAL_NODES";
 const char *gp_ms_env_streams_max        = "MS_STREAMS_MAX";

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/src/util.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/util.cpp b/core/sqf/src/seabed/src/util.cpp
index 868b6e9..9ea3610 100644
--- a/core/sqf/src/seabed/src/util.cpp
+++ b/core/sqf/src/seabed/src/util.cpp
@@ -1249,7 +1249,7 @@ void sb_util_write_log(char *pp_buf) {
 
     strncpy(gv_ms_save_log, pp_buf, sizeof(gv_ms_save_log) - 1);
     gv_ms_save_log[sizeof(gv_ms_save_log) - 1] = '\0';
-    lp_root = getenv("MY_SQROOT");
+    lp_root = getenv("TRAF_HOME");
     if (lp_root == NULL)
         lp_log_file_dir = NULL;
     else {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/go284j
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/go284j b/core/sqf/src/seabed/test/go284j
index a766f4b..277d9dc 100755
--- a/core/sqf/src/seabed/test/go284j
+++ b/core/sqf/src/seabed/test/go284j
@@ -28,7 +28,7 @@ rm -f core.* sbt*
 go69mon -start
 t284srv -attach $* &
 sleep 1
-LD_PRELOAD=$MY_SQROOT/export/lib64/libseabasesig.so $JAVA_HOME/bin/java -cp Linux-x86_64/64/rls com.hp.traf.t284cli $*
+LD_PRELOAD=$TRAF_HOME/export/lib64/libseabasesig.so $JAVA_HOME/bin/java -cp Linux-x86_64/64/rls com.hp.traf.t284cli $*
 wait %1
 
 go69mon -stop

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/go9
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/go9 b/core/sqf/src/seabed/test/go9
index e2085bc..6f37f8c 100755
--- a/core/sqf/src/seabed/test/go9
+++ b/core/sqf/src/seabed/test/go9
@@ -36,14 +36,14 @@ if [ $check = 1 ]; then
 	export LD_LIBRARY_PATH=../evsim:$LD_LIBRARY_PATH
 	vg=`which valgrind`
 	# strlen/strcmp/memcmp problem workaround on RH6
-	sed "s|MY_SQROOT|$MY_SQROOT|" ./t9thread.rh6.supp > ./t9thread.rh6x.supp
+	sed "s|TRAF_HOME|$TRAF_HOME|" ./t9thread.rh6.supp > ./t9thread.rh6x.supp
 	supp="--suppressions=./t9thread.rh6x.supp"
 	# To rebuild the suppressions file:
 	# uncomment the following
 	# go9 -check -vg 2>zx
 	# edit zx:
         #   remove all lines that start with '=='
-        #   change expanded version of $MY_SQROOT with 'MY_SQROOT' (no $!)
+        #   change expanded version of $TRAF_HOME with 'TRAF_HOME' (no $!)
         #   edit <insert_a_suppression_name_here>
 	# copy zx to t9thread.rh6.supp
 	# svn commit t9thread.rh6.supp

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/goshell205
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/goshell205 b/core/sqf/src/seabed/test/goshell205
index 288ccc5..76d0cdc 100755
--- a/core/sqf/src/seabed/test/goshell205
+++ b/core/sqf/src/seabed/test/goshell205
@@ -41,7 +41,7 @@ if [ "$5" = "-attach" ]; then
 fi
 
 if [ $attach = 1 ]; then
-	sqshell=$MY_SQROOT/sql/scripts/sqshell
+	sqshell=$TRAF_HOME/sql/scripts/sqshell
 	if [ -r $sqshell ]; then
 		nodes=`grep -w SQ_VIRTUAL_NODES $sqshell`
 		if [ $? != 0 ]; then

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/gostart
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/gostart b/core/sqf/src/seabed/test/gostart
index ddff662..edf1765 100755
--- a/core/sqf/src/seabed/test/gostart
+++ b/core/sqf/src/seabed/test/gostart
@@ -23,6 +23,6 @@
 date
 rm -f core.* > /dev/null 2>&1
 sqipcrm
-if [ ! -d $MY_SQROOT/logs ]; then
-	mkdir $MY_SQROOT/logs
+if [ ! -d $TRAF_HOME/logs ]; then
+	mkdir $TRAF_HOME/logs
 fi

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/t9thread.rh6.supp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/t9thread.rh6.supp b/core/sqf/src/seabed/test/t9thread.rh6.supp
index 3bcc844..fabc914 100644
--- a/core/sqf/src/seabed/test/t9thread.rh6.supp
+++ b/core/sqf/src/seabed/test/t9thread.rh6.supp
@@ -31,8 +31,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
 }
 {
@@ -47,8 +47,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
 }
 {
@@ -62,8 +62,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
 }
@@ -78,8 +78,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
 }
@@ -95,8 +95,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
 }
 {
@@ -110,8 +110,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
 }
@@ -126,8 +126,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
 }
@@ -143,8 +143,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
 }
 {
@@ -158,8 +158,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
 }
@@ -174,8 +174,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
 }
@@ -189,8 +189,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
    obj:*
@@ -207,8 +207,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
 }
 {
@@ -222,8 +222,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
 }
@@ -238,8 +238,8 @@
    fun:_ZN8SB_Trans7Msg_Mgr4initEv
    fun:_Z41__static_initialization_and_destruction_0ii
    fun:_GLOBAL__sub_I_mpitmsg.cpp
-   obj:MY_SQROOT/export/lib64/libsbms.so
-   obj:MY_SQROOT/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
+   obj:TRAF_HOME/export/lib64/libsbms.so
    obj:*
    obj:*
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/test/tcheck.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/test/tcheck.cpp b/core/sqf/src/seabed/test/tcheck.cpp
index c5c66f2..337b845 100644
--- a/core/sqf/src/seabed/test/tcheck.cpp
+++ b/core/sqf/src/seabed/test/tcheck.cpp
@@ -100,7 +100,7 @@ int main(int argc, char *argv[]) {
         return 0;
     }
     if (!env.load(config_file)) { // try to load default config
-        char *root = getenv("MY_SQROOT");
+        char *root = getenv("TRAF_HOME");
         if (root != NULL) {
             char la_file[BUFSIZ];
             sprintf(la_file, "%s/etc/%s", root, config_file);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/tools/sqmanvers
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/tools/sqmanvers b/core/sqf/src/seabed/tools/sqmanvers
index 601913b..421d682 100755
--- a/core/sqf/src/seabed/tools/sqmanvers
+++ b/core/sqf/src/seabed/tools/sqmanvers
@@ -25,4 +25,4 @@
 ###########################################################################
 
 CV_VERS=1.0.2
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
+$TRAF_HOME/export/include/SCMBuildJava.sh $CV_VERS

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seabed/tools/sqmanvers.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/tools/sqmanvers.java b/core/sqf/src/seabed/tools/sqmanvers.java
index 04c442e..21c853c 100644
--- a/core/sqf/src/seabed/tools/sqmanvers.java
+++ b/core/sqf/src/seabed/tools/sqmanvers.java
@@ -138,7 +138,7 @@ public class sqmanvers {
         String lp_jar;
         String lp_sqroot;
 
-        lp_sqroot = System.getenv("MY_SQROOT");
+        lp_sqroot = System.getenv("TRAF_HOME");
         lp_jar = lp_sqroot + "/export/lib/sqmanvers.jar";
         jar_man_vers(lp_jar);
     }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/hbase-trx/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/Makefile b/core/sqf/src/seatrans/hbase-trx/Makefile
index 63f1e51..c52821f 100644
--- a/core/sqf/src/seatrans/hbase-trx/Makefile
+++ b/core/sqf/src/seatrans/hbase-trx/Makefile
@@ -46,62 +46,62 @@ jdk_1_7_cdh54: build_chk_cdh54
 	echo "$(MAVEN) package -DskipTests"
 	echo "### For full Maven output, see file build_trx.log"
 	set -o pipefail && $(MAVEN) -f pom.xml.cdh54 package install -DskipTests | tee -a build_trx.log
-	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	mkdir -p $(TRAF_HOME)/export/lib
+	cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(TRAF_HOME)/export/lib
 	$(RM) $(VFILE)
 
 jdk_1_7_cdh55: build_chk_cdh55
 	$(REINSTATE_ORIG)
 	$(UNCOMMENT_STRING) CDH5.5
 	set -o pipefail && $(MAVEN) -f pom.xml.cdh55 package install -DskipTests | tee -a build_trx.log
-	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	mkdir -p $(TRAF_HOME)/export/lib
+	cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(TRAF_HOME)/export/lib
 	$(RM) $(VFILE)
 
 jdk_1_7_cdh57: build_chk_cdh57
 	$(REINSTATE_ORIG)
 	$(UNCOMMENT_STRING) CDH5.7
 	set -o pipefail && $(MAVEN) -f pom.xml.cdh57 package install -DskipTests | tee -a build_trx.log
-	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_CDH57_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	mkdir -p $(TRAF_HOME)/export/lib
+	cp -pf target/$(BLD_HBASE_CDH57_TRX_JARNAME) $(TRAF_HOME)/export/lib
 	$(RM) $(VFILE)
 
 jdk_1_7_mapr: build_chk_mapr
 	set -o pipefail && $(MAVEN) -f pom.xml.mapr package -DskipTests | tee -a build_trx.log
-	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_MAPR_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	mkdir -p $(TRAF_HOME)/export/lib
+	cp -pf target/$(BLD_HBASE_MAPR_TRX_JARNAME) $(TRAF_HOME)/export/lib
 	$(RM) $(VFILE)
 
 jdk_1_7_hdp: build_chk_hdp
 	$(REINSTATE_ORIG)
 	$(UNCOMMENT_STRING) HDP2.3 
 	set -o pipefail && $(MAVEN) -f pom.xml.hdp package -DskipTests | tee -a build_trx.log
-	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	mkdir -p $(TRAF_HOME)/export/lib
+	cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(TRAF_HOME)/export/lib
 	$(RM) $(VFILE)
 
 jdk_1_7_apache10: build_chk_apache10
 	$(REINSTATE_ORIG)
 	$(UNCOMMENT_STRING) APACHE1.0
 	set -o pipefail && $(MAVEN) -f pom.xml.apache10 package -DskipTests | tee build_trx.log
-	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	mkdir -p $(TRAF_HOME)/export/lib
+	cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(TRAF_HOME)/export/lib
 	$(RM) $(VFILE)
 
 jdk_1_7_apache11: build_chk_apache11
 	$(REINSTATE_ORIG)
 	$(UNCOMMENT_STRING) APACHE1.1
 	set -o pipefail && $(MAVEN) -f pom.xml.apache11 package -DskipTests | tee build_trx.log
-	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	mkdir -p $(TRAF_HOME)/export/lib
+	cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(TRAF_HOME)/export/lib
 	$(RM) $(VFILE)
 
 jdk_1_7_apache12: build_chk_apache12
 	$(REINSTATE_ORIG)
 	$(UNCOMMENT_STRING) APACHE1.2
 	set -o pipefail && $(MAVEN) -f pom.xml.apache12 package -DskipTests | tee build_trx.log
-	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_APACHE12_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	mkdir -p $(TRAF_HOME)/export/lib
+	cp -pf target/$(BLD_HBASE_APACHE12_TRX_JARNAME) $(TRAF_HOME)/export/lib
 	$(RM) $(VFILE)
 
 build_all: jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_cdh57 jdk_1_7_hdp jdk_1_7_apache10 jdk_1_7_apache11 jdk_1_7_apache12
@@ -109,52 +109,52 @@ build_all: jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_cdh57 jdk_1_7_hdp jdk_1_7_apache1
 build_chk_apache10:
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
 
 build_chk_apache11:
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
 
 build_chk_apache12:
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE12_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE12_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE12_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE12_TRX_JARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE12_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE12_TRX_JARNAME); fi
 
 build_chk_cdh54:
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
 
 build_chk_cdh55:
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
 
 build_chk_cdh57:
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH57_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH57_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH57_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH57_TRX_JARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH57_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH57_TRX_JARNAME); fi
 
 build_chk_mapr:
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_HBASE_MAPR_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_MAPR_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_MAPR_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_MAPR_TRX_JARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_MAPR_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_MAPR_TRX_JARNAME); fi
 
 build_chk_hdp:
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
 
 clean:
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME)
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME)
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
+	$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
+	$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
+	$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME)
+	$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
+	$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
+	$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME)
+	$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
+	$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
 	$(REINSTATE_ORIG)
 	-$(MAVEN) -f pom.xml.apache10 clean | grep ERROR
 	-$(MAVEN) -f pom.xml.apache11 clean | grep ERROR

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/hbase-trx/genvers
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/genvers b/core/sqf/src/seatrans/hbase-trx/genvers
index 49c9bae..ac35489 100755
--- a/core/sqf/src/seatrans/hbase-trx/genvers
+++ b/core/sqf/src/seatrans/hbase-trx/genvers
@@ -24,4 +24,4 @@
 #
 
 CV_VERS=1.0.1
-$MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS
+$TRAF_HOME/export/include/SCMBuildJava.sh $CV_VERS

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
index 9dd0cd7..12859d8 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
@@ -66,12 +66,12 @@ all:  $(PROGS) mavenbuild
 mavenbuild:
 	# create a jar manifest file with the correct version information
 	mkdir -p src/main/resources
-	$(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.1 >src/main/resources/trafodion-dtm.jar.mf
+	$(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >src/main/resources/trafodion-dtm.jar.mf
 	# run maven
 	set -o pipefail; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
 	set -o pipefail; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build_apache.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
 	set -o pipefail; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build_hdp.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'	
-	cp -pf target/trafodion-dtm-*.jar $(MY_SQROOT)/export/lib
+	cp -pf target/trafodion-dtm-*.jar $(TRAF_HOME)/export/lib
 
 $(LIBEXPDIR)/libshbasetmlib.so: $(LIBSTMOBJS)
 	$(CXX) $(DTMOBJS) $(LNK_FLGS) $(LIBTMB) -shared -o $@ $(LIBSTMOBJS)
@@ -99,7 +99,7 @@ clean:
 	$(RM) $(PROGS)
 	$(RM) *.gcda *.gcno *.gcov
 	$(RM) -f  $(OUTDIR)/*.o
-	$(RM) -rf $(MY_SQROOT)/export/lib/trafodion-dtm-*.jar
+	$(RM) -rf $(TRAF_HOME)/export/lib/trafodion-dtm-*.jar
 	-$(MAVEN) -f pom.xml clean
 
 cleanall: clean

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java b/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java
index b7c26ed..8382c19 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/TMInterface.java
@@ -62,6 +62,6 @@ public class TM_Interface {
    
    void setupLog4j() {
        //System.out.println("In setupLog4J");
-        String confFile = System.getenv("MY_SQROOT")
+        String confFile = System.getenv("TRAF_HOME")
             + "/logs/log4j.dtm.config";
         PropertyConfigurator.configure(confFile);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
index efc2709..6550926 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.apache
@@ -51,14 +51,14 @@
       <artifactId>${hbase-trx.id}</artifactId>
       <version>${env.TRAFODION_VER}</version>
       <scope>system</scope>
-      <systemPath>${env.MY_SQROOT}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
+      <systemPath>${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop.hbase.coprocessor.transactional.generated</groupId>
       <artifactId>${hbase-trx.id}</artifactId>
       <version>${env.TRAFODION_VER}</version>
       <scope>system</scope>
-      <systemPath>${env.MY_SQROOT}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
+      <systemPath>${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
index 56db70f..3b626e1 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp
@@ -51,7 +51,7 @@
       <artifactId>${hbase-trx.id}</artifactId>
       <version>${env.TRAFODION_VER}</version>
       <scope>system</scope>
-      <systemPath>${env.MY_SQROOT}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
+      <systemPath>${env.TRAF_HOME}/export/lib/${hbase-trx.id}-${env.TRAFODION_VER}.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>