You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/15 08:51:29 UTC
[07/10] incubator-trafodion git commit: convert all MY_SQROOT to
TRAF_HOME
convert all MY_SQROOT to TRAF_HOME
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0d467cad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0d467cad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0d467cad
Branch: refs/heads/master
Commit: 0d467cad933d1036ee503041fdc41e858c0d51fb
Parents: 971df7a
Author: Eason <hf...@gmail.com>
Authored: Wed Dec 7 14:05:48 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Wed Dec 7 14:05:48 2016 +0800
----------------------------------------------------------------------
RAT_README | 30 ++---
core/Makefile | 2 +-
core/bldenvchk.sh | 6 +-
core/conn/Makefile | 4 +-
core/conn/jdbcT4/Makefile | 6 +-
core/conn/jdbc_type2/Makefile | 8 +-
core/conn/jdbc_type2/build.xml | 8 +-
core/conn/jdbc_type2/samples/README | 4 +-
core/conn/odb/Makefile | 6 +-
core/conn/odbc/src/odbc/Makefile | 12 +-
core/conn/odbc/src/odbc/macros.gmk | 2 +-
core/conn/odbc/src/odbc/nsksrvr/Makefile | 6 +-
core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 6 +-
core/conn/trafci/manualtests/README | 2 +-
.../src/org/trafodion/ci/UserInterface.java | 2 +-
core/conn/trafci/utils/ciencr.sh | 8 +-
core/conn/trafci/utils/trafci | 2 +-
core/conn/trafci/utils/trafci.cmd-tmpl | 2 +-
core/conn/trafci/utils/trafci_install.sh | 8 +-
.../odbc/odbcclient/unixcli/makefile.lnx | 4 +-
.../odbc/odbcclient/unixcli/package/mklnxpkg.sh | 2 +-
.../unixcli/package/runconnect_test.sh | 2 +-
core/dbsecurity/Makefile | 12 +-
core/dbsecurity/auth/Makefile | 16 +--
core/dbsecurity/auth/src/authEvents.cpp | 4 +-
core/dbsecurity/auth/src/ldapconfigfile.cpp | 18 +--
core/dbsecurity/auth/src/sqldapconfigcheck.cpp | 2 +-
core/dbsecurity/cert/Makefile | 10 +-
core/dbsecurity/cert/src/secsrvr.cpp | 2 +-
core/dbsecurity/macros.gmk | 2 +-
core/dbsecurity/scripts/sqcertgen | 2 +-
core/dbsecurity/scripts/update_auth | 16 +--
core/mpi/Makefile | 4 +-
core/rest/Makefile | 2 +-
core/rest/bin/rest | 8 +-
core/rest/conf/rest-env.sh | 4 +-
core/rest/genvers | 2 +-
.../asciidoc/_chapters/getting_started.adoc | 2 +-
core/seamonster/src/Makefile | 4 +-
core/seamonster/src/macros.gmk | 4 +-
core/sqf/LocalSettingsTemplate.sh | 10 +-
core/sqf/Makefile | 12 +-
core/sqf/build-scripts/check_man | 6 +-
core/sqf/build-scripts/genverhdr.ksh | 2 +-
core/sqf/commonLogger/CommonLogger.cpp | 6 +-
core/sqf/commonLogger/CommonLogger.h | 2 +-
core/sqf/conf/install_features | 2 +-
core/sqf/conf/log4cxx.monitor.mon.config | 2 +-
core/sqf/conf/log4cxx.monitor.mon.snmp.config | 2 +-
core/sqf/conf/log4cxx.monitor.psd.config | 2 +-
core/sqf/conf/log4cxx.monitor.wdg.config | 2 +-
core/sqf/conf/log4cxx.monitor.wdg.snmp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.auth.config | 2 +-
core/sqf/conf/log4cxx.trafodion.lob.config | 2 +-
.../sqf/conf/log4cxx.trafodion.masterexe.config | 2 +-
core/sqf/conf/log4cxx.trafodion.sscp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.ssmp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.tm.config | 2 +-
core/sqf/conf/log4cxx.trafodion.udr.config | 2 +-
core/sqf/conf/trafodion.udr.config | 4 +-
.../sqf/export/limited-support-tools/LSO/README | 14 +--
.../export/limited-support-tools/LSO/offender | 2 +-
core/sqf/export/share/man/man1/createhooks.1 | 2 +-
core/sqf/export/share/man/man1/sqcore.1 | 4 +-
core/sqf/export/share/man/man1/sqcorefile.1 | 2 +-
core/sqf/export/share/man/man1/sqgen.1 | 38 +++---
core/sqf/export/share/man/man1/sqid.1 | 2 +-
core/sqf/export/share/man/man1/sqinfo.1 | 8 +-
core/sqf/export/share/man/man1/sqvers.1 | 8 +-
core/sqf/export/share/man/man1/update_sql.1 | 2 +-
core/sqf/gdb/create-host-tar-lib | 14 +--
core/sqf/hbase_utilities/Makefile | 6 +-
.../backup_restore_functions.sh | 16 +--
core/sqf/macros.gmk | 8 +-
core/sqf/monitor/linux/config.cxx | 4 +-
core/sqf/monitor/linux/macros.gmk | 2 +-
core/sqf/monitor/linux/monitor.cxx | 4 +-
core/sqf/monitor/linux/monlogging.cxx | 4 +-
core/sqf/monitor/linux/montest_run.virtual | 6 +-
core/sqf/monitor/linux/process.cxx | 4 +-
core/sqf/monitor/linux/process.h | 2 +-
core/sqf/monitor/linux/pstartd.cxx | 2 +-
core/sqf/monitor/linux/reqqueue.cxx | 2 +-
core/sqf/monitor/linux/shell.cxx | 10 +-
core/sqf/monitor/test/notes.txt | 2 +-
core/sqf/monitor/test/runtest | 46 ++++----
core/sqf/monitor/test/sqconfig.monitor.cluster | 2 +-
core/sqf/sqenvcom.sh | 54 ++++-----
core/sqf/sqevlog/sq_evl_libs/macros.gmk | 2 +-
core/sqf/sqid | 10 +-
core/sqf/sqinfo | 18 +--
core/sqf/sql/macros.gmk | 2 +-
core/sqf/sql/scripts/UsasRepos | 2 +-
.../sqf/sql/scripts/bats/runmonitorbats.virtual | 6 +-
core/sqf/sql/scripts/bats/runseabedbats.virtual | 8 +-
core/sqf/sql/scripts/bats/runsqlreg.virtual | 8 +-
core/sqf/sql/scripts/bats/runtmbats.virtual | 14 +--
core/sqf/sql/scripts/bats/sqconfig.tm | 4 +-
core/sqf/sql/scripts/build_apidocs.sh | 4 +-
core/sqf/sql/scripts/ckill | 4 +-
core/sqf/sql/scripts/ckillall | 4 +-
core/sqf/sql/scripts/cleanZKNodes | 2 +-
core/sqf/sql/scripts/cleanat | 2 +-
core/sqf/sql/scripts/cleanlogs | 16 +--
core/sqf/sql/scripts/cresumeall | 4 +-
core/sqf/sql/scripts/cstat | 2 +-
core/sqf/sql/scripts/csuspendall | 6 +-
core/sqf/sql/scripts/dbcheck | 12 +-
core/sqf/sql/scripts/genmon | 2 +-
core/sqf/sql/scripts/genms | 10 +-
core/sqf/sql/scripts/gensq.pl | 8 +-
core/sqf/sql/scripts/genstats.sh | 2 +-
core/sqf/sql/scripts/get_libhdfs_files | 6 +-
core/sqf/sql/scripts/ilh_cleanhb | 12 +-
core/sqf/sql/scripts/ilh_hbase_repair | 8 +-
core/sqf/sql/scripts/ilh_hbcheck | 4 +-
core/sqf/sql/scripts/ilh_traf_restart | 16 +--
core/sqf/sql/scripts/ilh_trafinit | 16 +--
core/sqf/sql/scripts/install_apache_hadoop | 48 ++++----
core/sqf/sql/scripts/install_local_drill | 16 +--
core/sqf/sql/scripts/install_local_hadoop | 22 ++--
core/sqf/sql/scripts/install_traf_components | 76 ++++++------
core/sqf/sql/scripts/krb5check | 4 +-
core/sqf/sql/scripts/krb5functions | 4 +-
core/sqf/sql/scripts/krb5service | 8 +-
core/sqf/sql/scripts/makemsg.ksh | 8 +-
core/sqf/sql/scripts/qmmstart | 2 +-
core/sqf/sql/scripts/rmscheck | 2 +-
core/sqf/sql/scripts/runbats | 24 ++--
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqcheckmon | 2 +-
core/sqf/sql/scripts/sqconfig | 6 +-
core/sqf/sql/scripts/sqconfig.sample | 6 +-
core/sqf/sql/scripts/sqcore | 14 +--
core/sqf/sql/scripts/sqcorefile | 6 +-
core/sqf/sql/scripts/sqgen | 62 +++++-----
core/sqf/sql/scripts/sqnodeipcrm | 4 +-
core/sqf/sql/scripts/sqsmdstats | 10 +-
core/sqf/sql/scripts/sqstart | 32 ++---
core/sqf/sql/scripts/sqstop | 22 ++--
core/sqf/sql/scripts/sqsystem.pm | 4 +-
core/sqf/sql/scripts/traf_authentication_config | 4 +-
core/sqf/sql/scripts/traf_authentication_setup | 36 +++---
core/sqf/sql/scripts/trafnodestatus | 10 +-
core/sqf/sql/scripts/uninstall_traf_components | 22 ++--
core/sqf/sql/scripts/update_hbase | 8 +-
core/sqf/sql/scripts/update_sql | 10 +-
core/sqf/sqvers | 20 ++--
core/sqf/src/seabed/macros.gmk | 2 +-
core/sqf/src/seabed/src/env.cpp | 2 +-
core/sqf/src/seabed/src/util.cpp | 2 +-
core/sqf/src/seabed/test/go284j | 2 +-
core/sqf/src/seabed/test/go9 | 4 +-
core/sqf/src/seabed/test/goshell205 | 2 +-
core/sqf/src/seabed/test/gostart | 4 +-
core/sqf/src/seabed/test/t9thread.rh6.supp | 56 ++++-----
core/sqf/src/seabed/test/tcheck.cpp | 2 +-
core/sqf/src/seabed/tools/sqmanvers | 2 +-
core/sqf/src/seabed/tools/sqmanvers.java | 2 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 64 +++++-----
core/sqf/src/seatrans/hbase-trx/genvers | 2 +-
core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 6 +-
.../seatrans/tm/hbasetmlib2/TMInterface.java | 2 +-
.../src/seatrans/tm/hbasetmlib2/pom.xml.apache | 4 +-
.../sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 2 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 4 +-
core/sqf/src/seatrans/tm/macros.gmk | 6 +-
core/sqf/src/tm/Makefile | 6 +-
core/sqf/src/tm/macros.gmk | 4 +-
core/sqf/src/tm/tools/run_dtmci | 4 +-
core/sqf/tools/sqdiag_core_compare | 2 +-
core/sqf/tools/sqdiag_core_mask | 2 +-
core/sqf/tools/sqtools.sh | 116 +++++++++----------
core/sql/SqlCompilerDebugger/cln.sh | 6 +-
core/sql/arkcmp/CmpErrLog.cpp | 6 +-
core/sql/bin/ex_esp_main.cpp | 2 +-
core/sql/cli/Cli.cpp | 2 +-
core/sql/cli/SessionDefaults.cpp | 2 +-
core/sql/common/ComRtUtils.cpp | 2 +-
core/sql/common/Ipc.cpp | 4 +-
core/sql/executor/ExSMTrace.cpp | 6 +-
core/sql/executor/HdfsLogger.h | 2 +-
core/sql/executor/JavaObjectInterface.cpp | 2 +-
core/sql/exp/ExpLOBaccess.cpp | 2 +-
core/sql/export/NAAbort.cpp | 2 +-
core/sql/langman/LmLangManagerJava.cpp | 2 +-
core/sql/lib_mgmt/Makefile | 4 +-
core/sql/lib_mgmt/README.rst | 2 +-
core/sql/lib_mgmt/pom.xml | 2 +-
.../java/org/trafodion/libmgmt/FileMgmt.java | 2 +-
.../lib_mgmt/src/main/resources/init_libmgmt.sh | 2 +-
core/sql/nskgmake/Makerules.linux | 26 ++---
core/sql/nskgmake/Makerules.mk | 10 +-
core/sql/nskgmake/cli/Makefile | 2 +-
core/sql/nskgmake/clitest/Makefile | 2 +-
core/sql/nskgmake/tdm_sqlexp/Makefile | 14 +--
core/sql/optimizer/BindRelExpr.cpp | 2 +-
core/sql/optimizer/RelRoutine.cpp | 4 +-
core/sql/pom.xml.apache | 2 +-
core/sql/pom.xml.hdp | 2 +-
core/sql/qms/QmmQmm.cpp | 2 +-
core/sql/qmscommon/QRLogger.h | 2 +-
core/sql/regress/newregr/mvqr/installMvqrSQ | 6 +-
core/sql/regress/newregr/mvqr/uninstallMvqrSQ | 2 +-
core/sql/regress/tools/dll-compile.ksh | 6 +-
core/sql/regress/tools/java-compile.ksh | 2 +-
core/sql/regress/tools/regrhadoop.ksh | 2 +-
core/sql/regress/tools/regrhbase.ksh | 2 +-
core/sql/regress/tools/regrhive.ksh | 2 +-
core/sql/regress/tools/runallsb | 8 +-
core/sql/regress/tools/runregr_compGeneral.ksh | 2 +-
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/regress/tools/runregr_hive.ksh | 2 +-
core/sql/regress/tools/runregr_seabase.ksh | 2 +-
core/sql/regress/tools/runregr_udr.ksh | 4 +-
core/sql/regress/tools/setupenv | 4 +-
core/sql/regress/tools/setuplnxenv | 24 ++--
core/sql/regress/udr/EXPECTED002 | 10 +-
core/sql/regress/udr/TEST002 | 10 +-
core/sql/regress/udr/TEST107 | 4 +-
core/sql/regress/udr/TEST163 | 4 +-
core/sql/regress/udr/Utils.java | 4 +-
core/sql/regress/udr/tvudf.c | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 6 +-
core/sql/sqlcomp/nadefaults.cpp | 4 +-
core/sql/sqlmsg/GetErrorMessage.cpp | 2 +-
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 4 +-
core/sql/sqludr/doxygen_tmudr.1.6.config | 2 +-
.../java/org/trafodion/sql/HBaseClient.java | 4 +-
.../main/java/org/trafodion/sql/HiveClient.java | 2 +-
.../org/trafodion/sql/TrafConfiguration.java | 2 +-
.../main/java/org/trafodion/sql/udr/UDR.java | 2 +-
.../org/trafodion/sql/udr/predef/JDBCUDR.java | 6 +-
.../org/trafodion/sql/ustat/ChgAutoList.java | 2 +-
.../java/org/trafodion/sql/ustat/UstatUtil.java | 4 +-
core/sql/udrserv/UdrCfgParser.cpp | 2 +-
core/sql/udrserv/spinfoCallback.cpp | 2 +-
core/sql/udrserv/udrload.cpp | 2 +-
core/sql/udrserv/udrserv.cpp | 2 +-
core/sql/ustat/FillAutoTbl.sh | 4 +-
core/sql/ustat/RunLogUstats.sh | 2 +-
core/sql/ustat/StopAutoStats.sh | 2 +-
core/sql/ustat/USAS.sh | 16 +--
core/sql/ustat/hs_globals.cpp | 4 +-
core/sql/ustat/stats_profile | 8 +-
dcs/Makefile | 2 +-
dcs/bin/dcs | 12 +-
dcs/bin/dcs-config.sh | 4 +-
dcs/conf/dcs-env.sh | 6 +-
dcs/genvers | 2 +-
.../main/asciidoc/_chapters/configuration.adoc | 2 +-
.../asciidoc/_chapters/getting_started.adoc | 2 +-
.../org/trafodion/dcs/server/ServerManager.java | 2 +-
.../trafodion/dcs/servermt/ServerManager.java | 14 +--
.../src/asciidoc/_chapters/activate.adoc | 4 +-
.../src/asciidoc/_chapters/enable_security.adoc | 20 ++--
.../src/asciidoc/_chapters/introduction.adoc | 4 +-
.../src/asciidoc/_chapters/prepare.adoc | 2 +-
.../src/asciidoc/_chapters/script_remove.adoc | 2 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 6 +-
docs/src/site/markdown/architecture-overview.md | 2 +-
docs/src/site/markdown/management.md | 6 +-
.../site/markdown/traf_authentication_config.md | 8 +-
install/installer/addNode_step1 | 8 +-
install/installer/addNode_step2 | 28 ++---
install/installer/bashrc_default | 6 +-
install/installer/dcs_installer | 22 ++--
install/installer/rest_installer | 18 +--
install/installer/traf_add_kerberos | 2 +-
install/installer/traf_add_ldap | 14 +--
.../installer/traf_authentication_conf_default | 4 +-
install/installer/traf_config | 30 ++---
install/installer/traf_config_check | 4 +-
install/installer/traf_config_setup | 12 +-
install/installer/traf_secure | 20 ++--
install/installer/traf_sqgen | 10 +-
install/installer/traf_start | 18 +--
install/installer/trafodion_config_default | 2 +-
install/installer/trafodion_install | 6 +-
install/installer/trafodion_uninstaller | 8 +-
install/python-installer/bashrc.template | 6 +-
install/python-installer/db_config_default | 2 +-
install/python-installer/dcs_setup.py | 14 +--
install/python-installer/prompt.json | 2 +-
.../traf_authentication_conf.template | 4 +-
install/python-installer/traf_kerberos.py | 2 +-
install/python-installer/traf_ldap.py | 6 +-
install/python-installer/traf_setup.py | 8 +-
install/python-installer/traf_sqconfig.py | 6 +-
install/python-installer/traf_user.py | 8 +-
tests/phx/README.rst | 4 +-
tests/phx/phoenix_test.py | 6 +-
tests/phx/pom.xml.template | 8 +-
wms/conf/wms-env.sh | 6 +-
295 files changed, 1150 insertions(+), 1150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/RAT_README
----------------------------------------------------------------------
diff --git a/RAT_README b/RAT_README
index 1de62f4..f1b9d8d 100644
--- a/RAT_README
+++ b/RAT_README
@@ -29,32 +29,32 @@ FILE : what the file is used for
.rat-excludes : file used by RAT to exclude files
-> rat does not allow this file to contain comments
-$MY_SQROOT/build-scripts/package.exclude*
+$TRAF_HOME/build-scripts/package.exclude*
: list of files to exclude from packaging
-> make does not handle comments
-$MY_SQROOT/export/limited-support-tools/eclipse.*project*
+$TRAF_HOME/export/limited-support-tools/eclipse.*project*
: Eclipse related project file
-> Eclipse does not handle comments
-$MY_SQROOT/src/tm/*.pb.cc
-$MY_SQROOT/src/seatrans/hbase-trx/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/*
+$TRAF_HOME/src/tm/*.pb.cc
+$TRAF_HOME/src/seatrans/hbase-trx/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/*
: Generated from .proto files that do contain Apache License statement, using google protobuf compiler.
-> generated files do not contain Apache license information
-$MY_SQROOT/src/seatrans/hbase-trx/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp
+$TRAF_HOME/src/seatrans/hbase-trx/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp
: Autogenerated skeleton file copied from hbase used by our coprocessors
-> generated files do not contain Apache license information
-$MY_SQROOT/src/seatrans/hbase-trx/src/main/python/thrift1/gen-py/hbase/__init__.py
+$TRAF_HOME/src/seatrans/hbase-trx/src/main/python/thrift1/gen-py/hbase/__init__.py
: Autogenerated python file copied from hbase
-> generated files do not contain Apache license information
-$MY_SQROOT/../sql/sqludr/doxygen_*.1.6.config
+$TRAF_HOME/../sql/sqludr/doxygen_*.1.6.config
: Configuration file used to generate UDR documentation
-> configuration file do not handle comments
-$MY_SQROOT/../sql/bin/SqlciErrors.txt
+$TRAF_HOME/../sql/bin/SqlciErrors.txt
: file containing all the messages used by Apache Trafodion
-> this file does not handle comments
@@ -69,13 +69,13 @@ dcs/conf/master
The following files are testware, they need to be in specified formats
-> do not support support comment headers
-$MY_SQROOT/../sql/regress/*/EXPECTED*
-$MY_SQROOT/../sql/regress/*/COMPARE*
-$MY_SQROOT/../sql/regress/*/DIFF*
-$MY_SQROOT/../sql/regress/executor/lob_input*.txt
-$MY_SQROOT/../sql/regress/udr/romeo*.txt
+$TRAF_HOME/../sql/regress/*/EXPECTED*
+$TRAF_HOME/../sql/regress/*/COMPARE*
+$TRAF_HOME/../sql/regress/*/DIFF*
+$TRAF_HOME/../sql/regress/executor/lob_input*.txt
+$TRAF_HOME/../sql/regress/udr/romeo*.txt
dcs/src/test/pytests/test-requirements.txt
-$MY_SQROOT/monitor/linux/montest_readme.txt
+$TRAF_HOME/monitor/linux/montest_readme.txt
-------------------------------------------------------------------------------
@@ -99,7 +99,7 @@ copyrights which are covered by MIT
-> cannot overwrite copyright information, license has been added to
LICENSE.txt
- $MY_SQROOT/../sql/qmscommon/expat/*
+ $TRAF_HOME/../sql/qmscommon/expat/*
The following files are open source from The Regents of the University of
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 5cac37d..1c4a3f4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -260,7 +260,7 @@ eclipseclean:
$(RM) .cproject .project
trafinstall:
- cd $(MY_SQROOT)/sql/scripts && install_traf_components
+ cd $(TRAF_HOME)/sql/scripts && install_traf_components
lib_mgmt:
cd sql/lib_mgmt && $(MAKE) all
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/bldenvchk.sh
----------------------------------------------------------------------
diff --git a/core/bldenvchk.sh b/core/bldenvchk.sh
index fac887a..c24d922 100755
--- a/core/bldenvchk.sh
+++ b/core/bldenvchk.sh
@@ -32,9 +32,9 @@ if [[ "$SQ_VERBOSE" == "1" ]]; then
echo CUR_DIR=$CUR_DIR
fi
-if [[ "$MY_SQROOT" != "$CUR_DIR/sqf" ]]; then
- echo "*** Error: MY_SQROOT is set to: $MY_SQROOT"
- echo " MY_SQROOT should be: $CUR_DIR/sqf"
+if [[ "$TRAF_HOME" != "$CUR_DIR/sqf" ]]; then
+ echo "*** Error: TRAF_HOME is set to: $TRAF_HOME"
+ echo " TRAF_HOME should be: $CUR_DIR/sqf"
echo " Be sure to source in sqf/sqenv.sh"
RETVAL=1
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index a0a42a6..5197837 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -56,6 +56,6 @@ clients/DISCLAIMER: ../../DISCLAIMER
cp -f $? $@
clean:
- $(RM) -rf $(MY_SQROOT)/../conn/clients
- $(RM) -f $(MY_SQROOT)/../conn/*.mf
+ $(RM) -rf $(TRAF_HOME)/../conn/clients
+ $(RM) -f $(TRAF_HOME)/../conn/*.mf
$(RM) -f $(CLIENT_TAR)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/jdbcT4/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index 908a14f..50dc7af 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -28,14 +28,14 @@ all: build_all
build_all: LICENSE NOTICE
echo "$(MAVEN) package -DskipTests"
set -o pipefail && $(MAVEN) package -DskipTests | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
- cp target/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib
+ cp target/jdbcT4-${TRAFODION_VER}.jar ${TRAF_HOME}/export/lib
mkdir -p ../clients
mv target/jdbcT4-${TRAFODION_VER}.zip ../clients
- ln -sf ${MY_SQROOT}/export/lib/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib/jdbcT4.jar
+ ln -sf ${TRAF_HOME}/export/lib/jdbcT4-${TRAFODION_VER}.jar ${TRAF_HOME}/export/lib/jdbcT4.jar
clean:
-$(MAVEN) clean | grep ERROR
- $(RM) build_jdbct4.log ${MY_SQROOT}/export/lib/jdbcT4*.jar
+ $(RM) build_jdbct4.log ${TRAF_HOME}/export/lib/jdbcT4*.jar
LICENSE: ../../../licenses/LICENSE-clients
cp -f $? $@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/jdbc_type2/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/Makefile b/core/conn/jdbc_type2/Makefile
index ab13539..165ea24 100644
--- a/core/conn/jdbc_type2/Makefile
+++ b/core/conn/jdbc_type2/Makefile
@@ -22,7 +22,7 @@
# Makefile for building Type 2 driver native code on Linux
#
-include $(MY_SQROOT)/macros.gmk # top level
+include $(TRAF_HOME)/macros.gmk # top level
include ./macros.gmk
#
@@ -59,9 +59,9 @@ T2_OBJS = $(OUTDIR)/CommonDiags.o \
$(OUTDIR)/type2version.o
OBJS = $(COMMON_OBJS) $(T2_OBJS)
-MXODIR = $(MY_SQROOT)/../conn/odbc/src/odbc
+MXODIR = $(TRAF_HOME)/../conn/odbc/src/odbc
-INCLUDES = -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Inative -I$(MXODIR)/Krypton/generated_incs -I$(MXODIR)/dependencies/include -I$(MXODIR)/dependencies/linux -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/inc/rosetta -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/../sql/common -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(MY_SQROOT)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES = -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Inative -I$(MXODIR)/Krypton/generated_incs -I$(MXODIR)/dependencies/include -I$(MXODIR)/dependencies/linux -I$(TRAF_HOME)/export/include/sql -I$(TRAF_HOME)/inc/tmf_tipapi -I$(TRAF_HOME)/inc -I$(TRAF_HOME)/export/include -I$(TRAF_HOME)/inc/rosetta -I$(TRAF_HOME)/../sql/cli -I$(TRAF_HOME)/../sql/common -I$(TRAF_HOME)/../dbsecurity/cert/inc -I$(TRAF_HOME)/../dbsecurity/auth/inc -I$(TRAF_HOME)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
COMMON_DEFINES = -DTRAFODION_JDBCT2_VER_MAJOR=$(TRAFODION_VER_MAJOR) -DTRAFODION_JDBCT2_VER_MINOR=$(TRAFODION_VER_MINOR) -D_LP64 -DNA_LINUX -DSIZEOF_LONG_INT=4 -DSQ_GUARDIAN_CALL -DDISABLE_NOWAIT -D_FASTPATH -DTODO -D_SQ64 -w
DEFINES = $(COMMON_DEFINES)
@@ -75,7 +75,7 @@ all: $(LIBEXPDIR)/libjdbcT2.so
$(LIBEXPDIR)/libjdbcT2.so: $(OBJS)
$(CXX) -shared $(GCCMODE) -o $@ $(DBG_FLGS) -L$(LIBEXPDIR) -lsbfs -lsbms -levlsq -lwin -ltdm_sqlcli -larkcmp_dll -larkcmplib -lcommon -lsort -lexecutor -lcomexe -lcli $(OBJS)
-$(OUTDIR)/type2version.o: $(MY_SQROOT)/export/include/SCMBuildStr.h
+$(OUTDIR)/type2version.o: $(TRAF_HOME)/export/include/SCMBuildStr.h
clean:
$(RM) $(LIBEXPDIR)/libjdbcT2.so
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/jdbc_type2/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/build.xml b/core/conn/jdbc_type2/build.xml
index cc72734..a55c1a7 100644
--- a/core/conn/jdbc_type2/build.xml
+++ b/core/conn/jdbc_type2/build.xml
@@ -29,7 +29,7 @@
</exec>
<property file="buildId"/>
<property name="vproc.str" value="Traf_JDBC_Type2_Build_${bldId}"/>
- <property name="my_sqroot" value="../../sqf"/>
+ <property name="traf_home" value="../../sqf"/>
<property name="src.lic" value="${base.dir}/../../../licenses"/>
<property name="src.notice" value="${base.dir}/../../.."/>
@@ -52,7 +52,7 @@
<target name="dist" depends="native">
<mkdir dir="dist"/>
- <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
+ <property file="${traf_home}/export/include/SCMBuildMan.mf"/>
<jar destfile="dist/jdbcT2.jar" compress="true">
<include name="LICENSE" />
<include name="NOTICE" />
@@ -68,7 +68,7 @@
<attribute name="Implementation-Version-6" value="${Implementation-Version-6}"/>
</manifest>
</jar>
- <copy todir="${my_sqroot}/export/lib" overwrite="yes" file="dist/jdbcT2.jar"/>
+ <copy todir="${traf_home}/export/lib" overwrite="yes" file="dist/jdbcT2.jar"/>
</target>
<target name="clean">
@@ -81,7 +81,7 @@
<exec dir="." executable="/usr/bin/make">
<arg line="clean"/>
</exec>
- <delete file="${my_sqroot}/export/lib/jdbcT2.jar"/>
+ <delete file="${traf_home}/export/lib/jdbcT2.jar"/>
<delete file="buildId"/>
</target>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/jdbc_type2/samples/README
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/samples/README b/core/conn/jdbc_type2/samples/README
index b13bfae..f9cc3b1 100644
--- a/core/conn/jdbc_type2/samples/README
+++ b/core/conn/jdbc_type2/samples/README
@@ -45,8 +45,8 @@ To compile this java program, issue the following command:
Then, run this Java program using the following command:
Set your CLASSPATH and LD_PRELOAD path
- export CLASSPATH=$MY_SQROOT/export/lib/jdbcT2.jar:.:$CLASSPATH
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib64d/libseabasesig.so
+ export CLASSPATH=$TRAF_HOME/export/lib/jdbcT2.jar:.:$CLASSPATH
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib64d/libseabasesig.so
java -Dt2jdbc.schema=<defaultCatalog>.<defaultSchema> T2Sample
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odb/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odb/Makefile b/core/conn/odb/Makefile
index 62016e1..09936ce 100644
--- a/core/conn/odb/Makefile
+++ b/core/conn/odb/Makefile
@@ -23,7 +23,7 @@
.PHONY: clean all
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
#--------------------------------------------------------------------------
# Standard Linux flags
@@ -46,7 +46,7 @@ INCPATH_64luo = -I/use/include \
-I$(HADOOP_INC_DIR) \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -I$(MY_SQROOT)/export/include
+ -I$(TRAF_HOME)/export/include
LIBS_64luo = -lodbc -lodbcinst -lz -ldl
EXEC_64luo = odb64luo
@@ -70,7 +70,7 @@ odb64luo: odb64luo.o mreadline.o memcpy_wrapper.o versodb.o
-o $(EXEC_64luo) bin/memcpy_wrapper.o bin/odb64luo.o bin/mreadline.o bin/versodb.o \
-D ODBBLD=$(ODBBLD_64luo) $(LIBPATH_64luo) $(INCPATH_64luo) $(LIBS_64luo) -o bin/odb64luo
tar -czf ../clients/odb64_linux.tar.gz bin/odb64luo README
- ln -sf $(MY_SQROOT)/../conn/odb/bin/odb64luo $(MY_SQROOT)/export/bin$(SQ_MBTYPE)/odb64luo
+ ln -sf $(TRAF_HOME)/../conn/odb/bin/odb64luo $(TRAF_HOME)/export/bin$(SQ_MBTYPE)/odb64luo
odb64luo.o: odb.c
mkdir -p bin
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odbc/src/odbc/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/Makefile b/core/conn/odbc/src/odbc/Makefile
index 0198085..51f7b2b 100644
--- a/core/conn/odbc/src/odbc/Makefile
+++ b/core/conn/odbc/src/odbc/Makefile
@@ -67,16 +67,16 @@ cleanall: cleanallndcs cleanlnx_drvr
# Linux ODBC Driver targets
.PHONY: bldlnx_drvr
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
bldlnx_drvr:
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx linux64_$(SQ_BUILD_TYPE)
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(MY_SQROOT)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -Pf relfiles/linux64/lib* $(LIBEXPDIR);cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(MY_SQROOT)/samples
+ cd $(TRAF_HOME)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx linux64_$(SQ_BUILD_TYPE)
+ cd $(TRAF_HOME)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(TRAF_HOME)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -Pf relfiles/linux64/lib* $(LIBEXPDIR);cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(TRAF_HOME)/samples
cd $(LIBEXPDIR);ln -sf libicudata.so.44 libicudata.so;ln -sf libicuuc.so.44 libicuuc.so;ln -sf libtrafodbc_l64.so libtrafodbc64.so;ln -sf libtrafodbc_l64_drvr.so libtrafodbc_drvr64.so
# Linux ODBC driver clean targets
.PHONY: cleanlnx_drvr
cleanlnx_drvr:
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx clean;
+ cd $(TRAF_HOME)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx clean;
/bin/rm -f $(LIBEXPDIR)/libtrafodbc* $(LIBEXPDIR)/libicu*
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz relfiles
- cd $(MY_SQROOT)/samples;rm -rf connect_test* runconnect_test.sh TRAFDSN
+ cd $(TRAF_HOME)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz relfiles
+ cd $(TRAF_HOME)/samples;rm -rf connect_test* runconnect_test.sh TRAFDSN
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odbc/src/odbc/macros.gmk
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/macros.gmk b/core/conn/odbc/src/odbc/macros.gmk
index 8497a89..5a323e6 100644
--- a/core/conn/odbc/src/odbc/macros.gmk
+++ b/core/conn/odbc/src/odbc/macros.gmk
@@ -155,6 +155,6 @@ $(OUTDIR)/%.o: ../../../Common/%.cpp
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
# Common logger
-$(OUTDIR)/%.o: $(MY_SQROOT)/commonLogger/%.cpp
+$(OUTDIR)/%.o: $(TRAF_HOME)/commonLogger/%.cpp
@if [ -d "$(OUTDIR)" ]; then x=1; else mkdir -p "$(OUTDIR)"; fi
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odbc/src/odbc/nsksrvr/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/Makefile b/core/conn/odbc/src/odbc/nsksrvr/Makefile
index c7894e1..be4bf5b 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvr/Makefile
@@ -22,7 +22,7 @@
# Makefile for building ndcs sql server on Linux
#
-include $(MY_SQROOT)/macros.gmk # top level
+include $(TRAF_HOME)/macros.gmk # top level
include ../macros.gmk # odbc level
#
@@ -103,7 +103,7 @@ ODBC_OBJS = $(OUTDIR)/odbcas_drvr.o \
OBJS = $(COMMON_OBJS) $(COMPRESS_OBJS) $(DBT_OBJS) $(ODBC_OBJS) $(WMS_OBJS)
-INCLUDES = -I. -I../Common -I../Common/linux -I../EventMsgs -I../SrvrMsg -I../nsksrvrcore -I./Interface -I./Interface/linux -I../dependencies/include -I../dependencies/linux -I../dependencies/liblzf -I../Krypton/generated_incs -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/inc/rosetta -I ../OssCfgCl/src -I../CmdCfgDll -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(ZOOKEEPER_DIR)/include -I$(MY_SQROOT)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
+INCLUDES = -I. -I../Common -I../Common/linux -I../EventMsgs -I../SrvrMsg -I../nsksrvrcore -I./Interface -I./Interface/linux -I../dependencies/include -I../dependencies/linux -I../dependencies/liblzf -I../Krypton/generated_incs -I$(TRAF_HOME)/export/include/sql -I$(TRAF_HOME)/inc/tmf_tipapi -I$(TRAF_HOME)/inc -I$(TRAF_HOME)/export/include -I$(TRAF_HOME)/inc/rosetta -I ../OssCfgCl/src -I../CmdCfgDll -I$(TRAF_HOME)/../sql/cli -I$(TRAF_HOME)/../dbsecurity/cert/inc -I$(TRAF_HOME)/../dbsecurity/auth/inc -I$(ZOOKEEPER_DIR)/include -I$(TRAF_HOME)/commonLogger -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/lib4cxx
COMMON_DEFINES = -DNA_LINUX -DSIZEOF_LONG_INT=4 -DSQ_GUARDIAN_CALL -DUSE_NEW_PHANDLE -DTIMER_FIXED -w -DNSK_ODBC_SRVR -D__TIME_LOGGER -DTHREADED
@@ -136,7 +136,7 @@ GCCMODE += -Xlinker --copy-dt-needed-entries
$(BINEXPDIR)/mxosrvr: $(OBJS) $(LIBEXPDIR)/libzookeeper_mt.so
$(CXX) $(GCCMODE) -o $@ $(DBG_FLGS) -L$(LIBEXPDIR) -D_SQ64 -L$(LOC_JSIG) $(EARLY_LIBS) $(COMMON_LIBS) $(DBT_LIBS) -lzookeeper_mt $(HADOOP_LIBS) $(OBJS) -lz
-$(OUTDIR)/ndcsversion.o: $(MY_SQROOT)/export/include/SCMBuildStr.h
+$(OUTDIR)/ndcsversion.o: $(TRAF_HOME)/export/include/SCMBuildStr.h
# copy in lib & any associate versions & links
$(LIBEXPDIR)/libzookeeper_mt.so: $(ZOOKEEPER_DIR)/lib/libzookeeper_mt.so
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
index 25a4843..070aced 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
@@ -21,7 +21,7 @@
# Makefile for building ndcs shared library on Linux
#
-include $(MY_SQROOT)/macros.gmk # top level
+include $(TRAF_HOME)/macros.gmk # top level
include ../macros.gmk # odbc level
#
@@ -64,7 +64,7 @@ OBJS = $(OUTDIR)/CommonDiags.o \
$(OUTDIR)/srvrothers.o \
$(OUTDIR)/libmxocore_version.o
-INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux -I../Krypton/generated_incs -I$(MY_SQROOT)/export/include/sql -I$(MY_SQROOT)/inc/tmf_tipapi -I$(MY_SQROOT)/inc -I$(MY_SQROOT)/export/include -I$(MY_SQROOT)/sql/nq_w/common -I../OssCfgCl/src -I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(MY_SQROOT)/../sql/cli -I$(MY_SQROOT)/commonLogger -I$(MY_SQROOT)/../dbsecurity/cert/inc -I$(MY_SQROOT)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(MY_SQROOT)/../mpi/src/include/intern
+INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux -I../Krypton/generated_incs -I$(TRAF_HOME)/export/include/sql -I$(TRAF_HOME)/inc/tmf_tipapi -I$(TRAF_HOME)/inc -I$(TRAF_HOME)/export/include -I$(TRAF_HOME)/sql/nq_w/common -I../OssCfgCl/src -I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(TRAF_HOME)/../sql/cli -I$(TRAF_HOME)/commonLogger -I$(TRAF_HOME)/../dbsecurity/cert/inc -I$(TRAF_HOME)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(TRAF_HOME)/../mpi/src/include/intern
DEFINES = -DNA_LINUX -DSIZEOF_LONG_INT=4 -DUSE_NEW_PHANDLE -DSQ_GUARDIAN_CALL -D_M_DG -DINC_QPID_EVENT -w
@@ -76,7 +76,7 @@ libmxocore.so: $(OBJS)
$(CXX) -shared $(GCCMODE) -o $@ $(DBG_FLGS) -L$(LIBEXPDIR) -levlsq -lsqauth -lsqcert $(OBJS)
cp -up $@ $(LIBEXPDIR)
-$(OUTDIR)/libmxocore_version.o: $(MY_SQROOT)/export/include/SCMBuildStr.h
+$(OUTDIR)/libmxocore_version.o: $(TRAF_HOME)/export/include/SCMBuildStr.h
clean:
$(RM) libmxocore.so $(LIBEXPDIR)/libmxocore.so
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/manualtests/README
----------------------------------------------------------------------
diff --git a/core/conn/trafci/manualtests/README b/core/conn/trafci/manualtests/README
index 35ed5d4..96ca357 100644
--- a/core/conn/trafci/manualtests/README
+++ b/core/conn/trafci/manualtests/README
@@ -39,7 +39,7 @@ statcheck.sql - TRAFODION-1765 reported that if statistics are on for a
To check for TRAFODION-1709 do the following while running
this test:
- cd $MY_SQROOT/export/limited-support-tools/LSO
+ cd $TRAF_HOME/export/limited-support-tools/LSO
./offender -s active -t 300
For direct execute queries the EXECUTE_STATE should be
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/UserInterface.java b/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
index ac22141..0638b79 100644
--- a/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
+++ b/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
@@ -53,7 +53,7 @@ public class UserInterface {
myArgs = args;
int exitCode = 0;
boolean doTrace = Boolean.getBoolean(SessionDefaults.PROP_TRACE);
- String mySQRoot = System.getenv("MY_SQROOT");
+ String mySQRoot = System.getenv("TRAF_HOME");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/utils/ciencr.sh
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/ciencr.sh b/core/conn/trafci/utils/ciencr.sh
index fc5bde4..18ccbfb 100644
--- a/core/conn/trafci/utils/ciencr.sh
+++ b/core/conn/trafci/utils/ciencr.sh
@@ -30,11 +30,11 @@
CUR=.
CURR_DIR=`pwd`
-if [ ${MY_SQROOT} ]; then
- #echo "INFO: TRAFCIHOME is set to ${MY_SQROOT}/trafci"
- export TRAFCIHOME=${MY_SQROOT}/trafci
+if [ ${TRAF_HOME} ]; then
+ #echo "INFO: TRAFCIHOME is set to ${TRAF_HOME}/trafci"
+ export TRAFCIHOME=${TRAF_HOME}/trafci
else
- echo "ERROR: \$MY_SQROOT is not set. Please run sqenv.sh first."
+ echo "ERROR: \$TRAF_HOME is not set. Please run sqenv.sh first."
exit 3
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/utils/trafci
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci b/core/conn/trafci/utils/trafci
index 8ba5152..d820a8d 100755
--- a/core/conn/trafci/utils/trafci
+++ b/core/conn/trafci/utils/trafci
@@ -32,4 +32,4 @@ HNAME=localhost:23400
UNAME=zz
PWORD=zz
-$MY_SQROOT/trafci/bin/trafci.sh -h $HNAME -u $UNAME -p $PWORD
+$TRAF_HOME/trafci/bin/trafci.sh -h $HNAME -u $UNAME -p $PWORD
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/utils/trafci.cmd-tmpl
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci.cmd-tmpl b/core/conn/trafci/utils/trafci.cmd-tmpl
index aa195a6..167fb54 100644
--- a/core/conn/trafci/utils/trafci.cmd-tmpl
+++ b/core/conn/trafci/utils/trafci.cmd-tmpl
@@ -21,7 +21,7 @@ REM
REM @@@ END COPYRIGHT @@@
CLS
-set MY_SQROOT=
+set TRAF_HOME=
set CMD_LINE_ARGS=
set TRAFODION_VER_PROD=@prodver@
set PRODUCT_COPYRIGHT_HEADER=@copyrighthdr@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/trafci/utils/trafci_install.sh
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci_install.sh b/core/conn/trafci/utils/trafci_install.sh
index 76fc152..3286205 100644
--- a/core/conn/trafci/utils/trafci_install.sh
+++ b/core/conn/trafci/utils/trafci_install.sh
@@ -31,18 +31,18 @@ JAVAE=$JAVA_HOME/bin/java
JAR=$JAVA_HOME/bin/jar
PERL=perl
PYTHON=python
-INSTALL_ROOT=$MY_SQROOT/trafci
+INSTALL_ROOT=$TRAF_HOME/trafci
INSTALL_LIBDIR=$INSTALL_ROOT/lib
INSTALL_SAMPLESDIR=$INSTALL_ROOT/samples
INSTALL_BINDIR=$INSTALL_ROOT/bin
-EXPORTLIBDIR=$MY_SQROOT/export/lib
+EXPORTLIBDIR=$TRAF_HOME/export/lib
CP=/bin/cp
TEMPSRC=../temp
-sed 's/\#\#TRAFCI_CLASSPATH\#\#/\${MY_SQROOT}\/export\/lib\/jdbcT4-${TRAFODION_VER}.jar:\${MY_SQROOT}\/trafci\/lib\/trafci.jar/g' trafci.sh > lnxplatform.sh
+sed 's/\#\#TRAFCI_CLASSPATH\#\#/\${TRAF_HOME}\/export\/lib\/jdbcT4-${TRAFODION_VER}.jar:\${TRAF_HOME}\/trafci\/lib\/trafci.jar/g' trafci.sh > lnxplatform.sh
mv -f lnxplatform.sh $TEMPSRC/trafci.sh
-echo "Creating trafci install folder in $MY_SQROOT "
+echo "Creating trafci install folder in $TRAF_HOME "
if [ ! -d "$INSTALL_LIBDIR" ]; then mkdir -p -m 775 $INSTALL_LIBDIR; fi
echo "Copying library files to trafci install folder "
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx b/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
index 837e23e..9b592e5 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
@@ -20,7 +20,7 @@
# @@@ END COPYRIGHT @@@
# INCLUDES
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
sinclude depend.mk
ODBCVER := $(shell ./bldODBCVer.sh)
@@ -53,7 +53,7 @@ OBJ = .o
LINK = $(CC)
ODBC_SO_FILE = libtrafodbc
-INCLUDE = -I./cli/ -I./Interface -I../../dependencies/windows/ -I../../dependencies/security/include -I./sql/ -I../../../../../sql/cli -I../../../../../sql/common -I./inc -I../../Krypton/ -I./common/ -I./TCPIPV4/ -I./trace/ -I./platform -I./security_dll/common -I./security_dll/header -I $(MY_SQROOT)/export/include
+INCLUDE = -I./cli/ -I./Interface -I../../dependencies/windows/ -I../../dependencies/security/include -I./sql/ -I../../../../../sql/cli -I../../../../../sql/common -I./inc -I../../Krypton/ -I./common/ -I./TCPIPV4/ -I./trace/ -I./platform -I./security_dll/common -I./security_dll/header -I $(TRAF_HOME)/export/include
DMOBJS = dmadmin.o dmcpool.o dmfunctions.o dminstall.o dmmapping.o drvrmanager.o version.o cdatasource.o
#TROBJS = dotrace.o gettrace.o headers.o init.o traceext.o
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
index c790a64..4a83bda 100755
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
@@ -118,7 +118,7 @@ then
((err += $?))
cp ../../runconnect_test.sh runconnect_test.sh
((err += $?))
- cp $MY_SQROOT/../../licenses/Apache license.txt
+ cp $TRAF_HOME/../../licenses/Apache license.txt
((err += $?))
cd ..
# do the tar
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
index 0d6f27c..a4488c3 100755
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/runconnect_test.sh
@@ -20,7 +20,7 @@
#
# @@@ END COPYRIGHT @@@
-g++ -g connect_test.cpp -L${MY_SQROOT}/export/lib64 -I/usr/include/odbc -ltrafodbc64 -o connect_test
+g++ -g connect_test.cpp -L${TRAF_HOME}/export/lib64 -I/usr/include/odbc -ltrafodbc64 -o connect_test
./connect_test -d Default_DataSource -u ss -p ss
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/Makefile
----------------------------------------------------------------------
diff --git a/core/dbsecurity/Makefile b/core/dbsecurity/Makefile
index 0733db8..4e0f6a3 100644
--- a/core/dbsecurity/Makefile
+++ b/core/dbsecurity/Makefile
@@ -23,7 +23,7 @@
# Description: Makefile for building security library
#
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
include ./macros.gmk
RM = /bin/rm
@@ -36,7 +36,7 @@ all: verhdr auth cert dist
.PHONY: verhdr
verhdr:
- cd $(MY_SQROOT); $(MAKE) genverhdr;
+ cd $(TRAF_HOME); $(MAKE) genverhdr;
.PHONY: auth
auth: verhdr
@@ -48,14 +48,14 @@ cert: verhdr auth
.PHONY: dist
dist:
- $(CP) -p scripts/sqcertgen $(MY_SQROOT)/sql/scripts
- $(CP) -p scripts/update_auth $(MY_SQROOT)/sql/scripts
+ $(CP) -p scripts/sqcertgen $(TRAF_HOME)/sql/scripts
+ $(CP) -p scripts/update_auth $(TRAF_HOME)/sql/scripts
.PHONY: clean
clean: cleanauth cleancert
- $(RM) -f $(MY_SQROOT)/sql/scripts/sqcertgen
- $(RM) -f $(MY_SQROOT)/sql/scripts/update_auth
+ $(RM) -f $(TRAF_HOME)/sql/scripts/sqcertgen
+ $(RM) -f $(TRAF_HOME)/sql/scripts/update_auth
.PHONY: cleanall
cleanall: cleanallauth cleanallcert
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/auth/Makefile
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/Makefile b/core/dbsecurity/auth/Makefile
index 05f26ba..cc0d13c 100644
--- a/core/dbsecurity/auth/Makefile
+++ b/core/dbsecurity/auth/Makefile
@@ -23,7 +23,7 @@
# Description: Makefile for building authentication library
#
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
include ../macros.gmk
#OUTDIR = .
@@ -61,13 +61,13 @@ OBJS3 = \
INCLUDES = -I. -I./inc -I ../shared/inc \
- -I $(MY_SQROOT)/../sql/cli \
- -I $(MY_SQROOT)/../sql/common \
- -I $(MY_SQROOT)/../sql/executor \
- -I $(MY_SQROOT)/../sql/export \
- -I $(MY_SQROOT)/../sql/porting_layer \
- -I $(MY_SQROOT)/export/include \
- -I $(MY_SQROOT)/commonLogger \
+ -I $(TRAF_HOME)/../sql/cli \
+ -I $(TRAF_HOME)/../sql/common \
+ -I $(TRAF_HOME)/../sql/executor \
+ -I $(TRAF_HOME)/../sql/export \
+ -I $(TRAF_HOME)/../sql/porting_layer \
+ -I $(TRAF_HOME)/export/include \
+ -I $(TRAF_HOME)/commonLogger \
-I $(LOG4CXX_INC_DIR) \
-I ../../sql/common
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/auth/src/authEvents.cpp
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/src/authEvents.cpp b/core/dbsecurity/auth/src/authEvents.cpp
index 24cbcd1..361a148 100644
--- a/core/dbsecurity/auth/src/authEvents.cpp
+++ b/core/dbsecurity/auth/src/authEvents.cpp
@@ -37,7 +37,7 @@ static std::string AUTH_COMPONENT = "DBSECURITY";
// This function inserts an AuthEvent into the current list of authEvents
//
// DB_SECUITY_EVENTID - is the event ID to insert
-// see: $MY_SQROOT/log4cxx.trafodion.auth.config/evl_sqlog_eventnum.h
+// see: $TRAF_HOME/log4cxx.trafodion.auth.config/evl_sqlog_eventnum.h
// eventText - text to insert
// severity - severity of the event
// ****************************************************************************
@@ -56,7 +56,7 @@ void insertAuthEvent(
// ****************************************************************************
// function authInitEventLog()
//
-// This function create a new log in $MY_SQROOT/logs directory with the
+// This function create a new log in $TRAF_HOME/logs directory with the
// following name dbsecurity_<host>_<pid>.log
//
// It is called for standalone executables (e.g. ldapcheck) to log issues
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/auth/src/ldapconfigfile.cpp
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/src/ldapconfigfile.cpp b/core/dbsecurity/auth/src/ldapconfigfile.cpp
index c895652..e4e0541 100755
--- a/core/dbsecurity/auth/src/ldapconfigfile.cpp
+++ b/core/dbsecurity/auth/src/ldapconfigfile.cpp
@@ -512,8 +512,8 @@ static Check_Status checkRequiredAttributes(LDAPFileContents & config)
// * no other env variables are used if this is present *
// * TRAFAUTH_CONFIGDIR -- If present, directory in which file will be found. *
// * overrides any other defaults from below *
-// * MY_SQROOT -- Prefix for standard location: *
-// * $MY_SQROOT/etc/.traf_authentication_config *
+// * TRAF_HOME -- Prefix for standard location: *
+// * $TRAF_HOME/etc/.traf_authentication_config *
// * *
// * Our algorithm for picking the name/location for the config file is: *
// * IF AUTHLDAP_CONFIGFILE is set to a non-empty string *
@@ -523,7 +523,7 @@ static Check_Status checkRequiredAttributes(LDAPFileContents & config)
// * the contents are used as the dir and .traf_authentication_config *
// * is the name of the file in that dir *
// * ELSE *
-// * use MY_SQROOT/etc/.traf_authentication_config *
+// * use TRAF_HOME/etc/.traf_authentication_config *
// * *
// *****************************************************************************
// * *
@@ -581,8 +581,8 @@ char *configFile = getenv("TRAFAUTH_CONFIGFILE");
}
// If we get here the full name or the explicit directory were
-// not specified. Append the name to the value of MY_SQROOT.
-char *sqRoot = getenv("MY_SQROOT"); //ACH changing for Trafodion?
+// not specified. Append the name to the value of TRAF_HOME.
+char *sqRoot = getenv("TRAF_HOME"); //ACH changing for Trafodion?
if (sqRoot == NULL || strlen(sqRoot) == 0)
return configFilename;
@@ -1534,9 +1534,9 @@ char *valuePtr = NULL;
}
// Name is not fully qualified. See if specified filename can be found at
-// $MY_SQROOT/cacerts.
+// $TRAF_HOME/cacerts.
-char *sqRoot = getenv("MY_SQROOT");
+char *sqRoot = getenv("TRAF_HOME");
if (sqRoot == NULL)
return false;
@@ -1559,11 +1559,11 @@ char *certFilename = new char[bufSize];
TLSCACertFilename = certFilename;
delete certFilename;
-// If the filename exists in $MY_SQROOT/cacerts directory, use it.
+// If the filename exists in $TRAF_HOME/cacerts directory, use it.
if ((stat(TLSCACertFilename.c_str(),&sts)) == 0)
return true;
-// Certificate was not in $MY_SQROOT/cacerts directory. Check $CACERTS_DIR.
+// Certificate was not in $TRAF_HOME/cacerts directory. Check $CACERTS_DIR.
char *CACertsDir = getenv("CACERTS_DIR");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/auth/src/sqldapconfigcheck.cpp
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/src/sqldapconfigcheck.cpp b/core/dbsecurity/auth/src/sqldapconfigcheck.cpp
index 72aa558..d9eb1fb 100755
--- a/core/dbsecurity/auth/src/sqldapconfigcheck.cpp
+++ b/core/dbsecurity/auth/src/sqldapconfigcheck.cpp
@@ -57,7 +57,7 @@ void printUsage()
cout << "by environment variables is checked in the following order:." << endl << endl;
cout << "TRAFAUTH_CONFIGFILE: fully qualified filename" << endl;
cout << "TRAFAUTH_CONFIGDIR: Filename '/.traf_authentication_config' is appended" << endl;
- cout << "Otherwise, '/sql/scripts/.traf_authentication_config' is appended to value of MY_SQROOT." << endl;
+ cout << "Otherwise, '/sql/scripts/.traf_authentication_config' is appended to value of TRAF_HOME." << endl;
}
//***************************** End of printUsage ******************************
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/cert/Makefile
----------------------------------------------------------------------
diff --git a/core/dbsecurity/cert/Makefile b/core/dbsecurity/cert/Makefile
index 2b4b76e..d08c46d 100644
--- a/core/dbsecurity/cert/Makefile
+++ b/core/dbsecurity/cert/Makefile
@@ -23,7 +23,7 @@
# Description: Makefile for building authentication library
#
-include $(MY_SQROOT)/macros.gmk #top level
+include $(TRAF_HOME)/macros.gmk #top level
include ../macros.gmk
#OUTDIR = .
@@ -36,14 +36,14 @@ DBG_FLAGS = $(DBG_FLGS)
OBJS = $(OUTDIR)/secsrvr.o \
$(OUTDIR)/verssqcert.o
-INCLUDES = -I. -I./inc -I../shared/inc -I$(MY_SQROOT)/export/include
+INCLUDES = -I. -I./inc -I../shared/inc -I$(TRAF_HOME)/export/include
#LINK_OPTIONS = -lldap
LINK_OPTIONS = $(LNK_FLGS)
libsqcert.so: $(OBJS)
$(CXX) -fPIC $(DBG_FLAGS) -shared $(GCCMODEXX) -o $@ $(INCLUDES) $(LINK_OPTIONS) $(OBJS)
$(CP) -p libsqcert.so $(LIBEXPDIR)/.
- $(CP) -p inc/secsrvrmxo.h $(MY_SQROOT)/export/include/.
+ $(CP) -p inc/secsrvrmxo.h $(TRAF_HOME)/export/include/.
clean:
@@ -51,8 +51,8 @@ clean:
$(RM) -rf $(OUTDIR)
$(RM) -f libsqcert.so
$(RM) -f $(LIBEXPDIR)/libsqcert.so
- $(RM) -f $(MY_SQROOT)/inc/security/secsrvrmxo.h
- $(RM) -f $(MY_SQROOT)/export/include/secsrvrmxo.h
+ $(RM) -f $(TRAF_HOME)/inc/security/secsrvrmxo.h
+ $(RM) -f $(TRAF_HOME)/export/include/secsrvrmxo.h
cleanall: clean
$(RM) -rf $(BUILD_PLAT)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/cert/src/secsrvr.cpp
----------------------------------------------------------------------
diff --git a/core/dbsecurity/cert/src/secsrvr.cpp b/core/dbsecurity/cert/src/secsrvr.cpp
index 9e1847f..72b9daa 100755
--- a/core/dbsecurity/cert/src/secsrvr.cpp
+++ b/core/dbsecurity/cert/src/secsrvr.cpp
@@ -227,7 +227,7 @@ static void SetupCertFilename()
char *pub_filename = getenv("SQCERT_PUBKEY");
char *clustername = getenv("CLUSTERNAME");
char *homedir = getenv("HOME");
- char *sqroot = getenv("MY_SQROOT");
+ char *sqroot = getenv("TRAF_HOME");
char *certdir = getenv("SQCERT_DIR");
// Get the Certificate directory and the filename
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/macros.gmk
----------------------------------------------------------------------
diff --git a/core/dbsecurity/macros.gmk b/core/dbsecurity/macros.gmk
index 948a86a..1316c91 100644
--- a/core/dbsecurity/macros.gmk
+++ b/core/dbsecurity/macros.gmk
@@ -49,7 +49,7 @@ $(OUTDIR)/%.o: src/%.cpp
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -fPIC -o $@ $<
# Modules in logging directory
-$(OUTDIR)/%.o: $(MY_SQROOT)/commonLogger/CommonLogger.cpp
+$(OUTDIR)/%.o: $(TRAF_HOME)/commonLogger/CommonLogger.cpp
# echo " *****FLAGS::: $(CXX) *****"
@if [ -d "$(OUTDIR)" ]; then x=1; else mkdir -p "$(OUTDIR)"; fi
$(CXX) $(CXXFLAGS) $(INCLUDES) -c -fPIC -o $@ $<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/scripts/sqcertgen
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/sqcertgen b/core/dbsecurity/scripts/sqcertgen
index 571b596..b8c57c2 100755
--- a/core/dbsecurity/scripts/sqcertgen
+++ b/core/dbsecurity/scripts/sqcertgen
@@ -22,7 +22,7 @@
# @@@ END COPYRIGHT @@@
#
-CERTDIR=$MY_SQROOT/sqcert
+CERTDIR=$TRAF_HOME/sqcert
CLUSTNAME=`echo $CLUSTERNAME`
if (test -n "${CLUSTNAME}"); then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/dbsecurity/scripts/update_auth
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/update_auth b/core/dbsecurity/scripts/update_auth
index 9b5fb6f..0f85bca 100755
--- a/core/dbsecurity/scripts/update_auth
+++ b/core/dbsecurity/scripts/update_auth
@@ -57,9 +57,9 @@ while [ $# -gt 0 ]; do
shift
done
-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, and re-run $script_name."
echo
exit 1;
@@ -78,7 +78,7 @@ else
fi
#Create local folder for storing CA certicates
-SQCACERTS_DIR=$MY_SQROOT/cacerts
+SQCACERTS_DIR=$TRAF_HOME/cacerts
if [ ! -d "$SQCACERTS_DIR" ]; then
mkdir -p -m 700 $SQCACERTS_DIR;
else
@@ -86,20 +86,20 @@ else
fi
#Create local folder for storing SQ certicates
-SQCERT_DIR=$MY_SQROOT/sqcert
+SQCERT_DIR=$TRAF_HOME/sqcert
if [ ! -d "$SQCERT_DIR" ]; then
mkdir -p -m 700 $SQCERT_DIR;
else
chmod 700 $SQCERT_DIR
fi
-#cp -p -r $CACERTS_DIR $MY_SQROOT 2> /dev/null
+#cp -p -r $CACERTS_DIR $TRAF_HOME 2> /dev/null
#if [ -n "$CLUSTERNAME" ]; then
-# $SQ_PDCP -p -r $MY_NODES -x `uname -n` $CACERTS_DIR $MY_SQROOT 2> /dev/null
+# $SQ_PDCP -p -r $MY_NODES -x `uname -n` $CACERTS_DIR $TRAF_HOME 2> /dev/null
#
-# cp -p -r $HOME/sqcert $MY_SQROOT 2> /dev/null
-# $SQ_PDCP -p -r $MY_NODES -x `uname -n` $HOME/sqcert $MY_SQROOT 2> /dev/null
+# cp -p -r $HOME/sqcert $TRAF_HOME 2> /dev/null
+# $SQ_PDCP -p -r $MY_NODES -x `uname -n` $HOME/sqcert $TRAF_HOME 2> /dev/null
#
#fi
exit 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/mpi/Makefile
----------------------------------------------------------------------
diff --git a/core/mpi/Makefile b/core/mpi/Makefile
index d753ff0..8fcbced 100644
--- a/core/mpi/Makefile
+++ b/core/mpi/Makefile
@@ -19,7 +19,7 @@
#
# @@@ END COPYRIGHT @@@
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
include ./macros.gmk
MPI_LIBEXPDIR=$(MPI_ROOT)/lib/linux_amd64
@@ -68,7 +68,7 @@ $(BINEXPDIR)/hydra_pmi_proxy: $(MPICH_ROOT)/bin/hydra_pmi_proxy
rm -f $(BINEXPDIR)/hydra_pmi_proxy
cp $(MPICH_ROOT)/bin/hydra_pmi_proxy $(BINEXPDIR)/hydra_pmi_proxy
-$(MPI_LIBEXPDIR)/libmtmpi.so: libmtmpi.c $(MPI_INCEXPDIR)/mpi.h $(MY_SQROOT)/export/include/SCMBuildStr.h
+$(MPI_LIBEXPDIR)/libmtmpi.so: libmtmpi.c $(MPI_INCEXPDIR)/mpi.h $(TRAF_HOME)/export/include/SCMBuildStr.h
-mkdir -p $(MPI_LIBEXPDIR) $(LIBEXPDIR)
$(CC) $(CCFLAGS) $(INCLUDES) $(LIBSRC) $(LDFLAGS) -c
$(CC) $(LDFLAGS) $(CCFLAGS) -Wall -Werror -shared \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/Makefile
----------------------------------------------------------------------
diff --git a/core/rest/Makefile b/core/rest/Makefile
index 46772c9..530e49c 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -40,7 +40,7 @@ build_all: build_chk
build_chk:
$(GENVERS) > $(VFILE)
@if [ $(GENVERS) -nt target/$(BLD_TRAFODION_REST_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_REST_TARNAME); fi
- @if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_REST_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_REST_TARNAME); fi
+ @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_REST_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_REST_TARNAME); fi
clean:
-$(MAVEN) clean |grep ERROR
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/bin/rest
----------------------------------------------------------------------
diff --git a/core/rest/bin/rest b/core/rest/bin/rest
index 03bba55..96d9ec5 100755
--- a/core/rest/bin/rest
+++ b/core/rest/bin/rest
@@ -187,9 +187,9 @@ function append_path() {
JAVA_PLATFORM=""
#If avail, add Trafodion to the JAVA_LIBRARY_PATH
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
- export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$MY_SQROOT/export/lib$SQ_MBTYPE/libseabasesig.so;
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
+ export LD_PRELOAD=$JAVA_HOME/jre/lib/amd64/libjsig.so:$TRAF_HOME/export/lib$SQ_MBTYPE/libseabasesig.so;
fi
fi
@@ -257,7 +257,7 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
fi
REST_OPTS="$REST_OPTS -Drest.user.program.home=$REST_USER_PROGRAM_HOME"
REST_OPTS="$REST_OPTS -Drest.conf.dir=$REST_CONF_DIR"
-REST_OPTS="$REST_OPTS -Drest.trafodion.home=$MY_SQROOT"
+REST_OPTS="$REST_OPTS -Drest.trafodion.home=$TRAF_HOME"
# Exec unless REST_NOEXEC is set.
if [ "${REST_NOEXEC}" != "" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/conf/rest-env.sh
----------------------------------------------------------------------
diff --git a/core/rest/conf/rest-env.sh b/core/rest/conf/rest-env.sh
index cb5b838..340c171 100644
--- a/core/rest/conf/rest-env.sh
+++ b/core/rest/conf/rest-env.sh
@@ -31,8 +31,8 @@
# export JAVA_HOME=/usr/java/jdk1.7.0/
# Add Trafodion to the classpath
-if [ "$MY_SQROOT" != "" ]; then
- if [ -d $MY_SQROOT ]; then
+if [ "$TRAF_HOME" != "" ]; then
+ if [ -d $TRAF_HOME ]; then
export REST_CLASSPATH=${CLASSPATH}:
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/rest/genvers
----------------------------------------------------------------------
diff --git a/core/rest/genvers b/core/rest/genvers
index f16607a..ecc7848 100755
--- a/core/rest/genvers
+++ b/core/rest/genvers
@@ -20,4 +20,4 @@
#
# @@@ END COPYRIGHT @@@
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/rest/src/main/asciidoc/_chapters/getting_started.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/getting_started.adoc b/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
index 5ffc14a..2552329 100644
--- a/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
@@ -48,7 +48,7 @@ or wish to start/stop the server independently.
Is Trafodion installed and running?
The server presumes a Trafodion instance is installed and running on your machine and available on your path; i.e. the
-`MY_SQROOT` environment variable is set and when you type _sqcheck_, you see output that confirms Trafodion is running. If this is not
+`TRAF_HOME` environment variable is set and when you type _sqcheck_, you see output that confirms Trafodion is running. If this is not
the case, the server may start but you'll see many errors.
At this point, you are ready to start the server.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/seamonster/src/Makefile
----------------------------------------------------------------------
diff --git a/core/seamonster/src/Makefile b/core/seamonster/src/Makefile
index 0589219..94b416e 100644
--- a/core/seamonster/src/Makefile
+++ b/core/seamonster/src/Makefile
@@ -19,10 +19,10 @@
#
# @@@ END COPYRIGHT @@@
-include $(MY_SQROOT)/macros.gmk
+include $(TRAF_HOME)/macros.gmk
include ./macros.gmk
-SQINSTALL=$(MY_SQROOT)/export
+SQINSTALL=$(TRAF_HOME)/export
#SM library files
LIBSRC=libsm.c verssm.c
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/seamonster/src/macros.gmk
----------------------------------------------------------------------
diff --git a/core/seamonster/src/macros.gmk b/core/seamonster/src/macros.gmk
index a07e57a..8a17180 100644
--- a/core/seamonster/src/macros.gmk
+++ b/core/seamonster/src/macros.gmk
@@ -39,8 +39,8 @@ CXX = $(GCC_TOOL_ROOT)/bin/g++
MPICC = $(MPI_ROOT)/bin/mpicc
# export
-EXPROOT = $(MY_SQROOT)/export
-INCMONDIR = $(MY_SQROOT)/monitor/linux
+EXPROOT = $(TRAF_HOME)/export
+INCMONDIR = $(TRAF_HOME)/monitor/linux
BINEXPDIR = $(EXPROOT)/bin$(SQ_MBTYPE)
INCEXPDIR = $(EXPROOT)/include
LIBEXPDIR = $(EXPROOT)/lib$(SQ_MBTYPE)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/LocalSettingsTemplate.sh
----------------------------------------------------------------------
diff --git a/core/sqf/LocalSettingsTemplate.sh b/core/sqf/LocalSettingsTemplate.sh
index b105fbf..1b5bfee 100644
--- a/core/sqf/LocalSettingsTemplate.sh
+++ b/core/sqf/LocalSettingsTemplate.sh
@@ -31,12 +31,12 @@
#
# This file needs to be copied to ~/.trafodion and updated to override
# build tool locations
-# .trafodion is sourced in when running $MY_SQROOT/sqenvcom.sh
-# sqenvcom.sh is sourced in by $MY_SQROOT/sqenv.sh
+# .trafodion is sourced in when running $TRAF_HOME/sqenvcom.sh
+# sqenvcom.sh is sourced in by $TRAF_HOME/sqenv.sh
# sqenv.sh is sourced in by:
-# $MY_SQROOT/../../env.sh or
-# $MY_SQROOT/sqenvd.sh (debug build) or
-# $MY_SQROOT/sqenvr.sh (release build)
+# $TRAF_HOME/../../env.sh or
+# $TRAF_HOME/sqenvd.sh (debug build) or
+# $TRAF_HOME/sqenvr.sh (release build)
#
# sqenvcom.sh sets up the environment in preparation for building and
# running Trafodion.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 9ab8925..a107cca 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -36,7 +36,7 @@ else
SQENV_MTYPE=sq32env.sh
endif
STUBLIBDIR=stublibs/lib/linux/$(MTYPE_BTYPE)
-SQL_W=$(MY_SQROOT)/../sql
+SQL_W=$(TRAF_HOME)/../sql
DP2=se
@@ -70,7 +70,7 @@ smstub:
make_sql: $(SEAMONSTER_TARGET) win hbase_utilities
cd sql; $(MAKE) WROOT=$(SQL_W) 2>&1 | sed -e "s/$$/ ##(SQL)/" ; exit $${PIPESTATUS[0]}
- cd $(MY_SQROOT)/sql/scripts && ./makemsg.ksh 2>&1 | sed -e "s/$$/ ##(SQL)/" ; exit $${PIPESTATUS[0]}
+ cd $(TRAF_HOME)/sql/scripts && ./makemsg.ksh 2>&1 | sed -e "s/$$/ ##(SQL)/" ; exit $${PIPESTATUS[0]}
make_monitor: stfs make_sqevlog seabed
cd monitor/linux; $(MAKE) 2>&1 | sed -e "s/$$/ ##(SQF)/" ; exit $${PIPESTATUS[0]}
@@ -196,7 +196,7 @@ setupdir:
-ln -sf $(SQL_W)/sqludr/sqludr.h $(EXPORTINCSQL_DIR)
@#
mkdir -p export/include/nsk
- -ln -sf $(MY_SQROOT)/inc/cextdecs/cextdecs.h export/include/nsk
+ -ln -sf $(TRAF_HOME)/inc/cextdecs/cextdecs.h export/include/nsk
@# USTAT
-mkdir -p export/lib/mx_ustat
-ln -sf $(SQL_W)/ustat/USAS.sh export/lib/mx_ustat
@@ -356,14 +356,14 @@ pkglist-symlinks: LICENSE NOTICE DISCLAIMER rest-${TRAFODION_VER} dcs-${TRAFODIO
# Targets to tar/gzip the self installer
packagebin:
- cat $(MY_SQROOT)/sql/scripts/sqinstall > $(PKG_BIN)
+ cat $(TRAF_HOME)/sql/scripts/sqinstall > $(PKG_BIN)
echo "__ARCHIVE_BELOW__" >> $(PKG_BIN)
tar chzf - -X build-scripts/package.exclude $(PKG_BIN_OBJS) >> $(PKG_BIN)
chmod +x $(PKG_BIN)
# Targets to create self-installer with sqinstaller
packageinstaller:
- cat $(MY_SQROOT)/sql/scripts/sqinstaller > $(PKG_BIN)
+ cat $(TRAF_HOME)/sql/scripts/sqinstaller > $(PKG_BIN)
echo "__ARCHIVE_BELOW__" >> $(PKG_BIN)
tar chzf - -X build-scripts/package.exclude $(PKG_BIN_OBJS) >> $(PKG_BIN)
chmod +x $(PKG_BIN)
@@ -387,7 +387,7 @@ package-dcs:
# Targets to tar/gzip the self installer with sources
srcpackagebin:
-rm etc/ms.env
- cat $(MY_SQROOT)/sql/scripts/sqinstall > $(SRC_PKG_BIN)
+ cat $(TRAF_HOME)/sql/scripts/sqinstall > $(SRC_PKG_BIN)
echo "__ARCHIVE_BELOW__" >> $(SRC_PKG_BIN)
tar chzf - -X build-scripts/package.exclude -X build-scripts/package.exclude.$(SQ_MBTYPE) . >> $(SRC_PKG_BIN)
chmod +x $(SRC_PKG_BIN)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/build-scripts/check_man
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/check_man b/core/sqf/build-scripts/check_man
index 00e24c0..b280aa3 100755
--- a/core/sqf/build-scripts/check_man
+++ b/core/sqf/build-scripts/check_man
@@ -20,8 +20,8 @@
#
# @@@ END COPYRIGHT @@@
-echo "MY_SQROOT=$MY_SQROOT"
-cd $MY_SQROOT/sql/scripts
+echo "TRAF_HOME=$TRAF_HOME"
+cd $TRAF_HOME/sql/scripts
files=`ls`
hdr=0
for f in $files; do
@@ -39,7 +39,7 @@ for f in $files; do
continue
fi
MANDIR="export/share/man/man1"
- if [ ! -r $MY_SQROOT/${MANDIR}/$f.1 ]; then
+ if [ ! -r $TRAF_HOME/${MANDIR}/$f.1 ]; then
if [ $hdr = 0 ]; then
echo "WARNING: The following files in sqf/sql/scripts"
echo "do not have a matching man page in sqf/${MANDIR} :"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/build-scripts/genverhdr.ksh
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/genverhdr.ksh b/core/sqf/build-scripts/genverhdr.ksh
index 3af1d19..b5acd16 100755
--- a/core/sqf/build-scripts/genverhdr.ksh
+++ b/core/sqf/build-scripts/genverhdr.ksh
@@ -124,7 +124,7 @@ EOF
#!/bin/sh
VER_PROD=`echo \$TRAFODION_VER_PROD | sed 's/ /_/'`
echo "Implementation-Version-1: Version \$* \$VER_PROD"
-cat \$MY_SQROOT/export/include/SCMBuildMan.mf
+cat \$TRAF_HOME/export/include/SCMBuildMan.mf
EOF
cat > $TMPFILEJ3 <<EOF
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/commonLogger/CommonLogger.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/commonLogger/CommonLogger.cpp b/core/sqf/commonLogger/CommonLogger.cpp
index 1e7f6cf..8a049ee 100644
--- a/core/sqf/commonLogger/CommonLogger.cpp
+++ b/core/sqf/commonLogger/CommonLogger.cpp
@@ -58,8 +58,8 @@ bool CommonLogger::initLog4cxx(const char* configFileName, const char* fileSuffi
logFolder_ = "";
- // Form the config path $MY_SQROOT/conf
- char *installPath = getenv("MY_SQROOT");
+ // Form the config path $TRAF_HOME/conf
+ char *installPath = getenv("TRAF_HOME");
if (installPath)
{
configPath = installPath;
@@ -71,7 +71,7 @@ bool CommonLogger::initLog4cxx(const char* configFileName, const char* fileSuffi
}
else
{
- // Environment variable $MY_SQROOT not found.
+ // Environment variable $TRAF_HOME not found.
// use the current directory.
configPath = "";
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/commonLogger/CommonLogger.h
----------------------------------------------------------------------
diff --git a/core/sqf/commonLogger/CommonLogger.h b/core/sqf/commonLogger/CommonLogger.h
index 8a00573..75ca87d 100644
--- a/core/sqf/commonLogger/CommonLogger.h
+++ b/core/sqf/commonLogger/CommonLogger.h
@@ -84,7 +84,7 @@ public:
/**
* Initializes log4cxx by using the configuration file.
* If the path given is relative (does not start with a
- * slash), it is appended to the $MY_SQROOT environment variable.
+ * slash), it is appended to the $TRAF_HOME environment variable.
* @param configFileName name of the log4cxx configuration file.
* @return FALSE if the configuration file is not found.
*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/install_features
----------------------------------------------------------------------
diff --git a/core/sqf/conf/install_features b/core/sqf/conf/install_features
index 32bca2c..bef95da 100644
--- a/core/sqf/conf/install_features
+++ b/core/sqf/conf/install_features
@@ -22,7 +22,7 @@
# @@@ END COPYRIGHT @@@
#
-# Install feature file ($MY_SQROOT/conf/install_features)
+# Install feature file ($TRAF_HOME/conf/install_features)
#
# This file allows specific Trafodion core builds to signal to
# the installer the presence of a new feature that requires
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.mon.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.mon.config b/core/sqf/conf/log4cxx.monitor.mon.config
index 5933ed5..06245dc 100644
--- a/core/sqf/conf/log4cxx.monitor.mon.config
+++ b/core/sqf/conf/log4cxx.monitor.mon.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, monAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.mon.snmp.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.mon.snmp.config b/core/sqf/conf/log4cxx.monitor.mon.snmp.config
index 69bcf5f..4c56ffd 100644
--- a/core/sqf/conf/log4cxx.monitor.mon.snmp.config
+++ b/core/sqf/conf/log4cxx.monitor.mon.snmp.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, monSnmpAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.psd.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.psd.config b/core/sqf/conf/log4cxx.monitor.psd.config
index 50d100a..5fcb3ac 100644
--- a/core/sqf/conf/log4cxx.monitor.psd.config
+++ b/core/sqf/conf/log4cxx.monitor.psd.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, psdAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.wdg.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.wdg.config b/core/sqf/conf/log4cxx.monitor.wdg.config
index c935915..39acbc9 100644
--- a/core/sqf/conf/log4cxx.monitor.wdg.config
+++ b/core/sqf/conf/log4cxx.monitor.wdg.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, wdtAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.monitor.wdg.snmp.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.monitor.wdg.snmp.config b/core/sqf/conf/log4cxx.monitor.wdg.snmp.config
index 0b8a10e..97f1b1e 100644
--- a/core/sqf/conf/log4cxx.monitor.wdg.snmp.config
+++ b/core/sqf/conf/log4cxx.monitor.wdg.snmp.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, wdtSnmpAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.auth.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.auth.config b/core/sqf/conf/log4cxx.trafodion.auth.config
index 34f1dbd..97e8ce9 100644
--- a/core/sqf/conf/log4cxx.trafodion.auth.config
+++ b/core/sqf/conf/log4cxx.trafodion.auth.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, authAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.lob.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.lob.config b/core/sqf/conf/log4cxx.trafodion.lob.config
index a743566..45ca5ff 100644
--- a/core/sqf/conf/log4cxx.trafodion.lob.config
+++ b/core/sqf/conf/log4cxx.trafodion.lob.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, lobAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.masterexe.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.masterexe.config b/core/sqf/conf/log4cxx.trafodion.masterexe.config
index a5c6194..c1e0b80 100644
--- a/core/sqf/conf/log4cxx.trafodion.masterexe.config
+++ b/core/sqf/conf/log4cxx.trafodion.masterexe.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, mxoAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.sscp.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.sscp.config b/core/sqf/conf/log4cxx.trafodion.sscp.config
index d9a74f4..0733514 100644
--- a/core/sqf/conf/log4cxx.trafodion.sscp.config
+++ b/core/sqf/conf/log4cxx.trafodion.sscp.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, sscpAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.ssmp.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.ssmp.config b/core/sqf/conf/log4cxx.trafodion.ssmp.config
index 8c5e760..ce97ea6 100644
--- a/core/sqf/conf/log4cxx.trafodion.ssmp.config
+++ b/core/sqf/conf/log4cxx.trafodion.ssmp.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, ssmpAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.tm.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.tm.config b/core/sqf/conf/log4cxx.trafodion.tm.config
index 214e155..44b4e9b 100644
--- a/core/sqf/conf/log4cxx.trafodion.tm.config
+++ b/core/sqf/conf/log4cxx.trafodion.tm.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, tmAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/log4cxx.trafodion.udr.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4cxx.trafodion.udr.config b/core/sqf/conf/log4cxx.trafodion.udr.config
index 39145a6..e540c39 100644
--- a/core/sqf/conf/log4cxx.trafodion.udr.config
+++ b/core/sqf/conf/log4cxx.trafodion.udr.config
@@ -23,7 +23,7 @@
# Define some default values that can be overridden by system properties
trafodion.root.logger=INFO, udrAppender
-trafodion.log.dir=${MY_SQROOT}/logs
+trafodion.log.dir=${TRAF_HOME}/logs
trafodion.log.filename.suffix=${TRAFODION_LOG_FILENAME_SUFFIX}
# Define the root logger to the system property "trafodion.root.logger".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/conf/trafodion.udr.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/trafodion.udr.config b/core/sqf/conf/trafodion.udr.config
index 09de7a4..6543fe9 100644
--- a/core/sqf/conf/trafodion.udr.config
+++ b/core/sqf/conf/trafodion.udr.config
@@ -22,12 +22,12 @@
#
# Configuration file for TDM_UDRSERV process
-# Located at $MY_SQROOT/conf/trafodion.udr.config
+# Located at $TRAF_HOME/conf/trafodion.udr.config
# Location of property file can be specified through TRAFUDRCFG env variable
# TRAFUDRCFG will override this default implementation of the property file.
# Properties specfied are passed on to the JVM created by the TDM_UDRSERV
# Can be overridden by env variable TRAF_UDR_JAVA_OPTIONS in
-# $MY_SQROOT/etc/ms.env
+# $TRAF_HOME/etc/ms.env
# Incorrect property values or specification syntax can result in TDM_UDRSERV
# not being able to initialize a JVM.
# Properties must be specified in a section titled "java".
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0d467cad/core/sqf/export/limited-support-tools/LSO/README
----------------------------------------------------------------------
diff --git a/core/sqf/export/limited-support-tools/LSO/README b/core/sqf/export/limited-support-tools/LSO/README
index 3b4933d..6bfb0bb 100644
--- a/core/sqf/export/limited-support-tools/LSO/README
+++ b/core/sqf/export/limited-support-tools/LSO/README
@@ -90,7 +90,7 @@ between executions establishes the time window. Results, if they exist, will
appear after the second execution. The SQL commands to list CPU offenders are
available at:
-$MY_SQROOT/export/limited-support-tools/LSO/cpu_offender.sql
+$TRAF_HOME/export/limited-support-tools/LSO/cpu_offender.sql
To use these queries you can obey these scripts in trafci or sqlci. The first
time the offender script is obeyed, the results should be ignored, because
@@ -139,7 +139,7 @@ executor and IPC above the given threshold, specified in megabytes.
All of a process\u2019s allocated queries are included in these calculations.
The SQL command to list the memory offenders are avilable at
-$MY_SQROOT/export/limited-support-tools/LSO/mem_offender.sql
+$TRAF_HOME/export/limited-support-tools/LSO/mem_offender.sql
Example output is shown below:
CURRENT_TIMESTAMP NODE PID EXE_MEM_HIGH_WM_MB EXE_MEM_ALLOC_MB IPC_MEM_HIGH_WM_MB IPC_MEM_ALLOC_MB
@@ -160,7 +160,7 @@ SQL Engine (either while executing the query. or fetching the output row)
longer than the given number of seconds.
The SQL commands to list queries blocked in SQL are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/queries_in_sql.sql
+$TRAF_HOME/export/limited-support-tools/LSO/queries_in_sql.sql
Example output is shown below:
CURRENT_TIMESTAMP TIME_IN_SECONDS QUERY_ID SOURCE_TEXT
@@ -175,7 +175,7 @@ This filtering mechanism lists the querie s which are not blocked in SQL longer
than the given number of seconds and haven't finished execution.
The SQL commands to list queries blocked in the client are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/queries_in_client.sql
+$TRAF_HOME/export/limited-support-tools/LSO/queries_in_client.sql
Example output is below:
CURRENT_TIMESTAMP TIME_IN_SECONDS QUERY_ID EXECUTE_STATE SOURCE_TEXT
@@ -208,7 +208,7 @@ executing the given number of seconds ago. Dead queries, explained in the next
section, are not selected.
The SQL commands to list inactive queries are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/inactive_queries.sql
+$TRAF_HOME/export/limited-support-tools/LSO/inactive_queries.sql
Example output is below:
CURRENT_TIMESTAMP LAST_ACTIVITY_SECS QUERY_ID SOURCE_TEXT
@@ -226,7 +226,7 @@ persisted after the process exit for a period longer than the given number of
seconds.
The SQL commands to list dead queries are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/dead_queries.sql
+$TRAF_HOME/export/limited-support-tools/LSO/dead_queries.sql
Example output is below:
CURRENT_TIMESTAMP LAST_ACTIVITY_SECS BLOCKED_IN_SQL BLOCKED_IN_CLIENT QUERY_ID SOURCE_TEXT
@@ -241,7 +241,7 @@ This statement lists the queries for which the statistics collection type is
set to NO_STATS or ALL_STATS, either by SQL engine or by the user.
The SQL commands to list UNMONITORED queries are available at:
-$MY_SQROOT/export/limited-support-tools/LSO/uninstrumented.sql
+$TRAF_HOME/export/limited-support-tools/LSO/uninstrumented.sql
Example output is below:
CURRENT_TIMESTAMP LAST_ACTIVITY_SECS QUERY_TYPE QUERY_SUBTYPE QUERY_STATS_TYPE QUERY_ID SOURCE_TEXT