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/10/13 19:14:23 UTC

[1/8] incubator-trafodion git commit: Unneeded windows files

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master df76babe9 -> d5efae37f


Unneeded windows files


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

Branch: refs/heads/master
Commit: 26fe0b3a50627fd53b6db29edc0d61be88f5c5b2
Parents: 427e2ce
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Tue Oct 6 21:43:31 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Tue Oct 6 21:43:31 2015 +0000

----------------------------------------------------------------------
 core/sqf/inc/windows/windows.h  | 1 -
 core/sqf/inc/windows/winnt.h    | 0
 core/sqf/inc/windows/winperf.h  | 1 -
 core/sqf/inc/windows/winsock2.h | 0
 4 files changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/26fe0b3a/core/sqf/inc/windows/windows.h
----------------------------------------------------------------------
diff --git a/core/sqf/inc/windows/windows.h b/core/sqf/inc/windows/windows.h
deleted file mode 100644
index 8d1c8b6..0000000
--- a/core/sqf/inc/windows/windows.h
+++ /dev/null
@@ -1 +0,0 @@
- 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/26fe0b3a/core/sqf/inc/windows/winnt.h
----------------------------------------------------------------------
diff --git a/core/sqf/inc/windows/winnt.h b/core/sqf/inc/windows/winnt.h
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/26fe0b3a/core/sqf/inc/windows/winperf.h
----------------------------------------------------------------------
diff --git a/core/sqf/inc/windows/winperf.h b/core/sqf/inc/windows/winperf.h
deleted file mode 100644
index 8d1c8b6..0000000
--- a/core/sqf/inc/windows/winperf.h
+++ /dev/null
@@ -1 +0,0 @@
- 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/26fe0b3a/core/sqf/inc/windows/winsock2.h
----------------------------------------------------------------------
diff --git a/core/sqf/inc/windows/winsock2.h b/core/sqf/inc/windows/winsock2.h
deleted file mode 100644
index e69de29..0000000


[3/8] incubator-trafodion git commit: Merge remote branch 'origin/master' into sandhya_copyright2

Posted by db...@apache.org.
Merge remote branch 'origin/master' into sandhya_copyright2


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

Branch: refs/heads/master
Commit: f4a9bac2005d1a52011915d44bf85a77817909fe
Parents: 2ce3fb9 ff6d161
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Fri Oct 9 22:01:10 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Fri Oct 9 22:01:10 2015 +0000

----------------------------------------------------------------------
 Makefile                                        |   2 +-
 core/conn/trafci/build.xml                      |  21 +-
 .../odbc/odbcclient/unixcli/package/license.txt |  47 +-
 core/sqf/LocalSettingsTemplate.sh               |  33 +-
 core/sqf/sqenvcom.sh                            |  40 +-
 .../sql/scripts/install_hadoop_regr_test_env    |  13 +-
 core/sqf/sql/scripts/install_local_hadoop       |  63 ++-
 core/sqf/sql/scripts/sqgen                      |  17 +
 core/sql/executor/ExStats.cpp                   |   4 +-
 core/sql/generator/GenPreCode.cpp               |  47 +-
 core/sql/generator/GenUdr.cpp                   |   5 +-
 core/sql/optimizer/BindRelExpr.cpp              |   9 +
 core/sql/optimizer/CostMethod.h                 |  70 +--
 core/sql/optimizer/NAColumn.cpp                 |  21 +
 core/sql/optimizer/NAColumn.h                   |   6 +
 core/sql/optimizer/OptPhysRelExpr.cpp           |  28 +
 core/sql/optimizer/RelUpdate.h                  |  10 +-
 core/sql/optimizer/ScmCostMethod.cpp            | 566 ++++++++++++++++++-
 core/sql/optimizer/TransRule.cpp                |   9 +
 core/sql/regress/compGeneral/EXPECTED013.SB     |  18 +-
 core/sql/regress/compGeneral/EXPECTED071        |  10 +-
 core/sql/regress/executor/EXPECTED015.SB        |   2 +-
 core/sql/regress/seabase/EXPECTED010            | 472 ++++++++--------
 core/sql/regress/seabase/EXPECTED011            |  66 ++-
 core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp       |  25 +
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   6 +-
 core/sql/sqlcomp/DefaultConstants.h             |  10 +-
 core/sql/sqlcomp/PrivMgrPrivileges.cpp          |   9 +-
 core/sql/sqlcomp/nadefaults.cpp                 |  12 +
 .../java/org/trafodion/sql/HTableClient.java    |   3 -
 dcs/conf/dcs-site.xml                           |   3 +-
 install/traf_tools_setup.sh                     | 262 +++++++++
 tests/phx/phoenix_test.py                       |  12 -
 tests/phx/pom.xml.template                      |  43 +-
 34 files changed, 1500 insertions(+), 464 deletions(-)
----------------------------------------------------------------------



[6/8] incubator-trafodion git commit: Missed a couple of files in the previous checkin

Posted by db...@apache.org.
Missed a couple of files in the previous checkin


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

Branch: refs/heads/master
Commit: 206b9e9b06cf6477aa7b836cdbdf92e1b7a9b493
Parents: 4a34a04
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Sun Oct 11 05:02:35 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Sun Oct 11 05:02:35 2015 +0000

----------------------------------------------------------------------
 .rat-excludes             |  1 +
 RAT_README.txt            |  4 ++++
 dcs/conf/realm.properties | 23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/206b9e9b/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 17a92a5..543a6f3 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -54,6 +54,7 @@ LICENSE.rtf*
 resource.h*
 resource.hm*
 .rat-excludes*
+RAT_README.txt
 readme.md
 eclipse.project
 usage.csv

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/206b9e9b/RAT_README.txt
----------------------------------------------------------------------
diff --git a/RAT_README.txt b/RAT_README.txt
index 4e2c945..8efe8c4 100644
--- a/RAT_README.txt
+++ b/RAT_README.txt
@@ -1,5 +1,9 @@
 ------------------------------------------------------------------------------
 This readme contains the list of excluded files that don't have apache headers and explanations on why they don't and cannnot have headers 
+To run the RAT report for Trafodion:
+1. Install Apache Rat. Taht will install the needed jar file. 
+2. Use command line:
+   java -jar apache-rat-0.11.jar  -E $MY_SQROOT/../../.rat-excludes -d $MY_SQROOT/../.. > <RAT output log file>
 ------------------------------------------------------------------------------
 FILE           :                      NOTES
 ------------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/206b9e9b/dcs/conf/realm.properties
----------------------------------------------------------------------
diff --git a/dcs/conf/realm.properties b/dcs/conf/realm.properties
index cd18583..fecd195 100644
--- a/dcs/conf/realm.properties
+++ b/dcs/conf/realm.properties
@@ -1 +1,24 @@
+# @@@ 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 @@@
+#
+
+
 admin: MD5:21232f297a57a5a743894a0e4a801fc3,user,admin
\ No newline at end of file


[4/8] incubator-trafodion git commit: Removed unneeded files lacking copyrights Fixing hive/EXPECTED009, a result changed sdue to new heap sort algo.

Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
index d7caee2..a275356 100644
--- a/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java
@@ -1,18 +1,25 @@
-/**
- *(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.server;
 
 import java.net.InetAddress;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/util/DcsNetworkConfiguration.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/DcsNetworkConfiguration.java b/dcs/src/main/java/org/trafodion/dcs/util/DcsNetworkConfiguration.java
index 3fda1af..5cf1df3 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/DcsNetworkConfiguration.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/DcsNetworkConfiguration.java
@@ -1,37 +1,26 @@
-/**
- *(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/**
- * Copyright 2007 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.
- */
+
+/**********************************************************************
+* @@@ 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.trafodion.dcs.util;
 
 import java.net.NetworkInterface;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/util/JdbcT2Util.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/JdbcT2Util.java b/dcs/src/main/java/org/trafodion/dcs/util/JdbcT2Util.java
index e17e42e..22eda19 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/JdbcT2Util.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/JdbcT2Util.java
@@ -1,18 +1,25 @@
-/**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.util;
 
 import java.sql.*;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java b/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
index 3bd5f36..dd28c2c 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
@@ -1,18 +1,25 @@
-/**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.util;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/util/Log4jUtils.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/Log4jUtils.java b/dcs/src/main/java/org/trafodion/dcs/util/Log4jUtils.java
index 6bc4773..d731897 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/Log4jUtils.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/Log4jUtils.java
@@ -1,18 +1,25 @@
- /**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.util;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/xslt/configuration_to_asciidoc_chapter.xsl
----------------------------------------------------------------------
diff --git a/dcs/src/main/xslt/configuration_to_asciidoc_chapter.xsl b/dcs/src/main/xslt/configuration_to_asciidoc_chapter.xsl
index 675ef4b..a884fd0 100644
--- a/dcs/src/main/xslt/configuration_to_asciidoc_chapter.xsl
+++ b/dcs/src/main/xslt/configuration_to_asciidoc_chapter.xsl
@@ -1,21 +1,28 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <!-- 
-/**
-  *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
-  *
-  * 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.
-  */
+/**********************************************************************
+* @@@ 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 @@@
+**********************************************************************/
 -->
 <!-- 
 This stylesheet is used making an html version of dcs-default.adoc.
@@ -35,21 +42,28 @@ This stylesheet is used making an html version of dcs-default.adoc.
 
 <!-- Print the license at the top of the file -->
 ////
-/**
-  *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
-  *
-  * 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.
-  */
+/**********************************************************************
+* @@@ 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 @@@
+**********************************************************************/
 ////
 :doctype: book
 :numbered:


[2/8] incubator-trafodion git commit: Includes cleanup, rat-excludes file and rat_readme to explain exceptions.

Posted by db...@apache.org.
Includes cleanup, rat-excludes file and rat_readme to explain exceptions.


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

Branch: refs/heads/master
Commit: 2ce3fb98908abba16cdfbf79b71d74d550b4a983
Parents: 26fe0b3
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Fri Oct 9 21:58:37 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Fri Oct 9 21:58:37 2015 +0000

----------------------------------------------------------------------
 .rat-excludes  | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 RAT_README.txt |  64 +++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2ce3fb98/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
new file mode 100644
index 0000000..17a92a5
--- /dev/null
+++ b/.rat-excludes
@@ -0,0 +1,106 @@
+EXPECTED*
+DIFF*
+eqat*
+qat*
+.gitignore
+.data*
+sample_events*
+FILTER*
+lob_input*
+romeo*
+expected*
+COMPARE*
+expat*
+regress*
+.gitignore
+.qrc
+regtest_*
+dtm*.*.pb.cc
+trafodion_license
+protobuf*
+package.exclude.*
+jdbct2.jar.version*
+jdbct4.jar.version*
+genvers*
+readme*
+README*
+package.exclude
+eclipse.*cproject*
+.classpath*
+.project*
+Hbase_server.skeleton.cpp*
+__init__.py*
+run_me*
+SqlciErrors.txt
+doxygen_tmudr.1.6.config
+backup-masters
+servers
+stylesheet.css
+license*.txt*
+demo*.css*
+Sortingicons.psd*
+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*
+LICENSE.rtf*
+.ism*
+resource.h*
+resource.hm*
+.rat-excludes*
+readme.md
+eclipse.project
+usage.csv
+montest_readme.txt
+Resource.qrc
+SetCertificateDirReg_os.vcxproj*
+SetCertificateDirReg_os.vcxproj.*
+odbccp32.props
+UpdateDSN_os.sln
+UpdateDSN*.vcxproj*
+UpdateDSN*.vcxproj.*
+UpdateDSN_os.vcxproj*
+UpdateDSN_os.vcxproj.*
+win64_installer_os.ism
+odbcclient_os.sln
+Drvr35*.rc*
+Drvr35Res.rc
+Drvr35Res.rc2
+Drvr35*.vcxproj*
+Drvr35*.vcxproj.*
+Drvr35Adm_os.*
+DrvMsg35.rc
+Drvr35Res_os.rc*
+Drvr35Msg_os.*
+Drvr35Res_os.vcxproj*
+Drvr35Res_os.vcxproj.*
+drvr35*.rc*
+drvr35*.vcxproj*
+drvr35adm.*
+TranslationDll.rc
+TranslationDll*.vcxproj*
+TranslationDll*.vcxproj.*
+TranslationDll_os.vcxproj*
+TranslationDll_os.vcxproj.*
+drvr35.rc
+drvr35*.vcxproj*
+drvr35*.vcxproj.*
+drvr35_os.rc
+drvr35_os.vcxproj*
+drvr35_os.vcxproj.*
+openssl.props
+version_drvr.cpp
+TCPIPV4.*
+TCPIPV6.*
+TCPIPV4_os.*
+TCPIPV6_os.*
+
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2ce3fb98/RAT_README.txt
----------------------------------------------------------------------
diff --git a/RAT_README.txt b/RAT_README.txt
new file mode 100644
index 0000000..4e2c945
--- /dev/null
+++ b/RAT_README.txt
@@ -0,0 +1,64 @@
+------------------------------------------------------------------------------
+This readme contains the list of excluded files that don't have apache headers and explanations on why they don't and cannnot have headers 
+------------------------------------------------------------------------------
+FILE           :                      NOTES
+------------------------------------------------------------------------------
+          
+          
+.gitignore  : File contains pattterns that GIT reads. Cannot have comments 
+.rat-excludes   : This file used by RAT cannot have a comment section 
+package.exclude* : List of files to exclude from packaging - cannot pargse comments.      
+eclipse.*project* : Eclipse related project file
+*.csv     :  Macro file cannot have comments.
+*/hbase-trx/hbase-protocol/* : Copied from Hbse and cannot haveApache copyrights
+*/hbase-trx/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/*      :  Generated from Google protoc compiler and cannot have Apache copyright.
+*.pb.cc    :  Generated from Google protoc compiler and cannot have Apache copyright.
+/hbase-trx/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp : Autogenerated skeleton file copied from hbase cannot have Apache Trafodion copyright.
+hbase-trx/src/main/python/thrift1/gen-py/hbase/__init__.py : Autogenerated python file copied from hbase  cannot have Apache Trafodion copyright.
+
+*/core/sql/regress/*/EXPECTED* : EXPECTED files for regression tests cannot have a comment header since they get compared with diff.
+*/core/sql/regress/*/COMPARE* : COMPARE files for tests cannot have a comment header since they get compared with diff
+*/core/sql/regress/*/DIFF* : DIFF files for tests cannot have a comment header since they get compared with diff
+core/sql/regress/executor/lob_input*.txt : input text files for tests. Cannot have any header
+core/sql/regress/udr/romeo*.txt :  input text files for tests. Cannot have any header
+*.qrc : Generated file cannot have comment header.
+core/sql/qmscommon/expat/* : These files was copied and have their own GPL license in the same directory
+/doxygen_*.1.6.config : Generated file by Doxygen cannot have header. 
+install/installer/trafodion_license: license file
+servers : Code does not handle comments in these files
+backup-masters : Code does not handle comments in these files.
+dcs/src/main/resources/dcs-webapps/master/css/stylesheet.css : Header acknowledges Codify Design Studio. We cannot add our own copyright to this. 
+dcs/src/test/pytests/test-requirements.txt:Code/test cannot handle comments – needed to download dependent software
+--------------------------------------------------------------------
+The following files in the win-odbc directory are Visual Studio generated project files. Cannot add Apache license.
+*.rc
+*.vcxproj*
+*.props
+*.sln
+*.ism
+resource.h
+*.rc2
+*.RC
+
+
+-------------------------------------------------------------------
+The following files in dcs directory have their own GPL license :
+ 
+ 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
+ dcs/src/main/resources/dcs-webapps/master/datatables/css/jquery.dataTables.css
+ dcs/src/main/resources/dcs-webapps/master/datatables/css/jquery.dataTables_themeroller.css
+ dcs/src/main/resources/dcs-webapps/master/datatables/images/Sorting icons.psd
+ dcs/src/main/resources/dcs-webapps/master/datatables/js/jquery.dataTables.js
+ dcs/src/main/resources/dcs-webapps/master/jquery-ui/jquery-ui.css
+ dcs/src/main/resources/dcs-webapps/master/jquery-ui/jquery-ui.js
+ 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
+ 
+ 
+  
+


[7/8] incubator-trafodion git commit: Deleted unneeded protobuf project files and corrected issues from reviews.

Posted by db...@apache.org.
Deleted unneeded protobuf project files and corrected issues from reviews.


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

Branch: refs/heads/master
Commit: 2b897a497fb0dcf55b9c6b8ff8ead7850cbc1d39
Parents: 206b9e9
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Mon Oct 12 21:06:28 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Mon Oct 12 21:06:28 2015 +0000

----------------------------------------------------------------------
 .rat-excludes                                          |  2 --
 RAT_README.txt                                         |  9 ++++-----
 .../src/seatrans/hbase-trx/hbase-protocol/.classpath   | 12 ------------
 .../sqf/src/seatrans/hbase-trx/hbase-protocol/.project | 13 -------------
 4 files changed, 4 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2b897a49/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 543a6f3..c17c29f 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -26,8 +26,6 @@ readme*
 README*
 package.exclude
 eclipse.*cproject*
-.classpath*
-.project*
 Hbase_server.skeleton.cpp*
 __init__.py*
 run_me*

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2b897a49/RAT_README.txt
----------------------------------------------------------------------
diff --git a/RAT_README.txt b/RAT_README.txt
index 8efe8c4..a2c08f0 100644
--- a/RAT_README.txt
+++ b/RAT_README.txt
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 This readme contains the list of excluded files that don't have apache headers and explanations on why they don't and cannnot have headers 
 To run the RAT report for Trafodion:
-1. Install Apache Rat. Taht will install the needed jar file. 
+1. Install Apache Rat. That will install the needed jar file. 
 2. Use command line:
    java -jar apache-rat-0.11.jar  -E $MY_SQROOT/../../.rat-excludes -d $MY_SQROOT/../.. > <RAT output log file>
 ------------------------------------------------------------------------------
@@ -11,12 +11,11 @@ FILE           :                      NOTES
           
 .gitignore  : File contains pattterns that GIT reads. Cannot have comments 
 .rat-excludes   : This file used by RAT cannot have a comment section 
-package.exclude* : List of files to exclude from packaging - cannot pargse comments.      
+package.exclude* : List of files to exclude from packaging - cannot parse comments.      
 eclipse.*project* : Eclipse related project file
 *.csv     :  Macro file cannot have comments.
-*/hbase-trx/hbase-protocol/* : Copied from Hbse and cannot haveApache copyrights
-*/hbase-trx/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/*      :  Generated from Google protoc compiler and cannot have Apache copyright.
-*.pb.cc    :  Generated from Google protoc compiler and cannot have Apache copyright.
+*/hbase-trx/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/*      :  Generated from google protobuf compiler and cannot have Apache copyright.
+*.pb.cc    :  Generated from google protobuf compiler and cannot have Apache copyright.
 /hbase-trx/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp : Autogenerated skeleton file copied from hbase cannot have Apache Trafodion copyright.
 hbase-trx/src/main/python/thrift1/gen-py/hbase/__init__.py : Autogenerated python file copied from hbase  cannot have Apache Trafodion copyright.
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2b897a49/core/sqf/src/seatrans/hbase-trx/hbase-protocol/.classpath
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/hbase-protocol/.classpath b/core/sqf/src/seatrans/hbase-trx/hbase-protocol/.classpath
deleted file mode 100755
index 9d21d50..0000000
--- a/core/sqf/src/seatrans/hbase-trx/hbase-protocol/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
-  <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/com/github/stephenc/findbugs/findbugs-annotations/1.3.9-1/findbugs-annotations-1.3.9-1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-all/1.9.0/mockito-all-1.9.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2b897a49/core/sqf/src/seatrans/hbase-trx/hbase-protocol/.project
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/hbase-protocol/.project b/core/sqf/src/seatrans/hbase-trx/hbase-protocol/.project
deleted file mode 100755
index 5ac2436..0000000
--- a/core/sqf/src/seatrans/hbase-trx/hbase-protocol/.project
+++ /dev/null
@@ -1,13 +0,0 @@
-<projectDescription>
-  <name>hbase-protocol</name>
-  <comment>Protobuf protocol classes used by HBase to communicate. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file


[5/8] incubator-trafodion git commit: Removed unneeded files lacking copyrights Fixing hive/EXPECTED009, a result changed sdue to new heap sort algo.

Posted by db...@apache.org.
Removed unneeded files lacking copyrights
Fixing hive/EXPECTED009, a result changed sdue to new heap sort algo.


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

Branch: refs/heads/master
Commit: 4a34a0483e59ff4a56a07e62be42355ce7553c98
Parents: f4a9bac
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Sat Oct 10 23:15:35 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Sat Oct 10 23:15:35 2015 +0000

----------------------------------------------------------------------
 core/conn/jdbc_type2/jdbct2.jar.version         |  1 -
 core/conn/jdbc_type4/jdbct4.jar.version         |  1 -
 core/conn/jdbc_type4/lib/.empty-dir             |  0
 .../org/trafodion/jdbc/t4/HPT4DataSource.java   |  2 +-
 .../org/trafodion/jdbc/t4/T4DSProperties.java   |  2 +-
 .../trafciDefaultLookAndFeel.properties         | 23 ++++++
 core/rest/conf/log4j.properties                 | 23 ++++++
 core/rest/conf/realm.properties                 | 23 ++++++
 core/rest/src/test/resources/log4j.properties   | 23 ++++++
 core/sqf/export/bin64/.empty-dir                |  0
 core/sqf/export/bin64d/.empty-dir               |  0
 core/sqf/export/lib/Parse/RecDescent.pm         | 23 ++++++
 core/sqf/src/seatrans/hbase-trx/genvers         | 23 ++++++
 core/sql/SqlCompilerDebugger/AboutBox.ui        | 19 +++++
 .../sql/SqlCompilerDebugger/BreakpointDialog.ui | 19 +++++
 .../SqlCompilerDebugger/ItemExpressionView.ui   | 19 +++++
 core/sql/SqlCompilerDebugger/MainWindow.ui      | 19 +++++
 core/sql/SqlCompilerDebugger/PropDialog.ui      | 19 +++++
 .../SqlCompilerDebugger/QueryAnalysisView.ui    | 19 +++++
 core/sql/SqlCompilerDebugger/QueryMemoView.ui   | 19 +++++
 core/sql/SqlCompilerDebugger/QueryTreeView.ui   | 19 +++++
 core/sql/SqlCompilerDebugger/RulesDialog.ui     | 19 +++++
 core/sql/SqlCompilerDebugger/TDBDlgExprList.ui  | 19 +++++
 core/sql/SqlCompilerDebugger/TDBDlgMdamNet.ui   | 19 +++++
 core/sql/SqlCompilerDebugger/TDBTreeView.ui     | 19 +++++
 core/sql/SqlCompilerDebugger/ViewContainer.ui   | 19 +++++
 core/sql/bin/English.lng                        |  2 -
 .../executor/trafodion-HBaseAccess.jar.version  |  3 -
 core/sql/langman/mxlangman.jar.version          |  3 -
 core/sql/nskgmake/tdm_sqlmxmsg_intl/Makefile    | 25 -------
 core/sql/qmscommon/QRQueries.cpp                |  4 +-
 core/sql/regress/hive/EXPECTED009               |  8 +--
 core/sql/regress/udr/sampledb                   | 23 ++++++
 core/sql/sqludr/regtest_SEQUENCE.data           |  1 -
 core/sql/sqludr/regtest_SIMPLE_4.xml            |  1 -
 core/sql/ustat/mx_ustat.jar.version             |  3 -
 .../org/trafodion/dcs/VersionAnnotation.java    | 54 ++++++--------
 .../org/trafodion/dcs/rest/ServerResource.java  | 56 ++++++---------
 .../org/trafodion/dcs/rest/VersionResource.java | 56 ++++++---------
 .../trafodion/dcs/rest/WorkloadResource.java    | 56 ++++++---------
 .../dcs/rest/model/WorkloadListModel.java       | 56 ++++++---------
 .../trafodion/dcs/rest/model/WorkloadModel.java | 56 ++++++---------
 .../dcs/rest/provider/JAXBContextResolver.java  | 56 ++++++---------
 .../producer/PlainTextMessageBodyProducer.java  | 56 ++++++---------
 .../org/trafodion/dcs/script/ScriptContext.java | 37 ++++++----
 .../org/trafodion/dcs/server/ServerManager.java | 37 ++++++----
 .../dcs/util/DcsNetworkConfiguration.java       | 57 ++++++---------
 .../java/org/trafodion/dcs/util/JdbcT2Util.java | 37 ++++++----
 .../java/org/trafodion/dcs/util/JdbcT4Util.java | 37 ++++++----
 .../java/org/trafodion/dcs/util/Log4jUtils.java | 37 ++++++----
 .../xslt/configuration_to_asciidoc_chapter.xsl  | 74 ++++++++++++--------
 51 files changed, 769 insertions(+), 457 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/conn/jdbc_type2/jdbct2.jar.version
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/jdbct2.jar.version b/core/conn/jdbc_type2/jdbct2.jar.version
deleted file mode 100644
index 804bfa5..0000000
--- a/core/conn/jdbc_type2/jdbct2.jar.version
+++ /dev/null
@@ -1 +0,0 @@
-Implementation-Version-1: Version 1.0.1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/conn/jdbc_type4/jdbct4.jar.version
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/jdbct4.jar.version b/core/conn/jdbc_type4/jdbct4.jar.version
deleted file mode 100644
index 804bfa5..0000000
--- a/core/conn/jdbc_type4/jdbct4.jar.version
+++ /dev/null
@@ -1 +0,0 @@
-Implementation-Version-1: Version 1.0.1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/conn/jdbc_type4/lib/.empty-dir
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/lib/.empty-dir b/core/conn/jdbc_type4/lib/.empty-dir
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4DataSource.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4DataSource.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4DataSource.java
index 258a768..f0e0c8f 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4DataSource.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4DataSource.java
@@ -99,7 +99,7 @@ import javax.naming.Referenceable;
  * </pre>
  * 
  * <p>
- * Copyright: (C) Copyright 2004-2007 Hewlett-Packard Development Company, L.P.
+ * Copyright: (C) Apache Software Foundation (ASF)
  * </p>
  * 
  * @see T4Properties

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DSProperties.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DSProperties.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DSProperties.java
index f925027..a44d0f3 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DSProperties.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4DSProperties.java
@@ -60,7 +60,7 @@ import java.util.logging.Level;
  * </p>
  * </blockquote>
  * <p>
- * Copyright: (C) Copyright 2004-2007 Hewlett-Packard Development Company, L.P.
+ * Copyright: (C) Apache Software Foundation (ASF)
  * </p>
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties b/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties
index 003967e..95dc2aa 100644
--- a/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties
+++ b/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties
@@ -1,3 +1,26 @@
+#
+# @@@ 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 @@@
+#
+
 WMS_.*=---\ WMS\ operation\ complete.
 SQL_UNKNOWN_CMD=---\ SQL\ operation\ complete.
 SQL_CREATE\ TABLE\ .*\ AS\ SELECT\ .*=---\ @rownum@ row(s)\ inserted.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/rest/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/core/rest/conf/log4j.properties b/core/rest/conf/log4j.properties
index 74e0a2b..dc00816 100644
--- a/core/rest/conf/log4j.properties
+++ b/core/rest/conf/log4j.properties
@@ -1,3 +1,26 @@
+#
+# @@@ 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
 rest.root.logger=INFO, console
 rest.security.logger=INFO, console

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/rest/conf/realm.properties
----------------------------------------------------------------------
diff --git a/core/rest/conf/realm.properties b/core/rest/conf/realm.properties
index cd18583..62ee268 100644
--- a/core/rest/conf/realm.properties
+++ b/core/rest/conf/realm.properties
@@ -1 +1,24 @@
+#
+# @@@ 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 @@@
+#
+
 admin: MD5:21232f297a57a5a743894a0e4a801fc3,user,admin
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/rest/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/core/rest/src/test/resources/log4j.properties b/core/rest/src/test/resources/log4j.properties
index 1af420b..0077808 100644
--- a/core/rest/src/test/resources/log4j.properties
+++ b/core/rest/src/test/resources/log4j.properties
@@ -1,3 +1,26 @@
+#
+# @@@ 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
 rest.root.logger=INFO, console
 rest.security.logger=INFO, console

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sqf/export/bin64/.empty-dir
----------------------------------------------------------------------
diff --git a/core/sqf/export/bin64/.empty-dir b/core/sqf/export/bin64/.empty-dir
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sqf/export/bin64d/.empty-dir
----------------------------------------------------------------------
diff --git a/core/sqf/export/bin64d/.empty-dir b/core/sqf/export/bin64d/.empty-dir
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sqf/export/lib/Parse/RecDescent.pm
----------------------------------------------------------------------
diff --git a/core/sqf/export/lib/Parse/RecDescent.pm b/core/sqf/export/lib/Parse/RecDescent.pm
index 58193bf..d52da05 100755
--- a/core/sqf/export/lib/Parse/RecDescent.pm
+++ b/core/sqf/export/lib/Parse/RecDescent.pm
@@ -1,3 +1,26 @@
+#
+# @@@ 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 @@@
+#
+
 # GENERATE RECURSIVE DESCENT PARSER OBJECTS FROM A GRAMMAR
 
 use 5.005;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sqf/src/seatrans/hbase-trx/genvers
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/genvers b/core/sqf/src/seatrans/hbase-trx/genvers
index a7e18e8..ccc880c 100755
--- a/core/sqf/src/seatrans/hbase-trx/genvers
+++ b/core/sqf/src/seatrans/hbase-trx/genvers
@@ -1,3 +1,26 @@
+#
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+#
+
 #!/bin/sh
 CV_VERS=1.0.1
 $MY_SQROOT/export/include/SCMBuildJava.sh $CV_VERS

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/AboutBox.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/AboutBox.ui b/core/sql/SqlCompilerDebugger/AboutBox.ui
index d3df267..138f254 100644
--- a/core/sql/SqlCompilerDebugger/AboutBox.ui
+++ b/core/sql/SqlCompilerDebugger/AboutBox.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>AboutBox</class>
  <widget class="QDialog" name="AboutBox">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/BreakpointDialog.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/BreakpointDialog.ui b/core/sql/SqlCompilerDebugger/BreakpointDialog.ui
index e029694..740ecba 100644
--- a/core/sql/SqlCompilerDebugger/BreakpointDialog.ui
+++ b/core/sql/SqlCompilerDebugger/BreakpointDialog.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>BreakpointDialog</class>
  <widget class="QDialog" name="BreakpointDialog">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/ItemExpressionView.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/ItemExpressionView.ui b/core/sql/SqlCompilerDebugger/ItemExpressionView.ui
index a036b7b..1d7e597 100644
--- a/core/sql/SqlCompilerDebugger/ItemExpressionView.ui
+++ b/core/sql/SqlCompilerDebugger/ItemExpressionView.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>ItemExpressionView</class>
  <widget class="QWidget" name="ItemExpressionView">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/MainWindow.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/MainWindow.ui b/core/sql/SqlCompilerDebugger/MainWindow.ui
index db1d7cb..eb4723c 100644
--- a/core/sql/SqlCompilerDebugger/MainWindow.ui
+++ b/core/sql/SqlCompilerDebugger/MainWindow.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/PropDialog.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/PropDialog.ui b/core/sql/SqlCompilerDebugger/PropDialog.ui
index 77042ea..fe7aeb9 100644
--- a/core/sql/SqlCompilerDebugger/PropDialog.ui
+++ b/core/sql/SqlCompilerDebugger/PropDialog.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>PropDialog</class>
  <widget class="QDialog" name="PropDialog">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/QueryAnalysisView.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/QueryAnalysisView.ui b/core/sql/SqlCompilerDebugger/QueryAnalysisView.ui
index 8256116..16205d1 100644
--- a/core/sql/SqlCompilerDebugger/QueryAnalysisView.ui
+++ b/core/sql/SqlCompilerDebugger/QueryAnalysisView.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>QueryAnalysisView</class>
  <widget class="QWidget" name="QueryAnalysisView">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/QueryMemoView.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/QueryMemoView.ui b/core/sql/SqlCompilerDebugger/QueryMemoView.ui
index a1edad1..7f02bae 100644
--- a/core/sql/SqlCompilerDebugger/QueryMemoView.ui
+++ b/core/sql/SqlCompilerDebugger/QueryMemoView.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>QueryMemoView</class>
  <widget class="QWidget" name="QueryMemoView">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/QueryTreeView.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/QueryTreeView.ui b/core/sql/SqlCompilerDebugger/QueryTreeView.ui
index 552e9e5..2c45ea1 100644
--- a/core/sql/SqlCompilerDebugger/QueryTreeView.ui
+++ b/core/sql/SqlCompilerDebugger/QueryTreeView.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>QueryTreeView</class>
  <widget class="QWidget" name="QueryTreeView">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/RulesDialog.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/RulesDialog.ui b/core/sql/SqlCompilerDebugger/RulesDialog.ui
index 4ec9c81..6175732 100644
--- a/core/sql/SqlCompilerDebugger/RulesDialog.ui
+++ b/core/sql/SqlCompilerDebugger/RulesDialog.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>RulesDialog</class>
  <widget class="QDialog" name="RulesDialog">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/TDBDlgExprList.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/TDBDlgExprList.ui b/core/sql/SqlCompilerDebugger/TDBDlgExprList.ui
index 099a77c..17b9db3 100644
--- a/core/sql/SqlCompilerDebugger/TDBDlgExprList.ui
+++ b/core/sql/SqlCompilerDebugger/TDBDlgExprList.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>TDBDlgExprList</class>
  <widget class="QDialog" name="TDBDlgExprList">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/TDBDlgMdamNet.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/TDBDlgMdamNet.ui b/core/sql/SqlCompilerDebugger/TDBDlgMdamNet.ui
index f7902e3..d0424ce 100644
--- a/core/sql/SqlCompilerDebugger/TDBDlgMdamNet.ui
+++ b/core/sql/SqlCompilerDebugger/TDBDlgMdamNet.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>TDBDlgMdamNet</class>
  <widget class="QDialog" name="TDBDlgMdamNet">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/TDBTreeView.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/TDBTreeView.ui b/core/sql/SqlCompilerDebugger/TDBTreeView.ui
index f5000a6..5c7f345 100644
--- a/core/sql/SqlCompilerDebugger/TDBTreeView.ui
+++ b/core/sql/SqlCompilerDebugger/TDBTreeView.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>TDBTreeView</class>
  <widget class="QWidget" name="TDBTreeView">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/SqlCompilerDebugger/ViewContainer.ui
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/ViewContainer.ui b/core/sql/SqlCompilerDebugger/ViewContainer.ui
index 9306c08..5745d0c 100644
--- a/core/sql/SqlCompilerDebugger/ViewContainer.ui
+++ b/core/sql/SqlCompilerDebugger/ViewContainer.ui
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
 <ui version="4.0">
  <class>ViewContainer</class>
  <widget class="QWidget" name="ViewContainer">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/bin/English.lng
----------------------------------------------------------------------
diff --git a/core/sql/bin/English.lng b/core/sql/bin/English.lng
deleted file mode 100644
index 259b810..0000000
--- a/core/sql/bin/English.lng
+++ /dev/null
@@ -1,2 +0,0 @@
-LANGUAGE ENGLISH, US_ENGLISH
-VERSION 1,1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/executor/trafodion-HBaseAccess.jar.version
----------------------------------------------------------------------
diff --git a/core/sql/executor/trafodion-HBaseAccess.jar.version b/core/sql/executor/trafodion-HBaseAccess.jar.version
deleted file mode 100644
index d68d08e..0000000
--- a/core/sql/executor/trafodion-HBaseAccess.jar.version
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: HP
-Implementation-Version-1: Version 1.0.1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/langman/mxlangman.jar.version
----------------------------------------------------------------------
diff --git a/core/sql/langman/mxlangman.jar.version b/core/sql/langman/mxlangman.jar.version
deleted file mode 100644
index 79d18bf..0000000
--- a/core/sql/langman/mxlangman.jar.version
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: HP
-Implementation-Version-1: Version 1.0.1 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/nskgmake/tdm_sqlmxmsg_intl/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/tdm_sqlmxmsg_intl/Makefile b/core/sql/nskgmake/tdm_sqlmxmsg_intl/Makefile
index fc00746..eb84e40 100755
--- a/core/sql/nskgmake/tdm_sqlmxmsg_intl/Makefile
+++ b/core/sql/nskgmake/tdm_sqlmxmsg_intl/Makefile
@@ -24,26 +24,6 @@
 CPPSRC = vers_libtdm_sqlmxmsg_intl.cpp
 SRCPATH := sqlmsg
 
-###
-### Following are three targets that build the error message resource
-### in roughly this sequence:
-###   SqlciErrors.txt --> English.lng --> sqlmxmsg_msg.mc --> sqlmxmsg_msg.h --> sqlmxmsg_msg.rc
-### Standard rules do further processing:
-###   sqlmxmsg_msg.rc --> sqlmxmsg_msg.res --> ... --> tdm_sqlmxmsg_intl.dll
-###
-
-###
-### Concatenate the header, the message file version, and the
-### actual error messages to one file, $(WORKDIR)/English.lng
-###
-$(TARGOBJDIR)/English.lng : $(TOPDIR)/bin/English.lng
-$(TARGOBJDIR)/English.lng : $(TOPDIR)/bin/SqlciErrors.txt
-	rm -rf $(TARGOBJDIR)/English.lng
-	touch $(TARGOBJDIR)/English.lng
-	cat $(TOPDIR)/bin/English.lng         >> $(TARGOBJDIR)/English.lng
-	sh $(TOPDIR)/toolbin/msgfileVrsn.ksh  >> $(TARGOBJDIR)/English.lng
-	cat $(TOPDIR)/bin/SqlciErrors.txt     >> $(TARGOBJDIR)/English.lng
-
 toolbin/mkmsghdr_linux:
 	cd toolbin/mkmsghdr_src && make mkmsghdr_linux
 	mv -f toolbin/mkmsghdr_src/mkmsghdr_linux toolbin/.
@@ -54,10 +34,5 @@ $(TARGOBJDIR)/sqlmxmsg_msg.h: $(TOPDIR)/bin/SqlciErrors.txt toolbin/mkmsghdr_lin
 
 # This must be done as part of the non-recursive make so that TARGOBJDIR
 # is instantiated correctly with the proper targets.
-$(TARGOBJDIR)/English.lng: TARGOBJDIR:=$(TARGOBJDIR)
-$(TARGOBJDIR)/sqlmxmsg_msg.mc : TARGOBJDIR:=$(TARGOBJDIR)
-$(TARGOBJDIR)/sqlmxmsg_msg.rc : TARGOBJDIR := $(TARGOBJDIR)
-$(TARGOBJDIR)/sqlmxmsg_msg.res : TARGOBJDIR := $(TARGOBJDIR)
-$(TARGOBJDIR)/tdm_sqlmxmsg_msg.res : TARGOBJDIR := $(TARGOBJDIR)
 $(TARGOBJDIR)/sqlmxmsg_msg.h : TARGOBJDIR := $(TARGOBJDIR)
 $(TARGOBJDIR)/sqlmxmsg_msg.h : TOPDIR := $(TOPDIR)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/qmscommon/QRQueries.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRQueries.cpp b/core/sql/qmscommon/QRQueries.cpp
index 4c8819b..833a230 100644
--- a/core/sql/qmscommon/QRQueries.cpp
+++ b/core/sql/qmscommon/QRQueries.cpp
@@ -1,4 +1,4 @@
-/* Hewlett-Packard NonStop(TM) SQL/MX C/C++ Preprocessor 2.5 generated C file. */
+
 
 /**********************************************************************
 // @@@ START COPYRIGHT @@@
@@ -1977,7 +1977,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCount(
 
 #endif /*SQLCLI_HDR*/
 
-/* Hewlett-Packard NonStop(TM) SQL/MX C/C++ Preprocessor 2.5 -- main body of generated source. */
+
 
 static Int32 __SQL_internal_retcode;
 extern SQLMODULE_ID __SQL_mod_199222286715188012;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/regress/hive/EXPECTED009
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009
index 6b7a304..c7a36fe 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -443,10 +443,10 @@ ROW_ID      CATALOG_NAME
 ----------  --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------------  --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
          1  TRAFODION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         _MD_                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
                                            OBJECTS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-         2  TRAFODION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         _HV_HIVE_                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                            PROMOTION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
-         3  HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
                                            PROMOTION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
-         4  TRAFODION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         _HV_SCH_T009_                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
                                            T009T2                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
-         5  HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
                                            ITEM                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+         2  HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
                                            ITEM                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+         3  TRAFODION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         _HV_HIVE_                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                            PROMOTION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
+         4  HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
                                            PROMOTION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
+         5  TRAFODION                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         _HV_SCH_T009_                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
                                            T009T2                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
          6  HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              SCH_T009                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                            T009T2                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
          7  HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
                                            CUSTOMER                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
          8  HIVE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              SCH_T009                                                                                                                                                                                                                                                                                                                                                                                                                                                                               
                                            T009T1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/regress/udr/sampledb
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/sampledb b/core/sql/regress/udr/sampledb
index c34c571..767be67 100755
--- a/core/sql/regress/udr/sampledb
+++ b/core/sql/regress/udr/sampledb
@@ -1,3 +1,26 @@
+--
+-- @@@ 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 @@@
+--
+
 
 create table job      (
                          jobcode        NUMERIC (4) UNSIGNED

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/sqludr/regtest_SEQUENCE.data
----------------------------------------------------------------------
diff --git a/core/sql/sqludr/regtest_SEQUENCE.data b/core/sql/sqludr/regtest_SEQUENCE.data
deleted file mode 100644
index e6e3e48..0000000
--- a/core/sql/sqludr/regtest_SEQUENCE.data
+++ /dev/null
@@ -1 +0,0 @@
-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/sqludr/regtest_SIMPLE_4.xml
----------------------------------------------------------------------
diff --git a/core/sql/sqludr/regtest_SIMPLE_4.xml b/core/sql/sqludr/regtest_SIMPLE_4.xml
deleted file mode 100644
index 143d6a1..0000000
--- a/core/sql/sqludr/regtest_SIMPLE_4.xml
+++ /dev/null
@@ -1 +0,0 @@
-Test XML data for a SAS model

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/core/sql/ustat/mx_ustat.jar.version
----------------------------------------------------------------------
diff --git a/core/sql/ustat/mx_ustat.jar.version b/core/sql/ustat/mx_ustat.jar.version
deleted file mode 100644
index 79d18bf..0000000
--- a/core/sql/ustat/mx_ustat.jar.version
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: HP
-Implementation-Version-1: Version 1.0.1 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/VersionAnnotation.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/VersionAnnotation.java b/dcs/src/main/java/org/trafodion/dcs/VersionAnnotation.java
index 25a0d23..005e7a0 100644
--- a/dcs/src/main/java/org/trafodion/dcs/VersionAnnotation.java
+++ b/dcs/src/main/java/org/trafodion/dcs/VersionAnnotation.java
@@ -1,35 +1,25 @@
-/*
- *(C) Copyright 2013 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/*
- * 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs;
 
 import java.lang.annotation.*;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/rest/ServerResource.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/ServerResource.java b/dcs/src/main/java/org/trafodion/dcs/rest/ServerResource.java
index 166e25b..5a39050 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/ServerResource.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/ServerResource.java
@@ -1,37 +1,25 @@
-/*
- *(C) Copyright 2013 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/*
- * Copyright 2010 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.rest;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/rest/VersionResource.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/VersionResource.java b/dcs/src/main/java/org/trafodion/dcs/rest/VersionResource.java
index 6b013cd..caa7985 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/VersionResource.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/VersionResource.java
@@ -1,37 +1,25 @@
-/*
- *(C) Copyright 2013 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/*
- * Copyright 2010 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.rest;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/rest/WorkloadResource.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/WorkloadResource.java b/dcs/src/main/java/org/trafodion/dcs/rest/WorkloadResource.java
index e088be8..6a17110 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/WorkloadResource.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/WorkloadResource.java
@@ -1,37 +1,25 @@
-/*
- *(C) Copyright 2013 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/*
- * Copyright 2010 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.rest;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadListModel.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadListModel.java b/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadListModel.java
index db52101..9aecf14 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadListModel.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadListModel.java
@@ -1,37 +1,25 @@
-/*
- *(C) Copyright 2013 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/*
- * Copyright 2010 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.rest.model;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadModel.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadModel.java b/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadModel.java
index 6c432f1..1f67edc 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadModel.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/model/WorkloadModel.java
@@ -1,37 +1,25 @@
-/*
- *(C) Copyright 2013 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/*
- * Copyright 2010 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.rest.model;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/rest/provider/JAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/provider/JAXBContextResolver.java b/dcs/src/main/java/org/trafodion/dcs/rest/provider/JAXBContextResolver.java
index e210785..aa3b965 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/provider/JAXBContextResolver.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/provider/JAXBContextResolver.java
@@ -1,37 +1,25 @@
-/*
- *(C) Copyright 2013 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/*
- * Copyright 2010 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.rest.provider;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/rest/provider/producer/PlainTextMessageBodyProducer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/provider/producer/PlainTextMessageBodyProducer.java b/dcs/src/main/java/org/trafodion/dcs/rest/provider/producer/PlainTextMessageBodyProducer.java
index 2339405..5cf1431 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/provider/producer/PlainTextMessageBodyProducer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/provider/producer/PlainTextMessageBodyProducer.java
@@ -1,37 +1,25 @@
-/*
- *(C) Copyright 2013 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
-/*
- * Copyright 2010 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.rest.provider.producer;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4a34a048/dcs/src/main/java/org/trafodion/dcs/script/ScriptContext.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/script/ScriptContext.java b/dcs/src/main/java/org/trafodion/dcs/script/ScriptContext.java
index 82d3fdf..54d3ef6 100644
--- a/dcs/src/main/java/org/trafodion/dcs/script/ScriptContext.java
+++ b/dcs/src/main/java/org/trafodion/dcs/script/ScriptContext.java
@@ -1,18 +1,25 @@
-/**
- *(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
- *
- * 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.
- */
+/**********************************************************************
+* @@@ 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.trafodion.dcs.script;
 
 import java.util.*;



[8/8] incubator-trafodion git commit: Merge various rat-related changes

Posted by db...@apache.org.
Merge various rat-related changes


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

Branch: refs/heads/master
Commit: d5efae37fccdb26ae47291f76ec391087660418f
Parents: df76bab 2b897a4
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Oct 13 17:12:23 2015 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Oct 13 17:12:23 2015 +0000

----------------------------------------------------------------------
 .rat-excludes                                   | 105 +++++++++++++++++++
 RAT_README.txt                                  |  67 ++++++++++++
 core/conn/jdbc_type2/jdbct2.jar.version         |   1 -
 core/conn/jdbc_type4/jdbct4.jar.version         |   1 -
 core/conn/jdbc_type4/lib/.empty-dir             |   0
 .../org/trafodion/jdbc/t4/HPT4DataSource.java   |   2 +-
 .../org/trafodion/jdbc/t4/T4DSProperties.java   |   2 +-
 .../trafciDefaultLookAndFeel.properties         |  23 ++++
 core/rest/conf/log4j.properties                 |  23 ++++
 core/rest/conf/realm.properties                 |  23 ++++
 core/rest/src/test/resources/log4j.properties   |  23 ++++
 core/sqf/export/bin64/.empty-dir                |   0
 core/sqf/export/bin64d/.empty-dir               |   0
 core/sqf/export/lib/Parse/RecDescent.pm         |  23 ++++
 core/sqf/inc/windows/windows.h                  |   1 -
 core/sqf/inc/windows/winnt.h                    |   0
 core/sqf/inc/windows/winperf.h                  |   1 -
 core/sqf/inc/windows/winsock2.h                 |   0
 core/sqf/src/seatrans/hbase-trx/genvers         |  23 ++++
 .../hbase-trx/hbase-protocol/.classpath         |  12 ---
 .../seatrans/hbase-trx/hbase-protocol/.project  |  13 ---
 core/sql/SqlCompilerDebugger/AboutBox.ui        |  19 ++++
 .../sql/SqlCompilerDebugger/BreakpointDialog.ui |  19 ++++
 .../SqlCompilerDebugger/ItemExpressionView.ui   |  19 ++++
 core/sql/SqlCompilerDebugger/MainWindow.ui      |  19 ++++
 core/sql/SqlCompilerDebugger/PropDialog.ui      |  19 ++++
 .../SqlCompilerDebugger/QueryAnalysisView.ui    |  19 ++++
 core/sql/SqlCompilerDebugger/QueryMemoView.ui   |  19 ++++
 core/sql/SqlCompilerDebugger/QueryTreeView.ui   |  19 ++++
 core/sql/SqlCompilerDebugger/RulesDialog.ui     |  19 ++++
 core/sql/SqlCompilerDebugger/TDBDlgExprList.ui  |  19 ++++
 core/sql/SqlCompilerDebugger/TDBDlgMdamNet.ui   |  19 ++++
 core/sql/SqlCompilerDebugger/TDBTreeView.ui     |  19 ++++
 core/sql/SqlCompilerDebugger/ViewContainer.ui   |  19 ++++
 core/sql/bin/English.lng                        |   2 -
 .../executor/trafodion-HBaseAccess.jar.version  |   3 -
 core/sql/langman/mxlangman.jar.version          |   3 -
 core/sql/nskgmake/tdm_sqlmxmsg_intl/Makefile    |  25 -----
 core/sql/qmscommon/QRQueries.cpp                |   4 +-
 core/sql/regress/hive/EXPECTED009               |   8 +-
 core/sql/regress/udr/sampledb                   |  23 ++++
 core/sql/sqludr/regtest_SEQUENCE.data           |   1 -
 core/sql/sqludr/regtest_SIMPLE_4.xml            |   1 -
 core/sql/ustat/mx_ustat.jar.version             |   3 -
 dcs/conf/realm.properties                       |  23 ++++
 .../org/trafodion/dcs/VersionAnnotation.java    |  54 ++++------
 .../org/trafodion/dcs/rest/ServerResource.java  |  56 ++++------
 .../org/trafodion/dcs/rest/VersionResource.java |  56 ++++------
 .../trafodion/dcs/rest/WorkloadResource.java    |  56 ++++------
 .../dcs/rest/model/WorkloadListModel.java       |  56 ++++------
 .../trafodion/dcs/rest/model/WorkloadModel.java |  56 ++++------
 .../dcs/rest/provider/JAXBContextResolver.java  |  56 ++++------
 .../producer/PlainTextMessageBodyProducer.java  |  56 ++++------
 .../org/trafodion/dcs/script/ScriptContext.java |  37 ++++---
 .../org/trafodion/dcs/server/ServerManager.java |  37 ++++---
 .../dcs/util/DcsNetworkConfiguration.java       |  57 ++++------
 .../java/org/trafodion/dcs/util/JdbcT2Util.java |  37 ++++---
 .../java/org/trafodion/dcs/util/JdbcT4Util.java |  37 ++++---
 .../java/org/trafodion/dcs/util/Log4jUtils.java |  37 ++++---
 .../xslt/configuration_to_asciidoc_chapter.xsl  |  74 +++++++------
 60 files changed, 964 insertions(+), 484 deletions(-)
----------------------------------------------------------------------