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:27 UTC

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

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.*;