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 18:20:10 UTC

[1/8] incubator-trafodion git commit: TRAFODION-1642: Release 1.3.0 copyrights and license files are incorrect

Repository: incubator-trafodion
Updated Branches:
  refs/heads/release1.3 3b27862e0 -> 8fd15ad9c


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/odbcas.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/odbcas.idl b/win-odbc64/Krypton/odbcas.idl
index 84579d9..9b8cf82 100644
--- a/win-odbc64/Krypton/odbcas.idl
+++ b/win-odbc64/Krypton/odbcas.idl
@@ -1,22 +1,25 @@
-/**********************************************************************
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-********************************************************************/
+**********************************************************************/
 /**************************************************************************
 **************************************************************************/
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/odbccfg.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/odbccfg.idl b/win-odbc64/Krypton/odbccfg.idl
index d15313c..5c34974 100644
--- a/win-odbc64/Krypton/odbccfg.idl
+++ b/win-odbc64/Krypton/odbccfg.idl
@@ -1,23 +1,25 @@
-/*************************************************************************
-*
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-**************************************************************************/
+**********************************************************************/
 //
 // MODULE:  ODBCCfg.IDL
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/odbcsrvrcommon.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/odbcsrvrcommon.idl b/win-odbc64/Krypton/odbcsrvrcommon.idl
index 3f86af1..a8cdb33 100644
--- a/win-odbc64/Krypton/odbcsrvrcommon.idl
+++ b/win-odbc64/Krypton/odbcsrvrcommon.idl
@@ -1,22 +1,25 @@
-/**********************************************************************
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-********************************************************************/
+**********************************************************************/
 /**************************************************************************
 **************************************************************************/
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/omxSec.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/omxSec.idl b/win-odbc64/Krypton/omxSec.idl
index 9455732..f0b96f3 100644
--- a/win-odbc64/Krypton/omxSec.idl
+++ b/win-odbc64/Krypton/omxSec.idl
@@ -1,23 +1,25 @@
-/*************************************************************************
-*
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-**************************************************************************/
+**********************************************************************/
 //
 // MODULE: omxSec.IDL 
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/odbcclient/DSNConverter/DSNConverter.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/DSNConverter.def b/win-odbc64/odbcclient/DSNConverter/DSNConverter.def
index 7b5d5ae..a853e4c 100644
--- a/win-odbc64/odbcclient/DSNConverter/DSNConverter.def
+++ b/win-odbc64/odbcclient/DSNConverter/DSNConverter.def
@@ -23,7 +23,7 @@
 
 ; DSNConverter.def : Declares the module parameters for the DLL.
 
-DESCRIPTION "ODBC/MX DSN Converter DLL, (C) Copyright 2002-2015 Hewlett-Packard Development Company, L.P."
+DESCRIPTION "ODBC/MX DSN Converter DLL, (C) Copyright (c) 2015 Apache Software Foundation"
 LIBRARY DSNConverter
 EXPORTS
 	IsDriverInstalled @1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/odbcclient/TranslationDll/TranslationDll.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.def b/win-odbc64/odbcclient/TranslationDll/TranslationDll.def
index 6ea5a6f..3b3e896 100644
--- a/win-odbc64/odbcclient/TranslationDll/TranslationDll.def
+++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll.def
@@ -21,7 +21,7 @@
 
 ; TranslationDll.def : Declares the module parameters for the DLL.
 
-;DESCRIPTION "ODBC Translation DLL, Copyright 2015 by Hewlett-Packard Development Company, L.P."
+;DESCRIPTION "ODBC Translation DLL, Copyright (c) 2015 Apache Software Foundation"
 LIBRARY hp_translation03
 EXPORTS
 	SQLDriverToDataSource @1


[8/8] incubator-trafodion git commit: Merge [TRAFODION-1642] PR 209 License fixes into release 1.3 branch

Posted by db...@apache.org.
Merge [TRAFODION-1642] PR 209 License fixes into release 1.3 branch


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

Branch: refs/heads/release1.3
Commit: 8fd15ad9ce2666e588dd554ca8f564d9a8ed41db
Parents: 3b27862 820ac3d
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Dec 8 17:19:02 2015 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Dec 8 17:19:02 2015 +0000

----------------------------------------------------------------------
 .gitattributes                                  |  14 ++
 .rat-excludes                                   | 113 +++++++++---
 LICENSE.txt                                     | 178 ++++++++++++-------
 NOTICE.txt                                      |   1 +
 RAT_README.txt                                  |  95 ++++++----
 README.txt                                      |  33 +++-
 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/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 --
 .../org/trafodion/dcs/version/util/VerGen.java  |  19 --
 dcs/src/test/pytests/.tox.ini.tmpl              |  21 ---
 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 +-
 140 files changed, 979 insertions(+), 2403 deletions(-)
----------------------------------------------------------------------



[6/8] incubator-trafodion git commit: added back .gitignore and added .gitattributes

Posted by db...@apache.org.
added back .gitignore and added .gitattributes


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

Branch: refs/heads/release1.3
Commit: b8f993a02e5f86f6676cc0a51e3bd6c704b11c2c
Parents: 30bd43f
Author: Roberta Marton <ro...@esgyn.com>
Authored: Fri Dec 4 22:08:45 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Fri Dec 4 22:08:45 2015 +0000

----------------------------------------------------------------------
 .rat-excludes | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b8f993a0/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index ea14448..f06796f 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -1,6 +1,9 @@
 # List of files to exclude from RAT, see RAT_README.txt for details
 # this file
 .rat-excludes*
+# git files
+.gitignore
+.gitattributes
 # test files
 EXPECTED*
 DIFF*


[4/8] incubator-trafodion git commit: TRAFODION-1642: Release 1.3.0 copyrights and license files are incorrect

Posted by db...@apache.org.
TRAFODION-1642: Release 1.3.0 copyrights and license files are incorrect

Part 2 of copyright and licensing changes

Removed double copyrights in files
Updated LICENSE, README, RAT_README to reflect latest changes
Added licenses directory to include license text
Added .gitattributes to exclude files from the source tar file
Changed Hewlett Packard copyright to Apache copyrights in win-odbc


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

Branch: refs/heads/release1.3
Commit: d44f32e7a13cd5a916bdef04a0d0e15448e81d1b
Parents: 3b27862
Author: Roberta Marton <ro...@esgyn.com>
Authored: Fri Dec 4 18:34:11 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Fri Dec 4 18:34:11 2015 +0000

----------------------------------------------------------------------
 .gitattributes                                  |  14 ++
 .rat-excludes                                   | 107 ++++++++---
 LICENSE.txt                                     | 178 ++++++++++++-------
 NOTICE.txt                                      |   1 +
 RAT_README.txt                                  |  95 ++++++----
 README.txt                                      |  33 +++-
 core/conn/security_dll/LICENSE                  | 127 -------------
 core/sqf/conf/log4j.dtm.config                  |  22 ---
 core/sqf/conf/log4j.hdfs.config                 |  22 ---
 core/sqf/conf/trafodion.udr.config              |  22 ---
 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 --
 .../org/trafodion/dcs/version/util/VerGen.java  |  19 --
 dcs/src/test/pytests/.tox.ini.tmpl              |  21 ---
 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 +-
 138 files changed, 972 insertions(+), 2400 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..96fb813
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,14 @@
+# git files
+.gitignore export-ignore
+.gitattributes export-ignore
+# Contains a Damian (GNU) copyright which is not supported, file not used
+core/sqf/export/lib/Parse/RecDescent.pm export-ignore
+# Remove documentation until until our generation code is available
+docs/client_install export-ignore
+docs/command_interface export-ignore
+docs/odb_manual export-ignore
+docs/sql_reference export-ignore
+docs/src/site export-ignore
+# used for Compiler GUI which we don't support yet
+core/sqf/export/limited-support-tools/QPDrawer
+core/sql/SqlCompilerDebugger/Resource.qrc

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 9733293..2804a67 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -1,8 +1,11 @@
+# List of files to exclude from RAT, see RAT_README.txt for details
+# this file
+.rat-excludes*
+# test files
 EXPECTED*
 DIFF*
 eqat*
 qat*
-.gitignore
 .data*
 sample_events*
 FILTER*
@@ -12,53 +15,53 @@ expected*
 COMPARE*
 expat*
 regress*
-.gitignore
-.qrc
 regtest_*
+montest_readme.txt
+test-requirements.txt*
+# protocol buffers
 dtm*.*.pb.cc
 protobuf*
+# make
 package.exclude.*
-jdbct2.jar.version*
-jdbct4.jar.version*
-genvers*
+package.exclude
+# readme files
 readme*
 README*
-package.exclude
+RAT_README.txt
+readme.md
+run_me*
+# documentation and build info 
 eclipse.*cproject*
+eclipse.project
+doxygen_tmudr.1.6.config
+# Files needed by txn coprocesser - hbase
 Hbase_server.skeleton.cpp*
 __init__.py*
-run_me*
+# SQL messages file
 SqlciErrors.txt
-doxygen_tmudr.1.6.config
+# DCS config files
 backup-masters
 servers
-stylesheet.css
-license*.txt*
-demo*.css*
-Sortingicons.psd*
+# jquery
 jquery-ui.css*
 jquery-ui.js*
 jquery-ui.structure.css*
 jquery-ui.theme.css*
 jquery-1.11.0.js*
-test-requirements.txt*
-SetCertificateDirReg_os.sln*
-SetCertificateDirReg.rc*
-.props*
-.sln*
+demo*.css*
+Sortingicons.psd*
+# licenses
+license*.txt*
 LICENSE.rtf*
-.ism*
-resource.h*
-resource.hm*
-.rat-excludes*
-RAT_README.txt
-readme.md
-eclipse.project
-usage.csv
-montest_readme.txt
-Resource.qrc
+LICENSE-bds2
+LICENSE-bsd4
+LICENSE-js
+LICENSE-salesforce
+# win generated
 SetCertificateDirReg_os.vcxproj*
 SetCertificateDirReg_os.vcxproj.*
+SetCertificateDirReg_os.sln*
+SetCertificateDirReg.rc*
 odbccp32.props
 UpdateDSN_os.sln
 UpdateDSN*.vcxproj*
@@ -98,9 +101,57 @@ TCPIPV4.*
 TCPIPV6.*
 TCPIPV4_os.*
 TCPIPV6_os.*
+.props*
+.sln*
+.ism*
+resource.h*
+resource.hm*
+# BSD licensed files
 swscanf.cpp
 swsprintf.cpp
 ulexer.h
+#phoenix tests - MIT licensed from Salesforce
+AlterTableTest.java
+ArithmeticQueryTest.java
+AutoCommitTest.java
+BaseTest.java
+BinaryRowKeyTest.java
+CoalesceFunctionTest.java
+CompareDecimalToLongTest.java
+CreateTableTest.java
+CustomEntityDataTest.java
+DeleteRangeTest.java
+DescColumnSortOrderTest.java
+DistinctCountTest.java
+ExecuteStatementsTest.java
+ExtendedQueryExecTest.java
+FunkyNamesTest.java
+GroupByCaseTest.java
+IndexTest.java
+IsNullTest.java
+KeyOnlyTest.java
+MultiCfQueryExecTest.java
+OrderByTest.java
+ProductMetricsTest.java
+QueryExecTest.java
+QueryExecWithoutSCNTest.java
+QueryPlanTest.java
+ReadIsolationLevelTest.java
+SaltedTableTest.java
+SaltedTableUpsertSelectTest.java
+SaltedTableVarLengthRowKeyTest.java
+ServerExceptionTest.java
+SkipScanQueryTest.java
+StatementHintsTest.java
+StddevTest.java
+ToCharFunctionTest.java
+ToNumberFunctionTest.java
+TopNTest.java
+UpsertBigValuesTest.java
+UpsertSelectAutoCommitTest.java
+UpsertSelectTest.java
+UpsertValuesTest.java
+VariableLengthPKTest.java
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 39234e7..ecf3865 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -200,72 +200,128 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
--------------------------------------------------------------------------------
+===============================================================================
+===============================================================================
 
 APACHE TRAFODION SUBCOMPONENTS: 
 
-Apache Trafodion includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses. 
+Apache Trafodion includes a number of subcomponents with separate copyright 
+notices and license terms. Your use of the source code for the these 
+subcomponents is subject to the terms and conditions of the following licenses. 
 
--------------------------------------------------------------------------------
+===============================================================================
+Apache Trafodion uses Apache licenses as follows:
 
-The following are covered by the BSD license:
+For file incubator-trafodion/core/sql/export/FBString.h:
+
+Apache Trafodion uses Facebook's string class that has been adapted to use 
+Trafodion's memory manager 
+
+ Copyright 2013 Facebook, Inc.
+
+For details see incubator-trafodion/licenses/LICENSE-facebook
+
+===============================================================================
+Apache Trafodion uses several BSD like licenses:
+
+For files:
+   incubator-trafodion/core/sql/common/swsprintf.cpp
+   incubator-trafodion/core/sql/common/swscanf.cpp
+
+ Copyright (c) 1990 The Regents of the University of California.
+ Copyright (c) 1990, 1993 The Regents of the University of California.
+
+For details see incubator-trafodion/licenses/LICENSE-bsd4
+
++++++++++++++++++++++++++++++
+
+For file incubator-trafodion/core/sql/parser/ulexer.h
+
+ Copyright (c) 1993 The Regents of the University of California.
+
+For details see incubator-trafodion/licenses/LICENSE-bsd2
+
++++++++++++++++++++++++++++++
+
+For files in:
+  incubator-trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end
+
+Apache Trafodion changed these files to work within its test environment
+
+ Copyright (c) 2013, Salesforce.com, Inc.
+
+For details see incubator-trafodion/licenses/LICENSE-salesforce
+
++++++++++++++++++++++++++++++
+
+For files in:  
    incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables
-   incubator-traofodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
-   incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib
-
-The BSD license:
-
-Copyright (c) 2008-2010, Allan Jardine
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-    * Neither the name of Allan Jardine nor SpryMedia UK may be used to endorse 
-      or promote products derived from this software without specific prior 
-      written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR 
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
-OF SUCH DAMAGE.
-i
--------------------------------------------------------------------------------
-
-The following is covered by the MIT license:
-   incubator-trafodion/core/sql/qmscommon/expat
-
-The MIT License (MIT)
-Copyright (C) 2008-2015, SpryMedia Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+
+ Copyright 2009 Allan Jardine. All Rights Reserved
+ Copyright 2008-2012 Allan Jardine, all rights reserved.
+
+For details see:
+  incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt
+
++++++++++++++++++++++++++++++
+
+For files in:
+   incubator-trafodion/core/sqf/src/tm/*.pb.cc
+   incubator-trafodion/core/sqf/src/seatrans/hbase-trx/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/*
+
+Trafodion uses Protocol Buffer Java API (com.google.protobuf:protobuf-java:2.5.0) 
+For details see http://code.google.com/p/protobuf
+
+===============================================================================
+Apache Trafodion uses several MIT like licenses:
+
+For files in: 
+   incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js
+
+ Copyright (c) 2011 Sencha Inc. - Author: Nicolas Garcia Belmonte 
+   (http://philogb.github.com/)
+
+For details see incubator-trafodion/licenses/LICENSE-js
+
++++++++++++++++++++++++++++++
+
+For files in: incubator-trafodion/core/sql/qmscommon/expat
+
+ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+                                and Clark Cooper
+ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+ Copyright 2000, Clark Cooper
+
+For details see incubator-trafodion/core/sql/qmscommon/expat/COPYING
+
++++++++++++++++++++++++++++++
+
+For files in:
+   incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
+
+ Copyright 2014 jQuery Foundation and other contributors
+
+For details see http://jquery.org/license
+
+++++++++++++++++++++++++++++++
+
+Apache Trafodion uses asciidocs to create its documentation which is licensed
+under MIT 
+
+For details see http://asciidoctor.org/
+
+===============================================================================
+As part of test large objects (LOBs), the testware needs some object files.
+Two pictures were donated for this purpose by Christophe LeRouzo.  He has
+formally given Apache Trafodion to permission to use these picturs.
+
+incubator-trafodion/core/sql/regress/executor/anoush.jpg
+incubator-trafodion/core/sql/regress/executor/deep.jpg
+
+===============================================================================
+===============================================================================
+ 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 24c459d..ff36a82 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -6,3 +6,4 @@ The Apache Software Foundation (http://www.apache.org/).
 
 In addition, this product includes software developed by
 Copyright 2004-2015 Hewlett-Packard Development Company, L.P.
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/RAT_README.txt
----------------------------------------------------------------------
diff --git a/RAT_README.txt b/RAT_README.txt
index 158971b..1f12792 100644
--- a/RAT_README.txt
+++ b/RAT_README.txt
@@ -26,10 +26,6 @@ FILE             :  what the file is used for
                  -> reason why file is excluded
 --------------------------------------------------------------------------------
           
-.gitignore       :  found in several directories, these files contains patterns 
-                    for untracked files that git ignores
-                 -> git does not allow these files to contain comments
-
 .rat-excludes    :  file used by RAT to exclude files 
                  -> rat does not allow this file to contain comments
 
@@ -41,50 +37,31 @@ $MY_SQROOT/export/limited-support-tools/eclipse.*project*
                  :  Eclipse related project file
                  -> Eclipse does not handle comments
 
-$MY_SQROOT/export/limited-support-tools/QPDrawer/usage.csv 
-                 :  Macro file cannot have comments.
-                 -> cvs files do 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/* 
                  :  Generated from 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  
-                 :  Autogenerated skeleton file copied from hbase 
+                 :  Autogenerated skeleton file copied from hbase used by our coprocessors
                  -> generated files do not contain Apache license information
 
-$MY_SQROOT/src/seatranshbase-trx/src/main/python/thrift1/gen-py/hbase/__init__.py 
+$MY_SQROOT/src/seatrans/hbase-trx/src/main/python/thrift1/gen-py/hbase/__init__.py 
                  :  Autogenerated python file copied from hbase  
-                 -> generated files doe not contain Apache license information
-
-$MY_SQROOT/src/tm/*.pb.cc 
-                 :  Generated from google protobuf compiler
-                 -> generated files do not contain Apache license information
-
-$MY_SQROOT/../sql/SqlCompilerDebugger/Resource.qrc 
-                 :  Generated file 
                  -> generated files do not contain Apache license information
 
 $MY_SQROOT/../sql/sqludr/doxygen_*.1.6.config 
-                 :  Generated file by Doxygen 
-                 -> generated files do not contain Apache license information
+                 :  Configuration file used to generate UDR documentation
+                 -> configuration file do not handle comments
 
 $MY_SQROOT/../sql/bin/SqlciErrors.txt
-                 :  file containing all the messages used by Trafodion
+                 :  file containing all the messages used by Apache Trafodion
                  -> this file does not handle comments
 
-$MY_SQROOT/monitor/linux/montest_readme.txt
-
-dcs/conf/servers :  DCS default configuration file
-                 -> does not handle comments in these files
-
+dcs/conf/servers 
 dcs/conf/backup-masters 
-                 :  DCS default configuraiotn file
-                 -> configuration files do not handle comments
-
-dcs/src/main/resources/dcs-webapps/master/css/stylesheet.css 
-                 :  header acknowledges Codify Design Studio. 
-                 -> we cannot add our own copyright to this 
+                 :  Apache Trafodion DCS default configuration file
+                 -> configuration file do not handle comments
 
 -------------------------------------------------------------------------------
 
@@ -97,6 +74,7 @@ $MY_SQROOT/../sql/regress/*/DIFF*
 $MY_SQROOT/../sql/regress/executor/lob_input*.txt 
 $MY_SQROOT/../sql/regress/udr/romeo*.txt 
 dcs/src/test/pytests/test-requirements.txt
+$MY_SQROOT/monitor/linux/montest_readme.txt
 
 -------------------------------------------------------------------------------
 
@@ -125,6 +103,8 @@ copyrights which are covered by MIT
 
 The following files are open source from The Regents of the University of 
 California which are covered by BDS license
+-> cannot overwrite copyright information, license has been added to 
+   LICENSE.txt
 
 core/sql/common/swscanf.cpp
 core/sql/common/swsprintf.cpp
@@ -137,7 +117,6 @@ The following files in dcs directory have their own BSD license
     LICENSE.txt
  
  dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt
- dcs/src/main/resources/dcs-webapps/master/datatables/license-gpl2.txt
  dcs/src/main/resources/dcs-webapps/master/datatables/css/demo_page.css
  dcs/src/main/resources/dcs-webapps/master/datatables/css/demo_table.css
  dcs/src/main/resources/dcs-webapps/master/datatables/css/demo_table_jui.css
@@ -150,3 +129,53 @@ The following files in dcs directory have their own BSD license
  dcs/src/main/resources/dcs-webapps/master/jquery-ui/jquery-ui.structure.css
  dcs/src/main/resources/dcs-webapps/master/jquery-ui/jquery-ui.theme.css
  dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js
+
+-------------------------------------------------------------------------------
+
+The following test files from Phoenix are used in our testing.  They have
+their own MIT license
+--> cannot overwrite copyright information, license has been added to
+    LICENSE.txt
+
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/AlterTableTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/ArithmeticQueryTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/AutoCommitTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/BaseTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/BinaryRowKeyTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/CoalesceFunctionTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/CompareDecimalToLongTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/CreateTableTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/CustomEntityDataTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/DeleteRangeTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/DescColumnSortOrderTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/DistinctCountTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExecuteStatementsTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExtendedQueryExecTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/FunkyNamesTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/GroupByCaseTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/IndexTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/IsNullTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/KeyOnlyTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/MultiCfQueryExecTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/OrderByTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/ProductMetricsTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecWithoutSCNTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryPlanTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/ReadIsolationLevelTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableUpsertSelectTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/ServerExceptionTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/SkipScanQueryTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/StatementHintsTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/StddevTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToCharFunctionTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToNumberFunctionTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/TopNTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertBigValuesTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectAutoCommitTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertValuesTest.java
+tests/phx/src/test/java/org/trafodion/phoenix/end2end/VariableLengthPKTest.java
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 000adcf..8df03c0 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-****************************** Apache Trafodion ******************************
+******************************* Apache Trafodion *******************************
 
 Apache Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or 
 operational workloads on Hadoop.  The name "Trafodion" (the Welsh word for 
@@ -11,8 +11,8 @@ Hadoop.
 
 To get started using Apache Trafodion: 
 
-  - documentation for this release can be found under the doc/* directory or 
-    viewed on the Apache Trafodion wiki page: 
+  - documentation for this release can be viewed on the Apache Trafodion 
+    wiki page: 
       https://cwiki.apache.org/confluence/display/TRAFODION/Documentation
 
   - release notes describing changes for release 1.3.0 can be viewed:
@@ -22,7 +22,7 @@ To get started using Apache Trafodion:
     distribution site or accessed from git
 
     - download site:
-      https://dist.apache.org/repos/dist/release/incubator/
+      https://dist.apache.org/repos/dist/release/incubator/trafodion
 
     - git site:
       git@github.com:apache/incubator-trafodion  
@@ -31,5 +31,28 @@ To get started using Apache Trafodion:
     instructions as described:
       https://cwiki.apache.org/confluence/display/TRAFODION/Using+the+Software
 
-Apache Trafodion is distributed under the terms of the Apache License, Version 2.0.
+=============================
+Cryptographic software notice
+=============================
+
+This distribution includes cryptographic software. The country in which you 
+currently reside may have restrictions on the import, possession, use, and/or 
+re-export to another country, of encryption software. BEFORE using any 
+encryption software, please check your country's laws, regulations and policies 
+concerning the import, possession, or use, and re-export of encryption software, 
+to see if this is permitted. See <http://www.wassenaar.org/> for more 
+information.  The U.S. Government Department of Commerce, Bureau of Industry and 
+Security (BIS), has classified this software as Export Commodity Control Number
+(ECCN) 5D002.C.1, which includes information security software using or 
+performing cryptographic functions with asymmetric algorithms. The form and 
+manner of this Apache Software Foundation distribution makes it eligible for 
+export under the License Exception ENC Technology Software Unrestricted (TSU) 
+exception (see the BIS Export Administration Regulations, Section 740.13) for 
+both object code and source code.
+
+The following provides more details on the included cryptographic software:
+
+The product includes OpenSSL libraries which can be used by the product to 
+encode and decode passwords through the connectivity interface.
 
+Apache Trafodion is distributed under the terms of the Apache License, Version 2.0.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/conn/security_dll/LICENSE
----------------------------------------------------------------------
diff --git a/core/conn/security_dll/LICENSE b/core/conn/security_dll/LICENSE
deleted file mode 100644
index e47d101..0000000
--- a/core/conn/security_dll/LICENSE
+++ /dev/null
@@ -1,127 +0,0 @@
-
-  LICENSE ISSUES
-  ==============
-
-  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
-
-  OpenSSL License
-  ---------------
-
-/* ====================================================================
- * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/conf/log4j.dtm.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4j.dtm.config b/core/sqf/conf/log4j.dtm.config
index 0d62591..69bea7e 100644
--- a/core/sqf/conf/log4j.dtm.config
+++ b/core/sqf/conf/log4j.dtm.config
@@ -21,28 +21,6 @@
 # @@@ END COPYRIGHT @@@
 #
 
-# @@@ 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 @@@
-#
-
 # Define some default values that can be overridden by system properties
 hbase.root.logger=INFO,hbaseclient
 #hbase.log.dir=.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/conf/log4j.hdfs.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/log4j.hdfs.config b/core/sqf/conf/log4j.hdfs.config
index 397f338..9505331 100644
--- a/core/sqf/conf/log4j.hdfs.config
+++ b/core/sqf/conf/log4j.hdfs.config
@@ -21,28 +21,6 @@
 # @@@ END COPYRIGHT @@@
 #
 
-# @@@ 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 @@@
-#
-
 # Define some default values that can be overridden by system properties
 hbase.root.logger=INFO,hbaseclient
 hbase.log.dir=.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/conf/trafodion.udr.config
----------------------------------------------------------------------
diff --git a/core/sqf/conf/trafodion.udr.config b/core/sqf/conf/trafodion.udr.config
index df1bca7..09de7a4 100644
--- a/core/sqf/conf/trafodion.udr.config
+++ b/core/sqf/conf/trafodion.udr.config
@@ -21,28 +21,6 @@
 # @@@ END COPYRIGHT @@@
 #
 
-# @@@ 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 @@@
-#
-
 # Configuration file for TDM_UDRSERV process
 # Located at $MY_SQROOT/conf/trafodion.udr.config
 # Location of property file can be specified through TRAFUDRCFG env variable

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/sql/scripts/sqnodes.pm
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqnodes.pm b/core/sqf/sql/scripts/sqnodes.pm
index f278f2f..6d12bd5 100755
--- a/core/sqf/sql/scripts/sqnodes.pm
+++ b/core/sqf/sql/scripts/sqnodes.pm
@@ -24,7 +24,12 @@
 use strict;
 use Exporter ();
 
-use Parse::RecDescent;
+# Uncomment if using the RecDescent Parser
+# The Parse::RecDescent code is open source code licensed under GNU
+# At this time Apache does not support GNU licenses so the code that
+# uses RecDescent is commented out.  If a decision is made to use this
+# code, then the licensing issues needs to be resolved.
+# use Parse::RecDescent;
 
 package sqnodes;
 
@@ -406,7 +411,8 @@ sub verifyParse
 
 };
 
-my $parse = new Parse::RecDescent ($grammar) || die "Bad grammar! No biscuit!\n";
+# Uncomment if using the RecDescent Parser
+#my $parse = new Parse::RecDescent ($grammar) || die "Bad grammar! No biscuit!\n";
 
 sub parseStmt
 {
@@ -414,10 +420,72 @@ sub parseStmt
 # Set RD_TRACE to get detail trace of parsing steps.
 #    $::RD_TRACE = 1;
 
+    chomp($_);
     $stmt = $_;
     resetVars();
-    $parse->statement($stmt);
+    my @KeyValues=split(';',$stmt);
+
+    # Assuming the statement type to be 1, i.e. containing
+    # node_id, node_name, cores, processors, roles
+    $::g_sqStmtType = 1;
+
+    for (my $i = 0; $i <= $#KeyValues; $i++) {
+
+	my $KeyValue=$KeyValues[$i];
+	if ($::g_sqParseDebugFlag) {
+	    print "KeyValues[$i]=", $KeyValue, "\n";
+	}
+	my @KeyValuePair = split('=', $KeyValue);
+	my $Key = $KeyValuePair[0];
+	my $Value = $KeyValuePair[1];
+	if ($::g_sqParseDebugFlag) {
+	    print "Key: ", $Key, " Value: ", $Value, "\n";
+	}
+
+	if ($Key eq 'node-id') {
+	    $::g_sqNodeId = $Value;
+	}
+	elsif ($Key eq 'node-name') {
+	    $::g_sqNodeName = $Value;
+	}
+	elsif ($Key eq 'cores') {
+	    @::g_sqCores = split('-', $Value);
+	    if ($::g_sqParseDebugFlag) {
+		print "cores=@::g_sqCores\n";
+	    };
+	}
+	elsif ($Key eq 'processors') {
+	    $::g_sqProcessors = $Value;
+	}
+	elsif ($Key eq 'roles') {
+	    @::g_sqRoles = split(',', $Value);
+	    if ($::g_sqParseDebugFlag) {
+		my $numRoles = @::g_sqRoles + 0;
+		print "numRoles=$numRoles roles=@::g_sqRoles\n";
+	    }
+	}
+    }
+
+    sqnodes::verifyParse();
+    
+    if ($errors != 0) { # Had errors
+        return 1;
+    }
+}
+
+sub parseStmtRecursiveDescent
+{
+# Not using the RecDescent Parser, so return an error 
+    return 1;
+# Set RD_TRACE to get detail trace of parsing steps.
+#    $::RD_TRACE = 1;
+
+    $stmt = $_;
+    resetVars();
+# Uncomment if using the RecDescent Parser
+#    $parse->statement($stmt);
     sqnodes::verifyParse();
+    
     if ($errors != 0) { # Had errors
         return 1;
     }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/BatchException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/BatchException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/BatchException.java
index 4b634a6..65e8c0a 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/BatchException.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/BatchException.java
@@ -21,27 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
-
 package org.apache.hadoop.hbase.client.transactional;
 
 public enum BatchException {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/CommitUnsuccessfulException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/CommitUnsuccessfulException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/CommitUnsuccessfulException.java
index b1b6837..3b49c6b 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/CommitUnsuccessfulException.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/CommitUnsuccessfulException.java
@@ -21,25 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation
- *
- * 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.
- */
 package org.apache.hadoop.hbase.client.transactional;
 
 /** Thrown when a transaction cannot be committed. 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/HBaseBackedTransactionLogger.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/HBaseBackedTransactionLogger.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/HBaseBackedTransactionLogger.java
index 0287330..5561aa1 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/HBaseBackedTransactionLogger.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/HBaseBackedTransactionLogger.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.client.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/JtaXAResource.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/JtaXAResource.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/JtaXAResource.java
index e5fad40..6cef5ee 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/JtaXAResource.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/JtaXAResource.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.client.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/LocalTransactionLogger.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/LocalTransactionLogger.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/LocalTransactionLogger.java
index ff103b2..f8e0d93 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/LocalTransactionLogger.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/LocalTransactionLogger.java
@@ -21,25 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation
- *
- * 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.
- */
 package org.apache.hadoop.hbase.client.transactional;
 
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/MemoryUsageException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/MemoryUsageException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/MemoryUsageException.java
index 7503cfd..7eace6d 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/MemoryUsageException.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/MemoryUsageException.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 package org.apache.hadoop.hbase.client.transactional;
 
 /** Thrown when the memory usage percentage for a regionserver is

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/OutOfOrderProtocolException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/OutOfOrderProtocolException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/OutOfOrderProtocolException.java
index daf180c..166ec03 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/OutOfOrderProtocolException.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/OutOfOrderProtocolException.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 package org.apache.hadoop.hbase.client.transactional;
 
 /** Thrown when the TrxRegionEndpoint openScanner, performScan,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java
index 5747e92..ea73602 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java
index c62061b..927b0d1 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalScanner.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
index c2ded05..7bc51cb 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccUpdateConflictException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccUpdateConflictException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccUpdateConflictException.java
index 74516e8..2db3638 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccUpdateConflictException.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccUpdateConflictException.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 package org.apache.hadoop.hbase.client.transactional;
 
 /** Thrown when a transaction cannot be committed. 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TmDDL.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TmDDL.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TmDDL.java
index 28dbc44..d0922e5 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TmDDL.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TmDDL.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 
 package org.apache.hadoop.hbase.client.transactional;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransReturnCode.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransReturnCode.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransReturnCode.java
index 8ba43fd..7d66a8c 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransReturnCode.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransReturnCode.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransState.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransState.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransState.java
index 7534256..e8a6df2 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransState.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransState.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionLogger.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionLogger.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionLogger.java
index fc196a0..963e949 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionLogger.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionLogger.java
@@ -21,25 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation
- *
- * 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.
- */
 package org.apache.hadoop.hbase.client.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
index f8f5eaf..f32c5fe 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionMap.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionMap.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionMap.java
index 486ab62..4c4915f 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionMap.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionMap.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 
@@ -67,4 +47,4 @@ public class TransactionMap {
   public static synchronized ConcurrentHashMap<Long, TransactionState> getInstance() {
     return g_mapTransactionStates;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionRegionLocation.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionRegionLocation.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionRegionLocation.java
index d77bc94..1656a52 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionRegionLocation.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionRegionLocation.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 package org.apache.hadoop.hbase.client.transactional;
 
 import org.apache.commons.logging.Log;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionState.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionState.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionState.java
index 53c4951..57772a1 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionState.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionState.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 package org.apache.hadoop.hbase.client.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalAggregationClient.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalAggregationClient.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalAggregationClient.java
index 600eee5..4c4bb24 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalAggregationClient.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalAggregationClient.java
@@ -21,25 +21,6 @@
 * @@@ END 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.
- */
-
 package org.apache.hadoop.hbase.client.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java
index 29979d9..379b1b0 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
index 419664b..20450d1 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTable.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTableClient.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTableClient.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTableClient.java
index d00d3c0..2a7a9cd 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTableClient.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalTableClient.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 
 package org.apache.hadoop.hbase.client.transactional;
 



[5/8] incubator-trafodion git commit: Minor update to .rat-excludes file

Posted by db...@apache.org.
Minor update to .rat-excludes file


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

Branch: refs/heads/release1.3
Commit: 30bd43f424ff23ac16329d089522fd38964017ee
Parents: d44f32e
Author: Roberta Marton <ro...@esgyn.com>
Authored: Fri Dec 4 18:55:11 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Fri Dec 4 18:55:11 2015 +0000

----------------------------------------------------------------------
 .rat-excludes | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/30bd43f4/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 2804a67..ea14448 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -53,7 +53,7 @@ Sortingicons.psd*
 # licenses
 license*.txt*
 LICENSE.rtf*
-LICENSE-bds2
+LICENSE-bsd2
 LICENSE-bsd4
 LICENSE-js
 LICENSE-salesforce
@@ -110,6 +110,9 @@ resource.hm*
 swscanf.cpp
 swsprintf.cpp
 ulexer.h
+# Compiler GUI files
+usage.csv
+Resource.qrc
 #phoenix tests - MIT licensed from Salesforce
 AlterTableTest.java
 ArithmeticQueryTest.java


[3/8] incubator-trafodion git commit: TRAFODION-1642: Release 1.3.0 copyrights and license files are incorrect

Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnknownTransactionException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnknownTransactionException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnknownTransactionException.java
index 361f9e9..05464a3 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnknownTransactionException.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnknownTransactionException.java
@@ -21,25 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation
- *
- * 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.
- */
 package org.apache.hadoop.hbase.client.transactional;
 
 import org.apache.hadoop.hbase.DoNotRetryIOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnsuccessfulDDLException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnsuccessfulDDLException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnsuccessfulDDLException.java
index 93d5511..9e7baf5 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnsuccessfulDDLException.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/UnsuccessfulDDLException.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 package org.apache.hadoop.hbase.client.transactional;
 
 /** Thrown when a transaction specific to DDL operation cannot be committed. 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java
index 1d54977..143204f 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java
@@ -21,27 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
-
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClient.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClient.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClient.java
index f76e1a0..65e1e3e 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClient.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClient.java
@@ -21,27 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
-
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClientUtils.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClientUtils.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClientUtils.java
index 84d61fa..8255288 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClientUtils.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccTableClientUtils.java
@@ -23,24 +23,6 @@
 
 // SsccTableClient.java
 
-/**
- * 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.
- **/
-
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
index 16153c3..e73e41a 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
@@ -21,26 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
index 521ee14..ddf4f4e 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
@@ -21,28 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/*
-* @@@ 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 @@@                                                          */
-
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient.java
index 7d0e292..9a123aa 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient.java
@@ -23,24 +23,6 @@
 
 // TrxTableClient.java
   
-/**
- * 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.
- **/
-
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient2.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient2.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient2.java
index 5f18e61..3787c4c 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient2.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient2.java
@@ -21,24 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * 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.
- **/
-
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient3.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient3.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient3.java
index 5147d80..f2955ac 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient3.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient3.java
@@ -23,24 +23,6 @@
 
 // TrxTableClient3.java
   
-/**
- * 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.
- **/
-
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient4.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient4.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient4.java
index 0787594..a3a5430 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient4.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxTableClient4.java
@@ -23,24 +23,6 @@
 
 // TrxTableClient4.java
   
-/**
- * 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.
- **/
-
 package org.apache.hadoop.hbase.coprocessor.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java
index cad26e1..d614a55 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java
index 0c28d0f..389b091 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTm.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2015 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import org.apache.commons.logging.Log;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmCb.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmCb.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmCb.java
index 570e9b7..9b4d3ea 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmCb.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmCb.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2015 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmException.java
index a70440b..e6051e6 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmException.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/IdTmException.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2015 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java
index 66f77e6..f6f0fd1 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/KeyValueListScanner.java
@@ -21,17 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/*
- * Copyright 2009 The Apache Software Foundation 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.
- */
-
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java
index bb73bd9..14053f3 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/MemoryUsageChore.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2015 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/SsccTransactionState.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/SsccTransactionState.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/SsccTransactionState.java
index 4e1e345..76e6e8c 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/SsccTransactionState.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/SsccTransactionState.java
@@ -21,27 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
-
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java
index e5db798..7bfc17d 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java
@@ -21,27 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-// @@@ 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 @@@
-
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java
index ef35189..9bba8b1 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java
index 7d337bb..c796c2c 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import org.apache.commons.logging.Log;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
index 8e464c5..79816d7 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
@@ -21,16 +21,6 @@
 * @@@ END COPYRIGHT @@@
 **/
 
-/**
- * Copyright 2009 The Apache Software Foundation 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.
- */
 package org.apache.hadoop.hbase.regionserver.transactional;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java b/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java
index de78241..3a49196 100644
--- a/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java
+++ b/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java
@@ -20,25 +20,6 @@ under the License.
 
 * @@@ END COPYRIGHT @@@
  */
-/**
- * Copyright 2011 The Apache Software Foundation
- *
- * 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.
- */
 
 package org.trafodion.dcs.version.util;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/dcs/src/test/pytests/.tox.ini.tmpl
----------------------------------------------------------------------
diff --git a/dcs/src/test/pytests/.tox.ini.tmpl b/dcs/src/test/pytests/.tox.ini.tmpl
index 45238c0..0ac5b63 100644
--- a/dcs/src/test/pytests/.tox.ini.tmpl
+++ b/dcs/src/test/pytests/.tox.ini.tmpl
@@ -19,27 +19,6 @@
 #
 # @@@ END COPYRIGHT @@@
 
-# @@@ 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 @@@
-
 [tox]
 minversion = 1.6
 envlist = py27,pep8

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/install/installer/traf_getHadoopNodes
----------------------------------------------------------------------
diff --git a/install/installer/traf_getHadoopNodes b/install/installer/traf_getHadoopNodes
index 9aa8da1..60020a5 100755
--- a/install/installer/traf_getHadoopNodes
+++ b/install/installer/traf_getHadoopNodes
@@ -22,27 +22,6 @@
 #
 
 #!/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/d44f32e7/licenses/LICENSE-bsd2
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-bsd2 b/licenses/LICENSE-bsd2
new file mode 100644
index 0000000..926729e
--- /dev/null
+++ b/licenses/LICENSE-bsd2
@@ -0,0 +1,14 @@
+This code is derived from software contributed to Berkeley by
+ Kent Williams and Tom Epperly.
+
+ Redistribution and use in source and binary forms with or without
+ modification are permitted provided that: (1) source distributions retain
+ this entire copyright notice and comment, and (2) distributions including
+ binaries display the following acknowledgement:  ``This product includes
+ software developed by the University of California, Berkeley and its
+ contributors'' in the documentation or other materials provided with the
+ distribution and in all advertising materials mentioning features or use
+ of this software.  Neither the name of the University nor the names of
+ its contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/licenses/LICENSE-bsd4
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-bsd4 b/licenses/LICENSE-bsd4
new file mode 100644
index 0000000..2675dab
--- /dev/null
+++ b/licenses/LICENSE-bsd4
@@ -0,0 +1,31 @@
+ This code is derived from software contributed to Berkeley by
+ Chris Torek.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+      This product includes software developed by the University of
+      California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/licenses/LICENSE-facebook
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-facebook b/licenses/LICENSE-facebook
new file mode 100644
index 0000000..b9dcbaa
--- /dev/null
+++ b/licenses/LICENSE-facebook
@@ -0,0 +1,14 @@
+Licensed 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.
+
+ @author: Andrei Alexandrescu (aalexandre)
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/licenses/LICENSE-js
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-js b/licenses/LICENSE-js
new file mode 100644
index 0000000..47c6e25
--- /dev/null
+++ b/licenses/LICENSE-js
@@ -0,0 +1,18 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/licenses/LICENSE-salesforce
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-salesforce b/licenses/LICENSE-salesforce
new file mode 100644
index 0000000..7e9d415
--- /dev/null
+++ b/licenses/LICENSE-salesforce
@@ -0,0 +1,23 @@
+Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+     Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+     Neither the name of Salesforce.com nor the names of its contributors may
+     be used to endorse or promote products derived from this software without
+     specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AlterTableTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AlterTableTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AlterTableTest.java
index f720287..4efa444 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AlterTableTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AlterTableTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ArithmeticQueryTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ArithmeticQueryTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ArithmeticQueryTest.java
index ceab995..6e9f68d 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ArithmeticQueryTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ArithmeticQueryTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AutoCommitTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AutoCommitTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AutoCommitTest.java
index 20f1255..04ea75d 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AutoCommitTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/AutoCommitTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BaseTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BaseTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BaseTest.java
index cbcd188..058583e 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BaseTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BaseTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BinaryRowKeyTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BinaryRowKeyTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BinaryRowKeyTest.java
index 513e3ba..5647c6f 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BinaryRowKeyTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/BinaryRowKeyTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CoalesceFunctionTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CoalesceFunctionTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CoalesceFunctionTest.java
index 0c121f3..840414e 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CoalesceFunctionTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CoalesceFunctionTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CompareDecimalToLongTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CompareDecimalToLongTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CompareDecimalToLongTest.java
index ed40338..3acd951 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CompareDecimalToLongTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CompareDecimalToLongTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CreateTableTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CreateTableTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CreateTableTest.java
index 1118933..53022a2 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CreateTableTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CreateTableTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CustomEntityDataTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CustomEntityDataTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CustomEntityDataTest.java
index f48e450..7f87a76 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CustomEntityDataTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/CustomEntityDataTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DeleteRangeTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DeleteRangeTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DeleteRangeTest.java
index b363d9a..6b522d8 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DeleteRangeTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DeleteRangeTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DescColumnSortOrderTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DescColumnSortOrderTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DescColumnSortOrderTest.java
index 7a10299..45c87aa 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DescColumnSortOrderTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DescColumnSortOrderTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DistinctCountTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DistinctCountTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DistinctCountTest.java
index 9170486..7ac75ca 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DistinctCountTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/DistinctCountTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExecuteStatementsTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExecuteStatementsTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExecuteStatementsTest.java
index a2d3d8b..fe1347d 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExecuteStatementsTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExecuteStatementsTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExtendedQueryExecTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExtendedQueryExecTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExtendedQueryExecTest.java
index d36e2f2..7acc83d 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExtendedQueryExecTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ExtendedQueryExecTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/FunkyNamesTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/FunkyNamesTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/FunkyNamesTest.java
index 67da710..73bb4d3 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/FunkyNamesTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/FunkyNamesTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/GroupByCaseTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/GroupByCaseTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/GroupByCaseTest.java
index a949f3f..8c041e3 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/GroupByCaseTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/GroupByCaseTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IndexTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IndexTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IndexTest.java
index 0c20e02..8428824 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IndexTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IndexTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IsNullTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IsNullTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IsNullTest.java
index e34d826..8f739f7 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IsNullTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/IsNullTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/KeyOnlyTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/KeyOnlyTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/KeyOnlyTest.java
index cec82ce..70a96d4 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/KeyOnlyTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/KeyOnlyTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/MultiCfQueryExecTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/MultiCfQueryExecTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/MultiCfQueryExecTest.java
index 3d34367..0d3134c 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/MultiCfQueryExecTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/MultiCfQueryExecTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/OrderByTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/OrderByTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/OrderByTest.java
index ee76be5..47f7660 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/OrderByTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/OrderByTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ProductMetricsTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ProductMetricsTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ProductMetricsTest.java
index cd18a2b..fa3ca81 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ProductMetricsTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ProductMetricsTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecTest.java
index a046710..f4ac3f2 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.



[2/8] incubator-trafodion git commit: TRAFODION-1642: Release 1.3.0 copyrights and license files are incorrect

Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecWithoutSCNTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecWithoutSCNTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecWithoutSCNTest.java
index a5fb196..2443217 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecWithoutSCNTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryExecWithoutSCNTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryPlanTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryPlanTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryPlanTest.java
index 6c0de3e..1f200cf 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryPlanTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/QueryPlanTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ReadIsolationLevelTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ReadIsolationLevelTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ReadIsolationLevelTest.java
index 43f5cc7..6b3569e 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ReadIsolationLevelTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ReadIsolationLevelTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableTest.java
index b1bacb3..d552a50 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableUpsertSelectTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableUpsertSelectTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableUpsertSelectTest.java
index 8fb81c3..0c84d57 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableUpsertSelectTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableUpsertSelectTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java
index 03195d8..827c29b 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SaltedTableVarLengthRowKeyTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ServerExceptionTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ServerExceptionTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ServerExceptionTest.java
index b3f495d..61044ab 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ServerExceptionTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ServerExceptionTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SkipScanQueryTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SkipScanQueryTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SkipScanQueryTest.java
index dec8708..e15c58f 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SkipScanQueryTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/SkipScanQueryTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StatementHintsTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StatementHintsTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StatementHintsTest.java
index 876990f..8f06772 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StatementHintsTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StatementHintsTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StddevTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StddevTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StddevTest.java
index 0844a17..934dcff 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StddevTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/StddevTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToCharFunctionTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToCharFunctionTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToCharFunctionTest.java
index 6165334..e837cd4 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToCharFunctionTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToCharFunctionTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToNumberFunctionTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToNumberFunctionTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToNumberFunctionTest.java
index d881c76..233f0ff 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToNumberFunctionTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/ToNumberFunctionTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/TopNTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/TopNTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/TopNTest.java
index 7ebfac9..1f3a11e 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/TopNTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/TopNTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertBigValuesTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertBigValuesTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertBigValuesTest.java
index 82653b9..2d206b8 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertBigValuesTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertBigValuesTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectAutoCommitTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectAutoCommitTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectAutoCommitTest.java
index b7ae2fd..ba1b9e7 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectAutoCommitTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectAutoCommitTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectTest.java
index 5b251f1..dbe8018 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertSelectTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertValuesTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertValuesTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertValuesTest.java
index c8506e9..d4e4969 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertValuesTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/UpsertValuesTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/tests/phx/src/test/java/org/trafodion/phoenix/end2end/VariableLengthPKTest.java
----------------------------------------------------------------------
diff --git a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/VariableLengthPKTest.java b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/VariableLengthPKTest.java
index 364f3b7..d97a616 100644
--- a/tests/phx/src/test/java/org/trafodion/phoenix/end2end/VariableLengthPKTest.java
+++ b/tests/phx/src/test/java/org/trafodion/phoenix/end2end/VariableLengthPKTest.java
@@ -1,24 +1,3 @@
-// @@@ 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 @@@
-
 /*******************************************************************************
  * Copyright (c) 2013, Salesforce.com, Inc.
  * All rights reserved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/KryptonBuild.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/KryptonBuild.bat b/win-odbc64/Krypton/KryptonBuild.bat
index dacfcfd..0e7d75e 100644
--- a/win-odbc64/Krypton/KryptonBuild.bat
+++ b/win-odbc64/Krypton/KryptonBuild.bat
@@ -1,24 +1,27 @@
 @echo off
 
-rem *********************************************************************
+rem **********************************************************************
 REM @@@ START COPYRIGHT @@@
 REM
-REM (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements.  See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership.  The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License.  You may obtain a copy of the License at
 REM
-REM  Licensed under the Apache License, Version 2.0 (the "License");
-REM  you may not use this file except in compliance with the License.
-REM  You may obtain a copy of the License at
+REM   http://www.apache.org/licenses/LICENSE-2.0
 REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied.  See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
 REM
 REM @@@ END COPYRIGHT @@@
-rem ********************************************************************/
+rem **********************************************************************/
 
 REM
 REM	Module  : KrypyonBuild.bat

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/assocsvc.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/assocsvc.idl b/win-odbc64/Krypton/assocsvc.idl
index e3f69c8..ab3c83c 100644
--- a/win-odbc64/Krypton/assocsvc.idl
+++ b/win-odbc64/Krypton/assocsvc.idl
@@ -1,21 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-//
+**********************************************************************/
 // MODULE: ASSOCSVC.IDL
 //
 // PURPOSE: Describes the ODBC ASsociation services (AS).

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/ca.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/ca.idl b/win-odbc64/Krypton/ca.idl
index c526fb6..e527c22 100644
--- a/win-odbc64/Krypton/ca.idl
+++ b/win-odbc64/Krypton/ca.idl
@@ -1,23 +1,25 @@
-/*************************************************************************
-*
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-**************************************************************************/
+**********************************************************************/
 //
 // MODULE: CA.IDL 
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/ceecfg.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/ceecfg.idl b/win-odbc64/Krypton/ceecfg.idl
index db74131..9e49fbf 100644
--- a/win-odbc64/Krypton/ceecfg.idl
+++ b/win-odbc64/Krypton/ceecfg.idl
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 /*
  *
  * CEE configuration records and constants.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/ceercv.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/ceercv.idl b/win-odbc64/Krypton/ceercv.idl
index 5055a0a..979cf78 100644
--- a/win-odbc64/Krypton/ceercv.idl
+++ b/win-odbc64/Krypton/ceercv.idl
@@ -1,22 +1,25 @@
-/**********************************************************************
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-********************************************************************/
+**********************************************************************/
 //
 // Interface to $RECEIVE handler object. These objects are registered
 // by calling CEE_NSK_RECEIVE_REGISTER. Whenever the CEE receives a

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/clientcfg.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/clientcfg.idl b/win-odbc64/Krypton/clientcfg.idl
index 6dc0fad..6eb357e 100644
--- a/win-odbc64/Krypton/clientcfg.idl
+++ b/win-odbc64/Krypton/clientcfg.idl
@@ -1,27 +1,29 @@
-/*************************************************************************
-*
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-**************************************************************************/
+**********************************************************************/
 #include "odbc.idl"
 #include "odbccfg.idl"
 
 module odbcClientCfg {
 	typedef odbc::SQLSvc   			SQLSvc_ObjRef;
 	typedef odbccfg::CfgSvc			CfgSvc_ObjRef;
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/cee.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/cee.h b/win-odbc64/Krypton/generated_incs/cee.h
index 47dafca..28c8170 100644
--- a/win-odbc64/Krypton/generated_incs/cee.h
+++ b/win-odbc64/Krypton/generated_incs/cee.h
@@ -1,20 +1,26 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
+
 #ifndef CEE_H
 #define CEE_H
 #define CEE_H_VERSION 19991123

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/ceecfg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/ceecfg.h b/win-odbc64/Krypton/generated_incs/ceecfg.h
index 1b4eb33..b264df4 100644
--- a/win-odbc64/Krypton/generated_incs/ceecfg.h
+++ b/win-odbc64/Krypton/generated_incs/ceecfg.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef CEECFG_H_
 #define CEECFG_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/ceercv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/ceercv.h b/win-odbc64/Krypton/generated_incs/ceercv.h
index afbd734..88d8751 100644
--- a/win-odbc64/Krypton/generated_incs/ceercv.h
+++ b/win-odbc64/Krypton/generated_incs/ceercv.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef CEERCV_H_
 #define CEERCV_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/glu.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/glu.h b/win-odbc64/Krypton/generated_incs/glu.h
index d59b6f2..db9b3c4 100644
--- a/win-odbc64/Krypton/generated_incs/glu.h
+++ b/win-odbc64/Krypton/generated_incs/glu.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 /*
  * glu.h
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/glu_rs.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/glu_rs.h b/win-odbc64/Krypton/generated_incs/glu_rs.h
index d68b092..221f6b8 100644
--- a/win-odbc64/Krypton/generated_incs/glu_rs.h
+++ b/win-odbc64/Krypton/generated_incs/glu_rs.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 /*
  * !GLU Result Status Definitions
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/glu_stdexc.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/glu_stdexc.h b/win-odbc64/Krypton/generated_incs/glu_stdexc.h
index 6ee47d0..41b4069 100644
--- a/win-odbc64/Krypton/generated_incs/glu_stdexc.h
+++ b/win-odbc64/Krypton/generated_incs/glu_stdexc.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 /*
  * !STDEXC Result Status Definitions
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/idltype.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/idltype.h b/win-odbc64/Krypton/generated_incs/idltype.h
index 8850f37..94e7ec8 100644
--- a/win-odbc64/Krypton/generated_incs/idltype.h
+++ b/win-odbc64/Krypton/generated_incs/idltype.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 /*
  * idltype.h
  *

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbc.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbc.h b/win-odbc64/Krypton/generated_incs/odbc.h
index 5542833..ca32b16 100644
--- a/win-odbc64/Krypton/generated_incs/odbc.h
+++ b/win-odbc64/Krypton/generated_incs/odbc.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBC_H_
 #define ODBC_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbcCommon.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbcCommon.h b/win-odbc64/Krypton/generated_incs/odbcCommon.h
index e5b3f6e..4ac8a53 100644
--- a/win-odbc64/Krypton/generated_incs/odbcCommon.h
+++ b/win-odbc64/Krypton/generated_incs/odbcCommon.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBCCOMMON_H_
 #define ODBCCOMMON_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbc_cl.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbc_cl.h b/win-odbc64/Krypton/generated_incs/odbc_cl.h
index 42d4a8a..04f28c9 100644
--- a/win-odbc64/Krypton/generated_incs/odbc_cl.h
+++ b/win-odbc64/Krypton/generated_incs/odbc_cl.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBC_H_
 #define ODBC_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbc_sv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbc_sv.h b/win-odbc64/Krypton/generated_incs/odbc_sv.h
index beadad3..3ff2c1c 100644
--- a/win-odbc64/Krypton/generated_incs/odbc_sv.h
+++ b/win-odbc64/Krypton/generated_incs/odbc_sv.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBC_H_
 #define ODBC_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbcas_cl.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbcas_cl.h b/win-odbc64/Krypton/generated_incs/odbcas_cl.h
index a359878..71441dd 100644
--- a/win-odbc64/Krypton/generated_incs/odbcas_cl.h
+++ b/win-odbc64/Krypton/generated_incs/odbcas_cl.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBCAS_H_
 #define ODBCAS_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbcas_sv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbcas_sv.h b/win-odbc64/Krypton/generated_incs/odbcas_sv.h
index 6c0a9c1..3badd81 100644
--- a/win-odbc64/Krypton/generated_incs/odbcas_sv.h
+++ b/win-odbc64/Krypton/generated_incs/odbcas_sv.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBCAS_H_
 #define ODBCAS_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbccfg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbccfg.h b/win-odbc64/Krypton/generated_incs/odbccfg.h
index 75d3aad..cdc1bee 100644
--- a/win-odbc64/Krypton/generated_incs/odbccfg.h
+++ b/win-odbc64/Krypton/generated_incs/odbccfg.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBCCFG_H_
 #define ODBCCFG_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbccfg_cl.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbccfg_cl.h b/win-odbc64/Krypton/generated_incs/odbccfg_cl.h
index fa0c3c5..e177345 100644
--- a/win-odbc64/Krypton/generated_incs/odbccfg_cl.h
+++ b/win-odbc64/Krypton/generated_incs/odbccfg_cl.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBCCFG_H_
 #define ODBCCFG_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbccfg_sv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbccfg_sv.h b/win-odbc64/Krypton/generated_incs/odbccfg_sv.h
index 845457c..ffd8276 100644
--- a/win-odbc64/Krypton/generated_incs/odbccfg_sv.h
+++ b/win-odbc64/Krypton/generated_incs/odbccfg_sv.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBCCFG_H_
 #define ODBCCFG_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/odbcsrvrcommon.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/odbcsrvrcommon.h b/win-odbc64/Krypton/generated_incs/odbcsrvrcommon.h
index cd7d385..c1cadb5 100644
--- a/win-odbc64/Krypton/generated_incs/odbcsrvrcommon.h
+++ b/win-odbc64/Krypton/generated_incs/odbcsrvrcommon.h
@@ -1,20 +1,25 @@
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 #ifndef ODBCSRVRCOMMON_H_
 #define ODBCSRVRCOMMON_H_
 /*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/generated_incs/tdm_odbcSrvrMsg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/generated_incs/tdm_odbcSrvrMsg.h b/win-odbc64/Krypton/generated_incs/tdm_odbcSrvrMsg.h
index cf6900b..a15850d 100644
--- a/win-odbc64/Krypton/generated_incs/tdm_odbcSrvrMsg.h
+++ b/win-odbc64/Krypton/generated_incs/tdm_odbcSrvrMsg.h
@@ -1,21 +1,25 @@
-/**********************************************************************
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
+**********************************************************************/
 ********************************************************************/
 //****************************************************************************
 //*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/idlcnp.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/idlcnp.bat b/win-odbc64/Krypton/idlcnp.bat
index 140e018..91dc60b 100644
--- a/win-odbc64/Krypton/idlcnp.bat
+++ b/win-odbc64/Krypton/idlcnp.bat
@@ -2,19 +2,22 @@
 
 REM @@@ START COPYRIGHT @@@
 REM
-REM (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements.  See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership.  The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License.  You may obtain a copy of the License at
 REM
-REM  Licensed under the Apache License, Version 2.0 (the "License");
-REM  you may not use this file except in compliance with the License.
-REM  You may obtain a copy of the License at
+REM   http://www.apache.org/licenses/LICENSE-2.0
 REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied.  See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
 REM
 REM @@@ END COPYRIGHT @@@
 
@@ -73,4 +76,4 @@ goto end
 
 :error
 false
-:end
\ No newline at end of file
+:end

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/odbc.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/odbc.idl b/win-odbc64/Krypton/odbc.idl
index 1a6ac88..a8768f9 100644
--- a/win-odbc64/Krypton/odbc.idl
+++ b/win-odbc64/Krypton/odbc.idl
@@ -1,22 +1,25 @@
-/**********************************************************************
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-********************************************************************/
+**********************************************************************/
 /**************************************************************************
 **************************************************************************/
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d44f32e7/win-odbc64/Krypton/odbcCommon.idl
----------------------------------------------------------------------
diff --git a/win-odbc64/Krypton/odbcCommon.idl b/win-odbc64/Krypton/odbcCommon.idl
index fbbcced..72a62e4 100644
--- a/win-odbc64/Krypton/odbcCommon.idl
+++ b/win-odbc64/Krypton/odbcCommon.idl
@@ -1,22 +1,25 @@
-/**********************************************************************
+/**********************************************************************
 // @@@ START COPYRIGHT @@@
 //
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// 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
 //
-//  Licensed 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
 //
-//      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.
+// 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 @@@
-********************************************************************/
+**********************************************************************/
 /**************************************************************************
 **************************************************************************/
 //



[7/8] incubator-trafodion git commit: updated Linux driver package files to remove LICENSE requirement

Posted by db...@apache.org.
updated Linux driver package files to remove LICENSE requirement


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

Branch: refs/heads/release1.3
Commit: 820ac3d4515b8d44c40c5d8c627d8f320e1c0d12
Parents: b8f993a
Author: Roberta Marton <ro...@esgyn.com>
Authored: Mon Dec 7 19:58:53 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Mon Dec 7 19:58:53 2015 +0000

----------------------------------------------------------------------
 core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh     | 2 --
 .../odbc/odbcclient/unixcli/package/trafodbclnx_install.sh         | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/820ac3d4/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 2c2e91b..ac6ef02 100755
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
@@ -118,8 +118,6 @@ then
     ((err += $?))
     cp ../../license.txt	license.txt
     ((err += $?))
-    cp ../../LICENSE	LICENSE
-    ((err += $?))
     cd ..
     # do the tar
     cp -rf linux64 PkgTmp

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/820ac3d4/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
index fc0c3f7..039d425 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
@@ -40,7 +40,7 @@ ETC_DIR=
 #INCLUDE_DIR=
 SAMPLE_DIR=
 #package files, excluding this file
-pkgfiles=(libtrafodbc_l64.so TRAFDSN MD5SUM LICENSE connect_test.cpp license.txt libicuucNv44.so.44 libicudataNv44.so.44)
+pkgfiles=(libtrafodbc_l64.so TRAFDSN MD5SUM connect_test.cpp license.txt libicuucNv44.so.44 libicudataNv44.so.44)
 
 #check whether the package directory has all files (or this script is invoked form "PkgTmp" dir)
 function check_package {