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 2015/12/08 17:56:55 UTC

[20/20] incubator-trafodion git commit: Merge [TRAFODION-1642] License issue fixes

Merge [TRAFODION-1642] License issue fixes


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/250ee055
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/250ee055
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/250ee055

Branch: refs/heads/master
Commit: 250ee055b36c6a80ac9c9abaa235f61ec53fb0a7
Parents: 9ce3c07 820ac3d
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Dec 8 16:55:07 2015 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Dec 8 16:55:07 2015 +0000

----------------------------------------------------------------------
 .gitattributes                                  |   14 +
 .rat-excludes                                   |  116 +-
 LICENSE.txt                                     |  178 +-
 NOTICE.txt                                      |    1 +
 RAT_README.txt                                  |  102 +-
 README.txt                                      |   33 +-
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |    3 -
 core/conn/security_dll/LICENSE                  |  127 -
 .../odbc/odbcclient/unixcli/package/mklnxpkg.sh |    2 -
 .../unixcli/package/trafodbclnx_install.sh      |    2 +-
 core/sqf/conf/log4j.dtm.config                  |   22 -
 core/sqf/conf/log4j.hdfs.config                 |   22 -
 core/sqf/conf/trafodion.udr.config              |   22 -
 core/sqf/export/lib/Vili/Functions.pm           |  725 ---
 core/sqf/export/lib/Vili/Helper.pm              |  674 --
 core/sqf/export/lib/Vili/NoDriftTimer.pm        |   98 -
 core/sqf/sql/scripts/sqnodes.pm                 |   74 +-
 .../client/transactional/BatchException.java    |   21 -
 .../CommitUnsuccessfulException.java            |   19 -
 .../HBaseBackedTransactionLogger.java           |   10 -
 .../client/transactional/JtaXAResource.java     |   10 -
 .../transactional/LocalTransactionLogger.java   |   19 -
 .../transactional/MemoryUsageException.java     |   20 -
 .../OutOfOrderProtocolException.java            |   20 -
 .../hbase/client/transactional/RMInterface.java |   20 -
 .../transactional/SsccTransactionalScanner.java |   20 -
 .../transactional/SsccTransactionalTable.java   |   20 -
 .../SsccUpdateConflictException.java            |   20 -
 .../hbase/client/transactional/TmDDL.java       |   20 -
 .../client/transactional/TransReturnCode.java   |   20 -
 .../hbase/client/transactional/TransState.java  |   20 -
 .../client/transactional/TransactionLogger.java |   19 -
 .../transactional/TransactionManager.java       |   20 -
 .../client/transactional/TransactionMap.java    |   22 +-
 .../TransactionRegionLocation.java              |   20 -
 .../client/transactional/TransactionState.java  |   20 -
 .../TransactionalAggregationClient.java         |   19 -
 .../transactional/TransactionalScanner.java     |   20 -
 .../transactional/TransactionalTable.java       |   20 -
 .../transactional/TransactionalTableClient.java |   20 -
 .../UnknownTransactionException.java            |   19 -
 .../transactional/UnsuccessfulDDLException.java |   20 -
 .../transactional/SsccRegionEndpoint.java       |   21 -
 .../transactional/SsccTableClient.java          |   21 -
 .../transactional/SsccTableClientUtils.java     |   18 -
 .../transactional/TrxRegionEndpoint.java        |   20 -
 .../transactional/TrxRegionObserver.java        |   22 -
 .../transactional/TrxTableClient.java           |   18 -
 .../transactional/TrxTableClient2.java          |   18 -
 .../transactional/TrxTableClient3.java          |   18 -
 .../transactional/TrxTableClient4.java          |   18 -
 .../CleanOldTransactionsChore.java              |   10 -
 .../hbase/regionserver/transactional/IdTm.java  |   10 -
 .../regionserver/transactional/IdTmCb.java      |   10 -
 .../transactional/IdTmException.java            |   10 -
 .../transactional/KeyValueListScanner.java      |   11 -
 .../transactional/MemoryUsageChore.java         |   10 -
 .../transactional/SsccTransactionState.java     |   21 -
 .../transactional/TransactionState.java         |   21 -
 .../transactional/TransactionalRegion.java      |   10 -
 .../TransactionalRegionScannerHolder.java       |   10 -
 .../transactional/TrxTransactionState.java      |   10 -
 core/sql/common/from_GB2312.c                   |  134 +-
 core/sql/common/swscanf.cpp                     |   55 +-
 core/sql/common/swsprintf.cpp                   |   63 +-
 core/sql/parser/ulexer.h                        |   39 +-
 core/sql/regress/newregr/card/runregr_card.ksh  |    7 -
 .../regress/newregr/mvs/BIG/expectedmv215_RU    |  480 --
 core/sql/regress/newregr/mvs/EXPECTEDMV500      | 4708 --------------
 core/sql/regress/newregr/mvs/EXPECTEDMV500A     | 5179 ----------------
 .../regress/newregr/mvs/EXPECTEDMV500A.LINUX    | 5789 ------------------
 .../sql/regress/newregr/mvs/TPCD/DBGEN_HELP.TXT |   83 -
 core/sql/regress/seabase/EXPECTED021            |   26 +-
 core/sql/regress/tools/regress-filter           |    5 -
 core/sql/regress/tools/regress-filter-linux     |    5 -
 core/sql/regress/udr/EXPECTED100.SB             |    4 +-
 core/updateCopyrightCheck.py                    |    7 +-
 dcs/LICENSE.txt                                 |  202 -
 dcs/NOTICE.txt                                  |    7 -
 .../org/trafodion/dcs/util/ByteBufferUtils.java |    2 -
 .../java/org/trafodion/dcs/util/SqlUtils.java   |    2 -
 .../org/trafodion/dcs/version/util/VerGen.java  |   19 -
 .../dcs-webapps/master/css/stylesheet.css       |  191 -
 dcs/src/test/pytests/.tox.ini.tmpl              |   21 -
 .../Trafodion_Client_Installation_Guide.xml     |    6 +-
 docs/client_install/source/xml-profile.xml      |    2 +-
 .../Trafodion_Command_Interface_Guide.xml       |   44 +-
 docs/command_interface/source/xml-profile.xml   |    2 +-
 docs/odb_manual/Trafodion_odb_User_Guide.xml    |    4 +-
 .../source/Trafodion_SQL_Reference_Manual.xml   |   10 +-
 docs/sql_reference/source/xml-profile.xml       |    2 +-
 install/Makefile                                |    2 -
 install/README.rst                              |   32 -
 install/installer/traf_getHadoopNodes           |   21 -
 licenses/LICENSE-bsd2                           |   14 +
 licenses/LICENSE-bsd4                           |   31 +
 licenses/LICENSE-facebook                       |   14 +
 licenses/LICENSE-js                             |   18 +
 licenses/LICENSE-salesforce                     |   23 +
 .../phoenix/end2end/AlterTableTest.java         |   21 -
 .../phoenix/end2end/ArithmeticQueryTest.java    |   21 -
 .../phoenix/end2end/AutoCommitTest.java         |   21 -
 .../org/trafodion/phoenix/end2end/BaseTest.java |   21 -
 .../phoenix/end2end/BinaryRowKeyTest.java       |   21 -
 .../phoenix/end2end/CoalesceFunctionTest.java   |   21 -
 .../end2end/CompareDecimalToLongTest.java       |   21 -
 .../phoenix/end2end/CreateTableTest.java        |   21 -
 .../phoenix/end2end/CustomEntityDataTest.java   |   21 -
 .../phoenix/end2end/DeleteRangeTest.java        |   21 -
 .../end2end/DescColumnSortOrderTest.java        |   21 -
 .../phoenix/end2end/DistinctCountTest.java      |   21 -
 .../phoenix/end2end/ExecuteStatementsTest.java  |   21 -
 .../phoenix/end2end/ExtendedQueryExecTest.java  |   21 -
 .../phoenix/end2end/FunkyNamesTest.java         |   21 -
 .../phoenix/end2end/GroupByCaseTest.java        |   21 -
 .../trafodion/phoenix/end2end/IndexTest.java    |   21 -
 .../trafodion/phoenix/end2end/IsNullTest.java   |   21 -
 .../trafodion/phoenix/end2end/KeyOnlyTest.java  |   21 -
 .../phoenix/end2end/MultiCfQueryExecTest.java   |   21 -
 .../trafodion/phoenix/end2end/OrderByTest.java  |   21 -
 .../phoenix/end2end/ProductMetricsTest.java     |   21 -
 .../phoenix/end2end/QueryExecTest.java          |   21 -
 .../end2end/QueryExecWithoutSCNTest.java        |   21 -
 .../phoenix/end2end/QueryPlanTest.java          |   21 -
 .../phoenix/end2end/ReadIsolationLevelTest.java |   21 -
 .../phoenix/end2end/SaltedTableTest.java        |   21 -
 .../end2end/SaltedTableUpsertSelectTest.java    |   21 -
 .../end2end/SaltedTableVarLengthRowKeyTest.java |   21 -
 .../phoenix/end2end/ServerExceptionTest.java    |   21 -
 .../phoenix/end2end/SkipScanQueryTest.java      |   21 -
 .../phoenix/end2end/StatementHintsTest.java     |   21 -
 .../trafodion/phoenix/end2end/StddevTest.java   |   21 -
 .../phoenix/end2end/ToCharFunctionTest.java     |   21 -
 .../phoenix/end2end/ToNumberFunctionTest.java   |   21 -
 .../org/trafodion/phoenix/end2end/TopNTest.java |   21 -
 .../phoenix/end2end/UpsertBigValuesTest.java    |   21 -
 .../end2end/UpsertSelectAutoCommitTest.java     |   21 -
 .../phoenix/end2end/UpsertSelectTest.java       |   21 -
 .../phoenix/end2end/UpsertValuesTest.java       |   21 -
 .../phoenix/end2end/VariableLengthPKTest.java   |   21 -
 win-odbc64/Krypton/KryptonBuild.bat             |   29 +-
 win-odbc64/Krypton/assocsvc.idl                 |   28 +-
 win-odbc64/Krypton/ca.idl                       |   30 +-
 win-odbc64/Krypton/ceecfg.idl                   |   27 +-
 win-odbc64/Krypton/ceercv.idl                   |   29 +-
 win-odbc64/Krypton/clientcfg.idl                |   32 +-
 win-odbc64/Krypton/generated_incs/cee.h         |   28 +-
 win-odbc64/Krypton/generated_incs/ceecfg.h      |   27 +-
 win-odbc64/Krypton/generated_incs/ceercv.h      |   27 +-
 win-odbc64/Krypton/generated_incs/glu.h         |   27 +-
 win-odbc64/Krypton/generated_incs/glu_rs.h      |   27 +-
 win-odbc64/Krypton/generated_incs/glu_stdexc.h  |   27 +-
 win-odbc64/Krypton/generated_incs/idltype.h     |   27 +-
 win-odbc64/Krypton/generated_incs/odbc.h        |   27 +-
 win-odbc64/Krypton/generated_incs/odbcCommon.h  |   27 +-
 win-odbc64/Krypton/generated_incs/odbc_cl.h     |   27 +-
 win-odbc64/Krypton/generated_incs/odbc_sv.h     |   27 +-
 win-odbc64/Krypton/generated_incs/odbcas_cl.h   |   27 +-
 win-odbc64/Krypton/generated_incs/odbcas_sv.h   |   27 +-
 win-odbc64/Krypton/generated_incs/odbccfg.h     |   27 +-
 win-odbc64/Krypton/generated_incs/odbccfg_cl.h  |   27 +-
 win-odbc64/Krypton/generated_incs/odbccfg_sv.h  |   27 +-
 .../Krypton/generated_incs/odbcsrvrcommon.h     |   27 +-
 .../Krypton/generated_incs/tdm_odbcSrvrMsg.h    |   28 +-
 win-odbc64/Krypton/idlcnp.bat                   |   27 +-
 win-odbc64/Krypton/odbc.idl                     |   29 +-
 win-odbc64/Krypton/odbcCommon.idl               |   29 +-
 win-odbc64/Krypton/odbcas.idl                   |   29 +-
 win-odbc64/Krypton/odbccfg.idl                  |   30 +-
 win-odbc64/Krypton/odbcsrvrcommon.idl           |   29 +-
 win-odbc64/Krypton/omxSec.idl                   |   30 +-
 .../odbcclient/DSNConverter/DSNConverter.def    |    2 +-
 .../TranslationDll/TranslationDll.def           |    2 +-
 wms/LICENSE.txt                                 |  202 -
 wms/NOTICE.txt                                  |   11 -
 wms/build.xml                                   |    2 +-
 176 files changed, 1092 insertions(+), 21107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/250ee055/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DatabaseMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/250ee055/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/250ee055/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/250ee055/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/250ee055/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/250ee055/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/250ee055/install/installer/traf_getHadoopNodes
----------------------------------------------------------------------
diff --cc install/installer/traf_getHadoopNodes
index 788276d,60020a5..b6b8884
--- a/install/installer/traf_getHadoopNodes
+++ b/install/installer/traf_getHadoopNodes
@@@ -1,25 -1,27 +1,4 @@@
 -#
 -# @@@ START COPYRIGHT @@@
 -#
 -# Licensed to the Apache Software Foundation (ASF) under one
 -# or more contributor license agreements.  See the NOTICE file
 -# distributed with this work for additional information
 -# regarding copyright ownership.  The ASF licenses this file
 -# to you under the Apache License, Version 2.0 (the
 -# "License"); you may not use this file except in compliance
 -# with the License.  You may obtain a copy of the License at
 -#
 -#   http://www.apache.org/licenses/LICENSE-2.0
 -#
 -# Unless required by applicable law or agreed to in writing,
 -# software distributed under the License is distributed on an
 -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 -# KIND, either express or implied.  See the License for the
 -# specific language governing permissions and limitations
 -# under the License.
 -#
 -# @@@ END COPYRIGHT @@@
 -#
 -
  #!/bin/bash
- # @@@ START COPYRIGHT @@@
- #
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership.  The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License.  You may obtain a copy of the License at
- #
- #   http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied.  See the License for the
- # specific language governing permissions and limitations
- # under the License.
- #
- # @@@ END COPYRIGHT @@@
- #
  
  source /etc/trafodion/trafodion_config
  TRAF_CONFIG=/etc/trafodion/trafodion_config

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/250ee055/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BaseTest.java
----------------------------------------------------------------------