You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/25 20:35:00 UTC
[38/39] incubator-trafodion git commit: [TRAFODION-1977] Merge
forward release2.0 changes to master
[TRAFODION-1977] Merge forward release2.0 changes to master
Includes all changes from release2.0 branch as of 2.0.0rc3 tag.
The major change coming forward is packaging changes associated with
TRAFODION-1982.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/60ef89d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/60ef89d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/60ef89d3
Branch: refs/heads/master
Commit: 60ef89d3467042a2c3651e43709b85efe147bc25
Parents: c41b39b 9415d7f
Author: Steve Varnau <st...@esgyn.com>
Authored: Thu May 19 18:14:23 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu May 19 18:14:23 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 -
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/rest/Makefile | 16 +-
core/rest/pom.xml | 40 +-
core/rest/src/assembly/all.xml | 11 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
core/sqf/sql/scripts/install_traf_components | 50 +-
.../TransactionalScanner.java.tmpl | 2 +-
.../transactional/SplitBalanceHelper.java | 51 +-
.../transactional/TrxRegionObserver.java.tmpl | 4 +-
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
.../java/org/trafodion/sql/HTableClient.java | 5 +-
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
install/installer/dcs_installer | 19 +-
install/installer/rest_installer | 21 +-
.../installer/traf_apache_hadoop_config_setup | 842 --------
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 62 +-
install/installer/traf_config_check | 44 +-
install/installer/traf_config_setup | 69 +-
install/installer/traf_hortonworks_mods | 4 +-
install/installer/traf_package_setup | 2 +
.../installer/trafodion_apache_hadoop_install | 763 --------
install/installer/trafodion_config_default | 14 +-
install/installer/trafodion_install | 148 +-
install/traf_tools_setup.sh | 1 +
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 -------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 --------------
licenses/lic-server-bin | 1834 ++++++++++++++++++
licenses/lic-server-src | 69 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
43 files changed, 2207 insertions(+), 4186 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/Makefile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/rest/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sqf/sql/scripts/install_traf_components
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/install_traf_components
index 921de71,9a19f2d..8335090
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@@ -105,12 -105,12 +105,12 @@@ echo | tee -a ${MY_LOG_FILE
if [ -d dcs-* ]; then
echo "DCS files already exist, skipping DCS setup" | tee -a ${MY_LOG_FILE}
else
- if [[ -f $DCS_TAR ]]; then
- echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
+ if [[ -d $DCS_BLD ]]; then
+ echo "Using DCS Build: $DCS_BLD" | tee -a ${MY_LOG_FILE}
elif [[ -d $DCS_SRC ]]; then
- echo "DCS tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
- echo "Building DCS tar file" | tee -a ${MY_LOG_FILE}
+ 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.jar ]]; then
+ if [[ -f $MY_SQROOT/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
@@@ -188,12 -188,12 +188,12 @@@ echo | tee -a ${MY_LOG_FILE
if [ -d rest-* ]; then
echo "REST files already exist, skipping REST setup"
else
- if [[ -f $REST_TAR ]]; then
- echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
+ if [[ -d $REST_BLD ]]; then
+ echo "Using REST Build: $REST_BLD" | tee -a ${MY_LOG_FILE}
elif [[ -d $REST_SRC ]]; then
- echo "REST tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
- echo "Building REST tar file" | tee -a ${MY_LOG_FILE}
+ 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.jar ]]; then
+ if [[ -f $MY_SQROOT/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
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java.tmpl
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/dcs/pom.xml
----------------------------------------------------------------------