You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2015/09/21 22:34:10 UTC
[01/18] incubator-trafodion git commit: Copyright headers set #1
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 0895f6de4 -> a982a5c4a
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/sessions.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/sessions.jsp b/dcs/src/main/resources/dcs-webapps/master/sessions.jsp
index dcd9b8f..c3b8ba7 100644
--- a/dcs/src/main/resources/dcs-webapps/master/sessions.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/sessions.jsp
@@ -1,23 +1,27 @@
<%--
/**
- * @@@ START COPYRIGHT @@@
+ *@@@ START COPYRIGHT @@@
*
- * (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.
- *
- * @@@ END COPYRIGHT @@@
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements. See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership. The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *KIND, either express or implied. See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ *
+ * @@@ END COPYRIGHT @@@
*/
+
--%>
<%@ page contentType="text/html;charset=UTF-8"
import="java.io.*"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/server/index.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/server/index.html b/dcs/src/main/resources/dcs-webapps/server/index.html
index ee310b1..d64a294 100644
--- a/dcs/src/main/resources/dcs-webapps/server/index.html
+++ b/dcs/src/main/resources/dcs-webapps/server/index.html
@@ -1,19 +1,5 @@
<!--
/**
- *(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
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/server/server.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/server/server.jsp b/dcs/src/main/resources/dcs-webapps/server/server.jsp
index 625e344..7459fd8 100644
--- a/dcs/src/main/resources/dcs-webapps/server/server.jsp
+++ b/dcs/src/main/resources/dcs-webapps/server/server.jsp
@@ -1,19 +1,5 @@
<%--
/**
- *(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
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/static/dcs.css
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/static/dcs.css b/dcs/src/main/resources/dcs-webapps/static/dcs.css
index e45dd50..725930d 100644
--- a/dcs/src/main/resources/dcs-webapps/static/dcs.css
+++ b/dcs/src/main/resources/dcs-webapps/static/dcs.css
@@ -1,18 +1,4 @@
/**
- *(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
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 428a5f9..fc3eef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,26 @@
<?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.
+/*
+ * @@@ 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 @@@
+ *
+ */
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
[18/18] incubator-trafodion git commit: Merge [TRAFODION-28] PR-85
Copyright header changes part 2
Posted by rm...@apache.org.
Merge [TRAFODION-28] PR-85 Copyright header changes part 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a982a5c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a982a5c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a982a5c4
Branch: refs/heads/master
Commit: a982a5c4abe9ca4724c7498d274d538cd97ef784
Parents: 0895f6d 10ad97a
Author: Roberta Marton <ro...@esgyn.com>
Authored: Mon Sep 21 19:42:42 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Mon Sep 21 19:42:42 2015 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/jdbcUtil.cpp | 1 -
.../src/main/java/JdbcMxLobAdmin.java | 3 +-
.../jdbc/t4/HPT4ConnectionPoolDataSource.java | 2 +-
.../src/org/trafodion/jdbc/t4/T4Driver.java | 2 +-
.../src/org/trafodion/jdbc/t4/T4Properties.java | 2 +-
core/conn/jdbc_type4/test/RunAllTests.java | 36 +++++----
.../test/org/trafodion/jdbc/t4/BaseTest.java | 36 +++++----
.../org/trafodion/jdbc/t4/T4DriverTest.java | 36 +++++----
.../odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC | 4 +-
core/dbsecurity/scripts/sqcertgen | 7 +-
core/rest/bin/rest | 33 ++++----
core/rest/bin/rest-config.sh | 33 ++++----
core/rest/bin/rest-daemon.sh | 33 ++++----
core/rest/bin/scripts/sys_shell.py | 33 ++++----
core/rest/bin/start-rest.sh | 33 ++++----
core/rest/bin/stop-rest.sh | 33 ++++----
core/rest/conf/rest-env.sh | 33 ++++----
core/rest/conf/rest-site.xml | 33 ++++----
core/rest/pom.xml | 37 +++++----
core/rest/src/assembly/all.xml | 36 +++++----
core/rest/src/main/asciidoc/_chapters/apis.adoc | 33 ++++----
.../appendix_contributing_to_documentation.adoc | 33 ++++----
.../main/asciidoc/_chapters/architecture.adoc | 33 ++++----
.../main/asciidoc/_chapters/configuration.adoc | 33 ++++----
.../asciidoc/_chapters/getting_started.adoc | 33 ++++----
.../src/main/asciidoc/_chapters/preface.adoc | 33 ++++----
.../asciidoc/_chapters/troubleshooting.adoc | 33 ++++----
core/rest/src/main/asciidoc/index.adoc | 59 +++++++++------
core/rest/src/main/asciidoc/rest.css | 33 ++++----
.../main/java/org/trafodion/rest/Constants.java | 33 ++++----
.../org/trafodion/rest/GetStatusResponse.java | 34 +++++----
.../java/org/trafodion/rest/RESTServlet.java | 33 ++++----
.../org/trafodion/rest/RegisteredServer.java | 33 ++++----
.../java/org/trafodion/rest/ResourceBase.java | 34 +++++----
.../java/org/trafodion/rest/ResourceConfig.java | 34 +++++----
.../java/org/trafodion/rest/RestConstants.java | 33 ++++----
.../java/org/trafodion/rest/RootResource.java | 34 +++++----
.../java/org/trafodion/rest/RunningServer.java | 33 ++++----
.../java/org/trafodion/rest/ServerResource.java | 59 ++++++++++-----
.../java/org/trafodion/rest/TrafodionRest.java | 33 ++++----
.../trafodion/rest/TransactionsResource.java | 42 ++++++-----
.../org/trafodion/rest/VersionAnnotation.java | 41 +++++-----
.../org/trafodion/rest/VersionResource.java | 62 ++++++++++-----
.../java/org/trafodion/rest/client/Client.java | 33 ++++----
.../java/org/trafodion/rest/client/Cluster.java | 33 ++++----
.../org/trafodion/rest/client/Response.java | 33 ++++----
.../org/trafodion/rest/model/VersionModel.java | 33 ++++----
.../rest/provider/JAXBContextResolver.java | 61 ++++++++++-----
.../producer/PlainTextMessageBodyProducer.java | 61 ++++++++++-----
.../trafodion/rest/script/ScriptContext.java | 33 ++++----
.../trafodion/rest/script/ScriptManager.java | 33 ++++----
.../rest/script/ScriptManagerWatcher.java | 33 ++++----
.../java/org/trafodion/rest/util/Base64.java | 33 ++++----
.../java/org/trafodion/rest/util/Bytes.java | 33 ++++----
.../java/org/trafodion/rest/util/ConfTool.java | 33 ++++----
.../trafodion/rest/util/GetJavaProperty.java | 33 ++++----
.../org/trafodion/rest/util/JdbcT2Util.java | 33 ++++----
.../org/trafodion/rest/util/JdbcT4Util.java | 33 ++++----
.../rest/util/NetworkConfiguration.java | 33 ++++----
.../trafodion/rest/util/RestConfiguration.java | 33 ++++----
.../org/trafodion/rest/util/RetryCounter.java | 33 ++++----
.../rest/util/RetryCounterFactory.java | 33 ++++----
.../java/org/trafodion/rest/util/Strings.java | 33 ++++----
.../org/trafodion/rest/util/VersionInfo.java | 33 ++++----
.../org/trafodion/rest/version/util/VerGen.java | 33 ++++----
.../org/trafodion/rest/zookeeper/ZKConfig.java | 33 ++++----
.../trafodion/rest/zookeeper/ZKServerTool.java | 33 ++++----
.../org/trafodion/rest/zookeeper/ZkClient.java | 33 ++++----
.../trafodion/rest/zookeeper/ZkQuorumPeer.java | 33 ++++----
.../org/trafodion/rest/zookeeper/ZkUtil.java | 33 ++++----
.../rest/zookeeper/ZooKeeperMainServerArg.java | 33 ++++----
core/rest/src/main/resources/rest-default.xml | 38 +++++-----
.../xslt/configuration_to_asciidoc_chapter.xsl | 67 ++++++++++-------
core/rest/src/saveVersion.sh | 40 +++++-----
.../org/trafodion/rest/IntegrationTests.java | 33 ++++----
.../java/org/trafodion/rest/LargeTests.java | 33 ++++----
.../java/org/trafodion/rest/MediumTests.java | 33 ++++----
.../org/trafodion/rest/ResourceChecker.java | 33 ++++----
.../rest/ResourceCheckerJUnitRule.java | 33 ++++----
.../java/org/trafodion/rest/SmallTests.java | 33 ++++----
core/rest/src/test/resources/rest-default.xml | 33 ++++----
core/sqf/sqenvcom.sh | 2 +-
.../transactional/TrxRegionObserver.java | 40 +++++-----
core/sqf/src/tm/tmddlrequests.cpp | 36 +++++----
core/sql/bin/vprocmxlobsrvr.cpp | 4 +-
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C | 16 ----
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N | 15 ----
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640 | 15 ----
core/sql/regress/newregr/mvs/BIG/TESTMV215C | 15 ----
core/sql/regress/newregr/mvs/BIG/TESTMV640 | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215 | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215IR | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215_DE | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215_RU | 15 ----
.../mvs/BIG/TestMV215_With_RefreshUtilty | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215b | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215e | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215g | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215h | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215j | 15 ----
core/sql/regress/newregr/mvs/BIG/TestMV215n | 15 ----
core/sql/regress/newregr/mvs/BIG/Testmv215m | 15 ----
core/sql/regress/newregr/mvs/BIG/expectedMV215e | 15 ----
core/sql/regress/newregr/mvs/BIG/expectedMV215g | 15 ----
core/sql/regress/newregr/mvs/BIG/expectedMV215h | 15 ----
core/sql/regress/newregr/mvs/BIG/expectedmv215 | 15 ----
.../sql/regress/newregr/mvs/BIG/expectedmv215IR | 15 ----
.../regress/newregr/mvs/BIG/expectedmv215_DE | 15 ----
.../regress/newregr/mvs/BIG/expectedmv215_RU | 15 ----
core/sql/regress/newregr/mvs/BIG/expectedmv215b | 15 ----
core/sql/regress/newregr/mvs/BIG/expectedmv215m | 15 ----
core/sql/regress/newregr/rowsets/teste001.sql | 4 -
core/sql/regress/newregr/rowsets/teste005.sql | 4 -
core/sql/regress/newregr/rowsets/teste011.sql | 4 -
core/sql/regress/newregr/rowsets/teste015.sql | 4 -
core/sql/regress/newregr/rowsets/teste021.sql | 4 -
core/sql/regress/newregr/rowsets/teste025.sql | 4 -
core/sql/regress/newregr/rowsets/teste041.sql | 4 -
core/sql/regress/newregr/rowsets/teste045.sql | 4 -
core/sql/regress/newregr/rowsets/teste051.sql | 4 -
core/sql/regress/newregr/rowsets/teste055.sql | 4 -
core/sql/regress/newregr/rowsets/teste061.sql | 4 -
core/sql/regress/newregr/rowsets/teste065.sql | 4 -
core/sql/regress/newregr/rowsets/teste071.sql | 4 -
core/sql/regress/newregr/rowsets/teste075.sql | 4 -
core/sql/regress/newregr/rowsets/teste081.sql | 4 -
core/sql/regress/newregr/rowsets/teste085.sql | 4 -
core/sql/regress/newregr/rowsets/teste091.sql | 4 -
core/sql/regress/newregr/rowsets/teste101.sql | 4 -
core/sql/regress/newregr/rowsets/teste105.sql | 4 -
core/sql/regress/newregr/rowsets/teste111.sql | 4 -
core/sql/regress/newregr/rowsets/teste121.sql | 4 -
core/sql/regress/newregr/rowsets/teste135.sql | 4 -
core/sql/regress/newregr/rowsets/teste140.sql | 4 -
core/sql/regress/newregr/rowsets/teste141.sql | 4 -
core/sql/regress/newregr/rowsets/teste145.sql | 4 -
core/sql/regress/newregr/rowsets/teste201.sql | 4 -
core/sql/regress/newregr/rowsets/teste205.sql | 4 -
core/sql/regress/newregr/rowsets/teste211.sql | 4 -
core/sql/regress/newregr/rowsets/teste215.sql | 4 -
core/sql/regress/newregr/rowsets/teste221.sql | 4 -
core/sql/regress/newregr/rowsets/teste225.sql | 4 -
core/sql/regress/newregr/rowsets/teste232.sql | 4 -
core/sql/regress/newregr/rowsets/teste235.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_1.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_2.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_3.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_4.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_5.sql | 4 -
.../sql/regress/newregr/triggers/etest_14_6.sql | 4 -
dcs/bin/dcs | 33 ++++----
dcs/bin/dcs-config.sh | 33 ++++----
dcs/bin/dcs-daemon.sh | 33 ++++----
dcs/bin/dcs-daemons.sh | 33 ++++----
dcs/bin/local-servers.sh | 33 ++++----
dcs/bin/scripts/dcsbind.sh | 33 ++++----
dcs/bin/scripts/sys_shell.py | 35 +++++----
dcs/conf/dcs-env.sh | 53 +++++--------
dcs/conf/dcs-site.xml | 63 ++++++----------
dcs/pom.xml | 56 ++++++--------
dcs/src/assembly/all.xml | 21 +-----
.../appendix_contributing_to_documentation.adoc | 3 +-
.../main/asciidoc/_chapters/architecture.adoc | 32 ++++----
.../main/asciidoc/_chapters/configuration.adoc | 34 +++++----
.../main/asciidoc/_chapters/external_apis.adoc | 3 +-
dcs/src/main/asciidoc/_chapters/faq.adoc | 3 +-
.../asciidoc/_chapters/getting_started.adoc | 34 +++++----
dcs/src/main/asciidoc/_chapters/ops_mgt.adoc | 3 +-
.../main/asciidoc/_chapters/performance.adoc | 3 +-
dcs/src/main/asciidoc/_chapters/preface.adoc | 32 ++++----
.../asciidoc/_chapters/troubleshooting.adoc | 3 +-
dcs/src/main/asciidoc/dcs.css | 33 ++++----
dcs/src/main/asciidoc/index.adoc | 61 ++++++++-------
.../dcs/tmpl/master/MasterStatusTmpl.jamon | 50 +++++--------
.../dcs/tmpl/server/ServerStatusTmpl.jamon | 51 +++++--------
.../dcs/tmpl/servermt/ServerStatusTmpl.jamon | 51 +++++--------
.../main/java/org/trafodion/dcs/Constants.java | 53 +++++--------
.../org/trafodion/dcs/VersionAnnotation.java | 22 +++++-
.../org/trafodion/dcs/http/FilterContainer.java | 33 ++++----
.../org/trafodion/dcs/http/HtmlQuoting.java | 33 ++++----
.../java/org/trafodion/dcs/http/HttpServer.java | 33 ++++----
.../org/trafodion/dcs/master/DcsMaster.java | 33 ++++----
.../org/trafodion/dcs/master/FloatingIp.java | 33 ++++----
.../dcs/master/MasterLeaderElection.java | 33 ++++----
.../dcs/master/MasterStatusServlet.java | 33 ++++----
.../java/org/trafodion/dcs/master/Metrics.java | 33 ++++----
.../trafodion/dcs/master/RegisteredServer.java | 33 ++++----
.../org/trafodion/dcs/master/RunningServer.java | 33 ++++----
.../org/trafodion/dcs/master/ServerItem.java | 33 ++++----
.../org/trafodion/dcs/master/ServerManager.java | 33 ++++----
.../dcs/master/listener/ClientData.java | 33 ++++----
.../dcs/master/listener/ConnectReply.java | 33 ++++----
.../dcs/master/listener/ConnectionContext.java | 33 ++++----
.../dcs/master/listener/DataEvent.java | 33 ++++----
.../dcs/master/listener/GetObjRefException.java | 33 ++++----
.../trafodion/dcs/master/listener/Header.java | 33 ++++----
.../dcs/master/listener/ListenerConstants.java | 33 ++++----
.../dcs/master/listener/ListenerMetrics.java | 33 ++++----
.../dcs/master/listener/ListenerService.java | 33 ++++----
.../dcs/master/listener/ListenerWorker.java | 33 ++++----
.../dcs/master/listener/PendingRequest.java | 33 ++++----
.../dcs/master/listener/RequestCancelQuery.java | 33 ++++----
.../master/listener/RequestGetObjectRef.java | 33 ++++----
.../dcs/master/listener/RequestUnknown.java | 33 ++++----
.../trafodion/dcs/master/listener/UserDesc.java | 33 ++++----
.../org/trafodion/dcs/master/listener/Util.java | 33 ++++----
.../trafodion/dcs/master/listener/Version.java | 33 ++++----
.../dcs/master/listener/VersionList.java | 33 ++++----
.../java/org/trafodion/dcs/rest/DcsRest.java | 33 ++++----
.../trafodion/dcs/rest/GetStatusResponse.java | 54 ++++++-------
.../org/trafodion/dcs/rest/RESTServlet.java | 33 ++++----
.../org/trafodion/dcs/rest/ResourceBase.java | 54 ++++++-------
.../org/trafodion/dcs/rest/ResourceConfig.java | 54 ++++++-------
.../org/trafodion/dcs/rest/RestConstants.java | 33 ++++----
.../org/trafodion/dcs/rest/RootResource.java | 54 ++++++-------
.../org/trafodion/dcs/rest/ServerConnector.java | 33 ++++----
.../org/trafodion/dcs/rest/ServerResource.java | 22 +++++-
.../org/trafodion/dcs/rest/VersionResource.java | 25 +++++--
.../trafodion/dcs/rest/WorkloadResource.java | 22 +++++-
.../org/trafodion/dcs/rest/client/Client.java | 33 ++++----
.../org/trafodion/dcs/rest/client/Cluster.java | 33 ++++----
.../org/trafodion/dcs/rest/client/Response.java | 33 ++++----
.../trafodion/dcs/rest/model/ServerModel.java | 54 ++++++-------
.../trafodion/dcs/rest/model/VersionModel.java | 33 ++++----
.../dcs/rest/model/WorkloadListModel.java | 21 +++++-
.../trafodion/dcs/rest/model/WorkloadModel.java | 21 +++++-
.../dcs/rest/provider/JAXBContextResolver.java | 24 +++++-
.../producer/PlainTextMessageBodyProducer.java | 24 +++++-
.../org/trafodion/dcs/script/ScriptManager.java | 33 ++++----
.../dcs/script/ScriptManagerWatcher.java | 33 ++++----
.../org/trafodion/dcs/server/DcsServer.java | 33 ++++----
.../java/org/trafodion/dcs/server/Metrics.java | 33 ++++----
.../dcs/server/ServerStatusServlet.java | 33 ++++----
.../org/trafodion/dcs/servermt/DcsServer.java | 33 ++++----
.../org/trafodion/dcs/servermt/Metrics.java | 33 ++++----
.../trafodion/dcs/servermt/ServerConstants.java | 33 ++++----
.../trafodion/dcs/servermt/ServerManager.java | 33 ++++----
.../dcs/servermt/ServerStatusServlet.java | 33 ++++----
.../org/trafodion/dcs/servermt/ServerUtils.java | 33 ++++----
.../servermt/serverDriverInputOutput/Close.java | 33 ++++----
.../ConnectionContext.java | 33 ++++----
.../serverDriverInputOutput/Descriptor2.java | 33 ++++----
.../Descriptor2List.java | 33 ++++----
.../serverDriverInputOutput/ErrorDesc.java | 33 ++++----
.../serverDriverInputOutput/ErrorDescList.java | 33 ++++----
.../serverDriverInputOutput/Header.java | 33 ++++----
.../OutConnectionContext.java | 33 ++++----
.../serverDriverInputOutput/SQLDataValue.java | 33 ++++----
.../serverDriverInputOutput/SQLValue.java | 33 ++++----
.../serverDriverInputOutput/SQLValueList.java | 33 ++++----
.../SQLWarningOrError.java | 33 ++++----
.../SQLWarningOrErrorList.java | 33 ++++----
.../ServerException.java | 33 ++++----
.../SetConnectionOption.java | 33 ++++----
.../serverDriverInputOutput/UserDesc.java | 33 ++++----
.../serverDriverInputOutput/Version.java | 33 ++++----
.../serverDriverInputOutput/VersionList.java | 33 ++++----
.../dcs/servermt/serverHandler/ClientData.java | 33 ++++----
.../dcs/servermt/serverHandler/DataEvent.java | 33 ++++----
.../servermt/serverHandler/PendingRequest.java | 33 ++++----
.../serverHandler/ServerApiGetCatalogs.java | 33 ++++----
.../serverHandler/ServerApiSqlClose.java | 33 ++++----
.../serverHandler/ServerApiSqlConnect.java | 33 ++++----
.../serverHandler/ServerApiSqlDisconnect.java | 33 ++++----
.../serverHandler/ServerApiSqlEndTransact.java | 33 ++++----
.../serverHandler/ServerApiSqlExecDirect.java | 33 ++++----
.../serverHandler/ServerApiSqlExecute.java | 33 ++++----
.../serverHandler/ServerApiSqlFetch.java | 33 ++++----
.../serverHandler/ServerApiSqlPrepare.java | 33 ++++----
.../ServerApiSqlSetConnectAttr.java | 33 ++++----
.../servermt/serverHandler/ServerHandler.java | 33 ++++----
.../servermt/serverHandler/ServerWorker.java | 33 ++++----
.../dcs/servermt/serverSql/TrafConnection.java | 33 ++++----
.../dcs/servermt/serverSql/TrafStatement.java | 33 ++++----
.../java/org/trafodion/dcs/util/Base64.java | 14 ----
.../main/java/org/trafodion/dcs/util/Bytes.java | 14 ----
.../org/trafodion/dcs/util/DcsConfTool.java | 14 ----
.../trafodion/dcs/util/DcsConfiguration.java | 14 ----
.../org/trafodion/dcs/util/GetJavaProperty.java | 14 ----
.../java/org/trafodion/dcs/util/InfoServer.java | 14 ----
.../org/trafodion/dcs/util/RetryCounter.java | 14 ----
.../trafodion/dcs/util/RetryCounterFactory.java | 14 ----
.../java/org/trafodion/dcs/util/Strings.java | 14 ----
.../org/trafodion/dcs/util/VersionInfo.java | 14 ----
.../org/trafodion/dcs/version/util/VerGen.java | 33 ++++----
.../trafodion/dcs/zookeeper/DcsQuorumPeer.java | 33 ++++----
.../org/trafodion/dcs/zookeeper/ZKConfig.java | 33 ++++----
.../trafodion/dcs/zookeeper/ZKServerTool.java | 33 ++++----
.../org/trafodion/dcs/zookeeper/ZkClient.java | 33 ++++----
.../org/trafodion/dcs/zookeeper/ZkUtil.java | 33 ++++----
.../dcs/zookeeper/ZooKeeperMainServerArg.java | 33 ++++----
dcs/src/main/resources/dcs-default.xml | 56 ++++++--------
.../dcs-webapps/master/aggr_querystats.html | 33 ++++----
.../dcs-webapps/master/aggr_querystats.jsp | 31 ++++----
.../dcs-webapps/master/css/Spacetree.css | 33 ++++----
.../resources/dcs-webapps/master/css/base.css | 33 ++++----
.../dcs-webapps/master/executeQuery.jsp | 31 ++++----
.../resources/dcs-webapps/master/explain.html | 33 ++++----
.../resources/dcs-webapps/master/index.html | 14 ----
.../dcs-webapps/master/js/ExplainPlanView.js | 33 ++++----
.../main/resources/dcs-webapps/master/logs.html | 33 ++++----
.../resources/dcs-webapps/master/master.jsp | 14 ----
.../resources/dcs-webapps/master/queryPlan.jsp | 31 ++++----
.../dcs-webapps/master/querystats.html | 33 ++++----
.../resources/dcs-webapps/master/querystats.jsp | 35 +++++----
.../resources/dcs-webapps/master/repository.jsp | 31 ++++----
.../resources/dcs-webapps/master/servers.jsp | 30 +++-----
.../resources/dcs-webapps/master/sessions.html | 33 ++++----
.../resources/dcs-webapps/master/sessions.jsp | 36 +++++----
.../resources/dcs-webapps/server/index.html | 14 ----
.../resources/dcs-webapps/server/server.jsp | 14 ----
.../main/resources/dcs-webapps/static/dcs.css | 14 ----
dcs/src/saveVersion.sh | 49 +++++-------
.../trafodion/dcs/IntegrationTestEndurance.java | 33 ++++----
.../org/trafodion/dcs/IntegrationTests.java | 33 ++++----
.../test/java/org/trafodion/dcs/LargeTests.java | 33 ++++----
.../java/org/trafodion/dcs/MediumTests.java | 33 ++++----
.../org/trafodion/dcs/ReposPublicationTest.java | 33 ++++----
.../org/trafodion/dcs/ReposTableAccessTest.java | 33 ++++----
.../java/org/trafodion/dcs/ResourceChecker.java | 33 ++++----
.../trafodion/dcs/ResourceCheckerJUnitRule.java | 33 ++++----
.../test/java/org/trafodion/dcs/SmallTests.java | 33 ++++----
dcs/src/test/jdbc_test/README.rst | 38 +++++-----
dcs/src/test/jdbc_test/jdbc_test.py | 39 +++++-----
dcs/src/test/jdbc_test/pom.xml.template | 4 -
.../java/org/trafodion/jdbc_test/PropTest.java | 53 ++++++++-----
.../java/org/trafodion/jdbc_test/TestBasic.java | 77 +++++++++++++------
.../java/org/trafodion/jdbc_test/TestBatch.java | 77 +++++++++++++------
.../org/trafodion/jdbc_test/TestBigCol.java | 79 ++++++++++++++------
.../trafodion/jdbc_test/TestBigColumnSize.java | 53 ++++++++-----
.../java/org/trafodion/jdbc_test/TestCat.java | 53 ++++++++-----
.../java/org/trafodion/jdbc_test/TestMisc.java | 53 ++++++++-----
.../java/org/trafodion/jdbc_test/TestTrx.java | 77 +++++++++++++------
.../java/org/trafodion/jdbc_test/Utils.java | 53 ++++++++-----
dcs/src/test/pytests/test-requirements.txt | 2 +-
dcs/src/test/pytests/test_p2.py | 35 +++++----
dcs/src/test/resources/dcs-default.xml | 35 +++++----
pom.xml | 35 +++++----
tests/phx/pom.xml.template | 4 -
win-odbc64/Common/Compression.cpp | 27 ++++---
win-odbc64/Common/Compression.h | 33 ++++----
win-odbc64/Common/DrvrSrvr.h | 25 ++++---
win-odbc64/Common/ExpConvMxcs.cpp | 25 ++++---
win-odbc64/Common/NLSFunctions.cpp | 25 ++++---
win-odbc64/Common/NLSFunctions.h | 25 ++++---
win-odbc64/Common/OdbcMsg.cpp | 25 ++++---
win-odbc64/Common/OdbcMsg.h | 25 ++++---
win-odbc64/Common/RegValues.h | 25 ++++---
win-odbc64/Common/TCPIPSystemDrvr.cpp | 33 ++++----
win-odbc64/Common/TCPIPSystemDrvr.h | 25 ++++---
win-odbc64/Common/TransportBase.cpp | 25 ++++---
win-odbc64/Common/TransportBase.h | 25 ++++---
win-odbc64/Common/inoutparams.h | 25 ++++---
win-odbc64/Common/iputils.h | 25 ++++---
win-odbc64/Common/marshaling.cpp | 25 ++++---
win-odbc64/Common/marshaling.h | 25 ++++---
win-odbc64/Common/marshalingdrvr_drvr.cpp | 25 ++++---
win-odbc64/Common/marshalingdrvr_drvr.h | 25 ++++---
win-odbc64/Common/nskieee.cpp | 25 ++++---
win-odbc64/Common/nskieee.h | 25 ++++---
win-odbc64/Common/odbcMxSecurity.h | 25 ++++---
win-odbc64/Common/ping.cpp | 25 ++++---
win-odbc64/Common/ping.h | 25 ++++---
win-odbc64/Common/swap.cpp | 25 ++++---
win-odbc64/Common/swap.h | 25 ++++---
.../SetCertificateDirReg/SetCertDirDlg.cpp | 25 ++++---
.../SetCertificateDirReg/SetCertDirDlg.h | 25 ++++---
.../SetCertificateDirReg.cpp | 25 ++++---
.../SetCertificateDirReg/SetCertificateDirReg.h | 25 ++++---
.../SetCertificateDirReg/resource.h | 25 ++++---
.../SetCertificateDirReg/stdafx.cpp | 25 ++++---
.../SetCertificateDirReg/stdafx.h | 25 ++++---
.../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp | 25 ++++---
.../Install/UpdateDSN/UpdateDSN/stdafx.cpp | 25 ++++---
win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h | 25 ++++---
win-odbc64/odbcclient/DSNConverter/DSList.cpp | 25 ++++---
win-odbc64/odbcclient/DSNConverter/DSList.h | 25 ++++---
.../odbcclient/DSNConverter/DSNConverter.cpp | 25 ++++---
.../odbcclient/DSNConverter/DSNConverter.def | 33 ++++----
.../odbcclient/DSNConverter/DSNConverter.h | 25 ++++---
.../odbcclient/DSNConverter/ODBCMXAttribs.h | 25 ++++---
win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp | 25 ++++---
win-odbc64/odbcclient/DSNConverter/OdbcDS.h | 25 ++++---
win-odbc64/odbcclient/DSNConverter/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/DSNConverter/StdAfx.h | 25 ++++---
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp | 25 ++++---
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def | 33 ++++----
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h | 25 ++++---
win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/Drvr35Res/StdAfx.h | 25 ++++---
win-odbc64/odbcclient/README.txt | 33 ++++----
win-odbc64/odbcclient/TranslationDll/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/TranslationDll/StdAfx.h | 25 ++++---
.../TranslationDll/TranslationDll.cpp | 25 ++++---
.../TranslationDll/TranslationDll.def | 33 ++++----
.../odbcclient/TranslationDll/TranslationDll.h | 25 ++++---
win-odbc64/odbcclient/build_os.bat | 33 ++++----
.../odbcclient/drvr35/Interface/Transport.cpp | 25 ++++---
.../odbcclient/drvr35/Interface/Transport.h | 25 ++++---
.../odbcclient/drvr35/Interface/odbcas_drvr.cpp | 25 ++++---
.../odbcclient/drvr35/Interface/odbcas_drvr.h | 25 ++++---
.../odbcclient/drvr35/Interface/odbcs_drvr.cpp | 25 ++++---
.../odbcclient/drvr35/Interface/odbcs_drvr.h | 25 ++++---
win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h | 25 ++++---
.../odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp | 25 ++++---
.../odbcclient/drvr35/TCPIPV4/TCPIPV4.def | 21 +++++-
win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h | 25 ++++---
win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h | 25 ++++---
.../odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp | 25 ++++---
.../odbcclient/drvr35/TCPIPV6/TCPIPV6.def | 21 +++++-
win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cconnect.cpp | 33 ++++----
win-odbc64/odbcclient/drvr35/cconnect.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cdatasource.cpp | 33 ++++----
win-odbc64/odbcclient/drvr35/cdatasource.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cdesc.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/cdesc.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cdiag.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/cdiag.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cenv.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/cenv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/chandle.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/chandle.h | 25 ++++---
win-odbc64/odbcclient/drvr35/charsetconv.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/charsetconv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cstmt.h | 25 ++++---
win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/ctosqlconv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/diagfunctions.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/diagfunctions.h | 25 ++++---
win-odbc64/odbcclient/drvr35/drvr35.def | 21 +++++-
win-odbc64/odbcclient/drvr35/drvrglobal.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/drvrglobal.h | 25 ++++---
win-odbc64/odbcclient/drvr35/drvrnet.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/drvrnet.h | 25 ++++---
win-odbc64/odbcclient/drvr35/netcommon.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/netconnect.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/netstmt.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlconnect.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlconnect.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqldesc.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqldesc.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlenv.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlenv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlhandle.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlhandle.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlstmt.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlstmt.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 33 ++++----
win-odbc64/odbcclient/drvr35/sqltocconv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqltrace.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/drvr35adm.def | 21 +++++-
win-odbc64/odbcclient/drvr35adm/drvr35adm.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagegeneral.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagelocaltr.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp | 33 ++++----
win-odbc64/odbcclient/drvr35adm/pagenetwork.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pageoptions.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pageoptions.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagetesting.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagetracing.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagetracing.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/propsheet.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/propsheet.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/stdafx.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/stdafx.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagegeneral.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpagegeneral.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagelocaltr.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpagelocaltr.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagenetwork.cpp | 33 ++++----
.../odbcclient/drvr35adm/tabpagenetwork.h | 25 ++++---
.../odbcclient/drvr35adm/tabpageoptions.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpageoptions.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagetesting.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpagetesting.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagetracing.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpagetracing.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/testdialog.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/testdialog.h | 25 ++++---
win-odbc64/odbcclient/inc/trafsqlext.h | 25 ++++---
win-odbc64/odbcclient/pkg.bat | 33 ++++----
.../security_dll/native/common/clientErrCode.h | 25 ++++---
.../security_dll/native/common/secdefsCommon.h | 25 ++++---
win-odbc64/security_dll/native/common/timeval.h | 25 ++++---
win-odbc64/security_dll/native/common/utils.h | 25 ++++---
win-odbc64/security_dll/native/header/Cipher.h | 25 ++++---
win-odbc64/security_dll/native/header/Key.h | 25 ++++---
.../security_dll/native/header/MessageDigest.h | 25 ++++---
.../security_dll/native/header/StaticLocking.h | 25 ++++---
win-odbc64/security_dll/native/header/secpwd.h | 25 ++++---
.../security_dll/native/header/security.h | 25 ++++---
.../native/header/securityException.h | 25 ++++---
.../security_dll/native/source/Cipher.cpp | 25 ++++---
win-odbc64/security_dll/native/source/Key.cpp | 25 ++++---
.../native/source/MessageDigest.cpp | 25 ++++---
.../security_dll/native/source/Security.cpp | 25 ++++---
.../native/source/StaticLocking.cpp | 25 ++++---
.../native/source/securityException.cpp | 25 ++++---
win-odbc64/security_dll/native/source/utils.cpp | 25 ++++---
.../security_dll/native/source/version.cpp | 25 ++++---
win-odbc64/sql/cli/sqlcli.h | 25 ++++---
win-odbc64/sql/common/Platform.h | 25 ++++---
win-odbc64/sql/common/UCS_jp_data.c | 25 ++++---
win-odbc64/sql/common/UCS_ko_data.c | 25 ++++---
win-odbc64/sql/common/UCS_zb_data.c | 25 ++++---
win-odbc64/sql/common/UCS_zs_data.c | 25 ++++---
win-odbc64/sql/common/csconvert.cpp | 25 ++++---
win-odbc64/sql/common/csconvert.h | 25 ++++---
win-odbc64/sql/common/fcconv.h | 25 ++++---
win-odbc64/sql/common/from_GB18030.c | 25 ++++---
win-odbc64/sql/common/from_GB2312.c | 25 ++++---
win-odbc64/sql/common/from_GBK.c | 25 ++++---
win-odbc64/sql/common/gb18030_data.c | 25 ++++---
win-odbc64/sql/common/iconv_gen.c | 25 ++++---
win-odbc64/sql/common/mb_iconv.c | 25 ++++---
win-odbc64/sql/common/mb_lconv.c | 25 ++++---
win-odbc64/sql/common/multi-byte.h | 33 ++++----
wms/bin/local-servers.sh | 33 ++++----
wms/bin/scripts/sys_shell.py | 33 ++++----
wms/bin/servers.sh | 33 ++++----
wms/bin/start-wms.sh | 50 +++++--------
wms/bin/stop-wms.sh | 50 +++++--------
wms/bin/wms | 49 +++++-------
wms/bin/wms-config.sh | 50 +++++--------
wms/bin/wms-daemon.sh | 50 +++++--------
wms/bin/wms-daemons.sh | 50 +++++--------
wms/bin/zookeepers.sh | 50 +++++--------
wms/conf/wms-env.sh | 50 +++++--------
wms/conf/wms-site.xml | 50 +++++--------
wms/pom.xml | 17 -----
wms/src/assembly/all.xml | 53 ++++++-------
.../wms/tmpl/master/MasterStatusTmpl.jamon | 18 +----
.../wms/tmpl/server/ServerStatusTmpl.jamon | 18 +----
.../main/java/org/trafodion/wms/Constants.java | 52 +++++--------
.../org/trafodion/wms/http/FilterContainer.java | 51 ++++++-------
.../org/trafodion/wms/http/HtmlQuoting.java | 51 ++++++-------
.../java/org/trafodion/wms/http/HttpServer.java | 53 ++++++-------
.../wms/master/MasterStatusServlet.java | 53 ++++++-------
.../java/org/trafodion/wms/master/Metrics.java | 33 ++++----
.../org/trafodion/wms/master/ServerManager.java | 33 ++++----
.../org/trafodion/wms/master/WmsMaster.java | 33 ++++----
.../org/trafodion/wms/script/ScriptContext.java | 33 ++++----
.../org/trafodion/wms/script/ScriptManager.java | 33 ++++----
.../wms/script/ScriptManagerWatcher.java | 33 ++++----
.../java/org/trafodion/wms/server/Metrics.java | 33 ++++----
.../wms/server/ServerStatusServlet.java | 33 ++++----
.../java/org/trafodion/wms/util/InfoServer.java | 53 ++++++-------
.../org/trafodion/wms/util/VersionInfo.java | 53 ++++++-------
.../trafodion/wms/util/WmsConfiguration.java | 53 ++++++-------
.../org/trafodion/wms/version/util/VerGen.java | 53 ++++++-------
.../trafodion/wms/zookeeper/WmsQuorumPeer.java | 33 ++++----
.../org/trafodion/wms/zookeeper/ZKConfig.java | 53 ++++++-------
.../trafodion/wms/zookeeper/ZKServerTool.java | 53 ++++++-------
.../org/trafodion/wms/zookeeper/ZkClient.java | 53 ++++++-------
.../wms/zookeeper/ZooKeeperMainServerArg.java | 53 ++++++-------
wms/src/main/resources/wms-default.xml | 54 ++++++-------
.../resources/wms-webapps/master/index.html | 48 +++++-------
.../resources/wms-webapps/master/master.jsp | 48 +++++-------
.../resources/wms-webapps/server/index.html | 48 +++++-------
.../resources/wms-webapps/server/server.jsp | 48 +++++-------
.../main/resources/wms-webapps/static/wms.css | 48 +++++-------
570 files changed, 8697 insertions(+), 7514 deletions(-)
----------------------------------------------------------------------
[05/18] incubator-trafodion git commit: copuright header changes set 2
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/client/Response.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/client/Response.java b/core/rest/src/main/java/org/trafodion/rest/client/Response.java
index fa95743..99302f9 100644
--- a/core/rest/src/main/java/org/trafodion/rest/client/Response.java
+++ b/core/rest/src/main/java/org/trafodion/rest/client/Response.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.client;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java b/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java
index 1eab4d9..11f0d29 100644
--- a/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java
+++ b/core/rest/src/main/java/org/trafodion/rest/model/VersionModel.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.model;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java b/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
index 48a0cc4..70d1696 100644
--- a/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
+++ b/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
@@ -30,10 +30,26 @@ import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.api.json.JSONJAXBContext;
/**
- * Plumbing for hooking up Jersey's JSON entity body encoding and decoding
- * support to JAXB. Modify how the context is created (by using e.g. a
- * different configuration builder) to control how JSON is processed and
- * created.
+* @@@ 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 @@@
*/
@Provider
public class JAXBContextResolver implements ContextResolver<JAXBContext> {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java b/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
index 6261a2a..8bb6abe 100644
--- a/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
+++ b/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
@@ -31,10 +31,26 @@ import javax.ws.rs.ext.Provider;
import org.trafodion.rest.RestConstants;
/**
- * An adapter between Jersey and Object.toString(). Hooks up plain text output
- * to the Jersey content handling framework.
- * Jersey will first call getSize() to learn the number of bytes that will be
- * sent, then writeTo to perform the actual I/O.
+* @@@ 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 @@@
*/
@Provider
@Produces(RestConstants.MIMETYPE_TEXT)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java b/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java
index d091bb2..f478c64 100644
--- a/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java
+++ b/core/rest/src/main/java/org/trafodion/rest/script/ScriptContext.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.script;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java b/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java
index 232bea7..5d1b594 100644
--- a/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java
+++ b/core/rest/src/main/java/org/trafodion/rest/script/ScriptManager.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.script;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java b/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java
index 0099e73..7c41e14 100644
--- a/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java
+++ b/core/rest/src/main/java/org/trafodion/rest/script/ScriptManagerWatcher.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.script;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/Base64.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/Base64.java b/core/rest/src/main/java/org/trafodion/rest/util/Base64.java
index e949e88..511d183 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/Base64.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/Base64.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java b/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java
index 52dfe1c..a0521cf 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/Bytes.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java b/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java
index 06a9d0d..124b8ed 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/ConfTool.java
@@ -1,17 +1,24 @@
/**
- *(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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java b/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java
index fa599a0..cbc0d6e 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/GetJavaProperty.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java
index a237419..c717ee0 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT2Util.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
index 5c080ec..2145d31 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java b/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java
index bd175f9..dcdfb6a 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/NetworkConfiguration.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java b/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java
index 508bfc3..a990ccc 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/RestConfiguration.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java b/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java
index ea325e5..d0bc9f9 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/RetryCounter.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java b/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java
index 8c897c7..fbf00f7 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/RetryCounterFactory.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/Strings.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/Strings.java b/core/rest/src/main/java/org/trafodion/rest/util/Strings.java
index d8bc5ab..d969e20 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/Strings.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/Strings.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java b/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
index 9af352c..24e7a58 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java b/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java
index ab3d5fb..6e64d01 100644
--- a/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java
+++ b/core/rest/src/main/java/org/trafodion/rest/version/util/VerGen.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.version.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java
index a3da7b1..ad88bea 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKConfig.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.zookeeper;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java
index a059d20..1b88777 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZKServerTool.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.zookeeper;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java
index e32054b..ef78d8e 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkClient.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.zookeeper;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java
index 3aaf8d5..38c890b 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkQuorumPeer.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.zookeeper;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java
index b8e3f3f..a568afb 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZkUtil.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.zookeeper;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java
index 6d840f6..3a62dc6 100644
--- a/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java
+++ b/core/rest/src/main/java/org/trafodion/rest/zookeeper/ZooKeeperMainServerArg.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.zookeeper;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/resources/rest-default.xml
----------------------------------------------------------------------
diff --git a/core/rest/src/main/resources/rest-default.xml b/core/rest/src/main/resources/rest-default.xml
index 5a5a77e..9b7c7e5 100644
--- a/core/rest/src/main/resources/rest-default.xml
+++ b/core/rest/src/main/resources/rest-default.xml
@@ -1,22 +1,26 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- *(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 @@@ -->
<configuration>
<!--
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/core/rest/src/saveVersion.sh b/core/rest/src/saveVersion.sh
index 032630b..f534b2f 100644
--- a/core/rest/src/saveVersion.sh
+++ b/core/rest/src/saveVersion.sh
@@ -1,23 +1,27 @@
#!/bin/sh
-# This file is used to generate the annotation of package info that
-# records the user, url, revision and timestamp.
-
-#
-# (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 @@@
+# */
unset LANG
unset LC_CTYPE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java b/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java
index 1b5b197..eb64c24 100644
--- a/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java
+++ b/core/rest/src/test/java/org/trafodion/rest/IntegrationTests.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/LargeTests.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/LargeTests.java b/core/rest/src/test/java/org/trafodion/rest/LargeTests.java
index 2fa690d..c723298 100644
--- a/core/rest/src/test/java/org/trafodion/rest/LargeTests.java
+++ b/core/rest/src/test/java/org/trafodion/rest/LargeTests.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/MediumTests.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/MediumTests.java b/core/rest/src/test/java/org/trafodion/rest/MediumTests.java
index 5c09d09..ae1da06 100644
--- a/core/rest/src/test/java/org/trafodion/rest/MediumTests.java
+++ b/core/rest/src/test/java/org/trafodion/rest/MediumTests.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java b/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java
index 5e0db88..a849dcc 100644
--- a/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java
+++ b/core/rest/src/test/java/org/trafodion/rest/ResourceChecker.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java b/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java
index fdd60ce..9f1c175 100644
--- a/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java
+++ b/core/rest/src/test/java/org/trafodion/rest/ResourceCheckerJUnitRule.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/java/org/trafodion/rest/SmallTests.java
----------------------------------------------------------------------
diff --git a/core/rest/src/test/java/org/trafodion/rest/SmallTests.java b/core/rest/src/test/java/org/trafodion/rest/SmallTests.java
index 7a5a94d..18c195f 100644
--- a/core/rest/src/test/java/org/trafodion/rest/SmallTests.java
+++ b/core/rest/src/test/java/org/trafodion/rest/SmallTests.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/test/resources/rest-default.xml
----------------------------------------------------------------------
diff --git a/core/rest/src/test/resources/rest-default.xml b/core/rest/src/test/resources/rest-default.xml
index 77ca6fd..e8107e8 100644
--- a/core/rest/src/test/resources/rest-default.xml
+++ b/core/rest/src/test/resources/rest-default.xml
@@ -2,19 +2,26 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
- *(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 @@@
*/
-->
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
index abe7b4c..95a02f8 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java
@@ -1,22 +1,24 @@
-/**
- * (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * 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.apache.hadoop.hbase.coprocessor.transactional;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sqf/src/tm/tmddlrequests.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tmddlrequests.cpp b/core/sqf/src/tm/tmddlrequests.cpp
index c51e65b..5c45609 100644
--- a/core/sqf/src/tm/tmddlrequests.cpp
+++ b/core/sqf/src/tm/tmddlrequests.cpp
@@ -1,18 +1,24 @@
-// (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.
-//
-// @@@ END COPYRIGHT @@@
+/*
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+* @@@ END COPYRIGHT @@@ */
#include "tmddlrequests.h"
#include "dtm/tm.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
index d35e6a6..db780cd 100644
--- a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
+++ b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>-- Run Tests
>> set schema cat.tpcd;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N
index 8f91fc1..9509517 100644
--- a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N
+++ b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>-- Run Tests
>> set schema cat.tpcd;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640 b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640
index e696b43..20ed269 100644
--- a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640
+++ b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>
>>-- Run Tests
>>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TESTMV215C
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TESTMV215C b/core/sql/regress/newregr/mvs/BIG/TESTMV215C
index 15b669c..9d99f3f 100644
--- a/core/sql/regress/newregr/mvs/BIG/TESTMV215C
+++ b/core/sql/regress/newregr/mvs/BIG/TESTMV215C
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215c
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TESTMV640
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TESTMV640 b/core/sql/regress/newregr/mvs/BIG/TESTMV640
index 7402f1e..8f8fc83 100644
--- a/core/sql/regress/newregr/mvs/BIG/TESTMV640
+++ b/core/sql/regress/newregr/mvs/BIG/TESTMV640
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
--=======================================================================
-- TestMV640 - This test checks correctness of Majv over 3 tables,
-- where iud changes effect rows in the majv. It uses
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215 b/core/sql/regress/newregr/mvs/BIG/TestMV215
index a56ce08..0dc7054 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215IR
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215IR b/core/sql/regress/newregr/mvs/BIG/TestMV215IR
index 3b4f86d..d28dceb 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215IR
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215IR
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215IR
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215_DE
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215_DE b/core/sql/regress/newregr/mvs/BIG/TestMV215_DE
index 4b49c7a..db35ccc 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215_DE
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215_DE
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215_DE
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215_RU
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215_RU b/core/sql/regress/newregr/mvs/BIG/TestMV215_RU
index b14ba99..3185aa2 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215_RU
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215_RU
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215_RU
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty b/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty
index 17c6fa6..faab04c 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215_With_RefreshUtilty
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215
--- 2.4.4.
[12/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/pytests/test_p2.py
----------------------------------------------------------------------
diff --git a/dcs/src/test/pytests/test_p2.py b/dcs/src/test/pytests/test_p2.py
index b063d9d..6567e31 100755
--- a/dcs/src/test/pytests/test_p2.py
+++ b/dcs/src/test/pytests/test_p2.py
@@ -1,19 +1,26 @@
'''
/**
-*(C) Copyright 2014-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 @@@
+ */
PYODBC TESTS
'''
import ConfigParser
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/resources/dcs-default.xml
----------------------------------------------------------------------
diff --git a/dcs/src/test/resources/dcs-default.xml b/dcs/src/test/resources/dcs-default.xml
index 0a6d22e..ff0ab2b 100644
--- a/dcs/src/test/resources/dcs-default.xml
+++ b/dcs/src/test/resources/dcs-default.xml
@@ -1,21 +1,26 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
-/**
- *(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.
- */
+* @@@ 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 @@@
-->
<!--
/**
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/tests/phx/pom.xml.template
----------------------------------------------------------------------
diff --git a/tests/phx/pom.xml.template b/tests/phx/pom.xml.template
index 2b15b16..c107688 100644
--- a/tests/phx/pom.xml.template
+++ b/tests/phx/pom.xml.template
@@ -2,10 +2,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<licenses>
<license>
- <name>(C) Copyright 2013 Hewlett-Packard Development Company, L.P</name>
- <comments>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</comments>
- </license>
- <license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/Compression.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/Compression.cpp b/win-odbc64/Common/Compression.cpp
index 16b6cf2..7e58769 100644
--- a/win-odbc64/Common/Compression.cpp
+++ b/win-odbc64/Common/Compression.cpp
@@ -1,20 +1,23 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2010-2014 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
+// 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
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/Compression.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/Compression.h b/win-odbc64/Common/Compression.h
index eacf1fa..430b5ae 100644
--- a/win-odbc64/Common/Compression.h
+++ b/win-odbc64/Common/Compression.h
@@ -1,19 +1,22 @@
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 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.
+//
// @@@ END COPYRIGHT @@@
#ifndef COMPRESSION_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/DrvrSrvr.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/DrvrSrvr.h b/win-odbc64/Common/DrvrSrvr.h
index ce89148..fd7cbdc 100644
--- a/win-odbc64/Common/DrvrSrvr.h
+++ b/win-odbc64/Common/DrvrSrvr.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/ExpConvMxcs.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/ExpConvMxcs.cpp b/win-odbc64/Common/ExpConvMxcs.cpp
index a508526..1d63a8c 100644
--- a/win-odbc64/Common/ExpConvMxcs.cpp
+++ b/win-odbc64/Common/ExpConvMxcs.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/NLSFunctions.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/NLSFunctions.cpp b/win-odbc64/Common/NLSFunctions.cpp
index 3f18747..db3ea71 100644
--- a/win-odbc64/Common/NLSFunctions.cpp
+++ b/win-odbc64/Common/NLSFunctions.cpp
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/NLSFunctions.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/NLSFunctions.h b/win-odbc64/Common/NLSFunctions.h
index 1894208..fccce05 100644
--- a/win-odbc64/Common/NLSFunctions.h
+++ b/win-odbc64/Common/NLSFunctions.h
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/OdbcMsg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/OdbcMsg.cpp b/win-odbc64/Common/OdbcMsg.cpp
index d9307c9..05671e6 100644
--- a/win-odbc64/Common/OdbcMsg.cpp
+++ b/win-odbc64/Common/OdbcMsg.cpp
@@ -1,19 +1,22 @@
/**************************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/OdbcMsg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/OdbcMsg.h b/win-odbc64/Common/OdbcMsg.h
index 022664c..e3a75b7 100644
--- a/win-odbc64/Common/OdbcMsg.h
+++ b/win-odbc64/Common/OdbcMsg.h
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/RegValues.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/RegValues.h b/win-odbc64/Common/RegValues.h
index 4ccac05..eba2c70 100644
--- a/win-odbc64/Common/RegValues.h
+++ b/win-odbc64/Common/RegValues.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/TCPIPSystemDrvr.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/TCPIPSystemDrvr.cpp b/win-odbc64/Common/TCPIPSystemDrvr.cpp
index d8f3e2e..3565a8a 100644
--- a/win-odbc64/Common/TCPIPSystemDrvr.cpp
+++ b/win-odbc64/Common/TCPIPSystemDrvr.cpp
@@ -1,19 +1,22 @@
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 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.
+//
// @@@ END COPYRIGHT @@@
#define WIN32_LEAN_AND_MEAN
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/TCPIPSystemDrvr.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/TCPIPSystemDrvr.h b/win-odbc64/Common/TCPIPSystemDrvr.h
index 3302a6c..56b25ab 100644
--- a/win-odbc64/Common/TCPIPSystemDrvr.h
+++ b/win-odbc64/Common/TCPIPSystemDrvr.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/TransportBase.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/TransportBase.cpp b/win-odbc64/Common/TransportBase.cpp
index 2e979b1..2b187d5 100644
--- a/win-odbc64/Common/TransportBase.cpp
+++ b/win-odbc64/Common/TransportBase.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/TransportBase.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/TransportBase.h b/win-odbc64/Common/TransportBase.h
index bded290..4b24fa0 100644
--- a/win-odbc64/Common/TransportBase.h
+++ b/win-odbc64/Common/TransportBase.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/inoutparams.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/inoutparams.h b/win-odbc64/Common/inoutparams.h
index a236738..c26f017 100644
--- a/win-odbc64/Common/inoutparams.h
+++ b/win-odbc64/Common/inoutparams.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/iputils.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/iputils.h b/win-odbc64/Common/iputils.h
index edb46d9..d7b77b8 100644
--- a/win-odbc64/Common/iputils.h
+++ b/win-odbc64/Common/iputils.h
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/marshaling.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/marshaling.cpp b/win-odbc64/Common/marshaling.cpp
index cfa558c..8e6f0c0 100644
--- a/win-odbc64/Common/marshaling.cpp
+++ b/win-odbc64/Common/marshaling.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/marshaling.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/marshaling.h b/win-odbc64/Common/marshaling.h
index c985174..18622c2 100644
--- a/win-odbc64/Common/marshaling.h
+++ b/win-odbc64/Common/marshaling.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/marshalingdrvr_drvr.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/marshalingdrvr_drvr.cpp b/win-odbc64/Common/marshalingdrvr_drvr.cpp
index e1e114f..4cffe0e 100644
--- a/win-odbc64/Common/marshalingdrvr_drvr.cpp
+++ b/win-odbc64/Common/marshalingdrvr_drvr.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/marshalingdrvr_drvr.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/marshalingdrvr_drvr.h b/win-odbc64/Common/marshalingdrvr_drvr.h
index 815531e..8163852 100644
--- a/win-odbc64/Common/marshalingdrvr_drvr.h
+++ b/win-odbc64/Common/marshalingdrvr_drvr.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/nskieee.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/nskieee.cpp b/win-odbc64/Common/nskieee.cpp
index 84f5bf1..1f6c5c5 100644
--- a/win-odbc64/Common/nskieee.cpp
+++ b/win-odbc64/Common/nskieee.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/nskieee.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/nskieee.h b/win-odbc64/Common/nskieee.h
index 81af84b..05e28fa 100644
--- a/win-odbc64/Common/nskieee.h
+++ b/win-odbc64/Common/nskieee.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/odbcMxSecurity.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/odbcMxSecurity.h b/win-odbc64/Common/odbcMxSecurity.h
index d6b0b80..d912180 100644
--- a/win-odbc64/Common/odbcMxSecurity.h
+++ b/win-odbc64/Common/odbcMxSecurity.h
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/ping.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/ping.cpp b/win-odbc64/Common/ping.cpp
index 3c424d6..755cc9c 100644
--- a/win-odbc64/Common/ping.cpp
+++ b/win-odbc64/Common/ping.cpp
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/ping.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/ping.h b/win-odbc64/Common/ping.h
index 90100bf..41bb701 100644
--- a/win-odbc64/Common/ping.h
+++ b/win-odbc64/Common/ping.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/swap.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/swap.cpp b/win-odbc64/Common/swap.cpp
index 71e080e..231ac0b 100644
--- a/win-odbc64/Common/swap.cpp
+++ b/win-odbc64/Common/swap.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Common/swap.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Common/swap.h b/win-odbc64/Common/swap.h
index 3e5e8a8..cff0e5a 100644
--- a/win-odbc64/Common/swap.h
+++ b/win-odbc64/Common/swap.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
index dc2fa9f..6891b86 100644
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// SetCertDirDlg.cpp : implementation file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
index 4930d45..1142152 100644
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
#pragma once
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
index 11a0b6b..3d82c0b 100644
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// SetCertificateDirReg.cpp : Defines the entry point for the console application.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
index f75eb24..5db1c52 100644
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
#pragma once
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
index 71440d6..b6c6bf6 100644
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//{{NO_DEPENDENCIES}}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
index 3a3a0ee..350f87e 100644
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// stdafx.cpp : source file that includes just the standard includes
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
index 2bd4800..df9fc5f 100644
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// stdafx.h : include file for standard system include files,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp
index 729db13..fd3cf94 100644
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp
+++ b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// UpdateDSN.cpp : Defines the entry point for the console application.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp b/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp
index 7230a52..6b21c3b 100644
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp
+++ b/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// stdafx.cpp : source file that includes just the standard includes
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h b/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h
index 3a7348f..56596fa 100644
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h
+++ b/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// stdafx.h : include file for standard system include files,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/DSList.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/DSList.cpp b/win-odbc64/odbcclient/DSNConverter/DSList.cpp
index 15ae519..52ce622 100644
--- a/win-odbc64/odbcclient/DSNConverter/DSList.cpp
+++ b/win-odbc64/odbcclient/DSNConverter/DSList.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/DSList.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/DSList.h b/win-odbc64/odbcclient/DSNConverter/DSList.h
index 1f192fb..d8fed21 100644
--- a/win-odbc64/odbcclient/DSNConverter/DSList.h
+++ b/win-odbc64/odbcclient/DSNConverter/DSList.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/DSNConverter.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/DSNConverter.cpp b/win-odbc64/odbcclient/DSNConverter/DSNConverter.cpp
index 11d8da5..2978e12 100644
--- a/win-odbc64/odbcclient/DSNConverter/DSNConverter.cpp
+++ b/win-odbc64/odbcclient/DSNConverter/DSNConverter.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/DSNConverter.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/DSNConverter.def b/win-odbc64/odbcclient/DSNConverter/DSNConverter.def
index c947b4a..7b5d5ae 100644
--- a/win-odbc64/odbcclient/DSNConverter/DSNConverter.def
+++ b/win-odbc64/odbcclient/DSNConverter/DSNConverter.def
@@ -1,20 +1,23 @@
;/**********************************************************************
;// @@@ START COPYRIGHT @@@
-;//
-;// (C) Copyright 2003-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.
-;//
+;//
+;// 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 @@@
;********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/DSNConverter.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/DSNConverter.h b/win-odbc64/odbcclient/DSNConverter/DSNConverter.h
index 24594f6..11e0a58 100644
--- a/win-odbc64/odbcclient/DSNConverter/DSNConverter.h
+++ b/win-odbc64/odbcclient/DSNConverter/DSNConverter.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
[04/18] incubator-trafodion git commit: copuright header changes set 2
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215b
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215b b/core/sql/regress/newregr/mvs/BIG/TestMV215b
index bc0ec59..7cd41cf 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215b
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215b
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215b
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215e
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215e b/core/sql/regress/newregr/mvs/BIG/TestMV215e
index c379d59..ac9fedd 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215e
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215e
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TESTMV215E
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215g
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215g b/core/sql/regress/newregr/mvs/BIG/TestMV215g
index 7d9e9e3..7a00252 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215g
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215g
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215g
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215h
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215h b/core/sql/regress/newregr/mvs/BIG/TestMV215h
index d048b80..c2baa02 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215h
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215h
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215h
------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215j
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215j b/core/sql/regress/newregr/mvs/BIG/TestMV215j
index c9e1fb7..ea761c9 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215j
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215j
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215j
------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/TestMV215n
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/TestMV215n b/core/sql/regress/newregr/mvs/BIG/TestMV215n
index c75408d..e4256a2 100644
--- a/core/sql/regress/newregr/mvs/BIG/TestMV215n
+++ b/core/sql/regress/newregr/mvs/BIG/TestMV215n
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TESTMV215N
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/Testmv215m
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/Testmv215m b/core/sql/regress/newregr/mvs/BIG/Testmv215m
index dcf6ba8..dd0118d 100644
--- a/core/sql/regress/newregr/mvs/BIG/Testmv215m
+++ b/core/sql/regress/newregr/mvs/BIG/Testmv215m
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
------------------------------------------------------
--- TestMV215m
--- 2.4.4.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedMV215e
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedMV215e b/core/sql/regress/newregr/mvs/BIG/expectedMV215e
index 8e1facb..8246332 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedMV215e
+++ b/core/sql/regress/newregr/mvs/BIG/expectedMV215e
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>-- Run Tests
>> set schema cat.tpcd;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedMV215g
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedMV215g b/core/sql/regress/newregr/mvs/BIG/expectedMV215g
index 91373f7..520b5ff 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedMV215g
+++ b/core/sql/regress/newregr/mvs/BIG/expectedMV215g
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>
>>obey TESTMV215G(SET_UP);
>>-------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedMV215h
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedMV215h b/core/sql/regress/newregr/mvs/BIG/expectedMV215h
index 848d0c5..7908b8b 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedMV215h
+++ b/core/sql/regress/newregr/mvs/BIG/expectedMV215h
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>-- Run Tests
>> set schema cat.tpcd;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedmv215
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedmv215 b/core/sql/regress/newregr/mvs/BIG/expectedmv215
index 3032959..68ceee2 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedmv215
+++ b/core/sql/regress/newregr/mvs/BIG/expectedmv215
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>
>>obey TESTMV215(SET_UP);
>>-------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedmv215IR
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedmv215IR b/core/sql/regress/newregr/mvs/BIG/expectedmv215IR
index 6036e0a..8d4c674 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedmv215IR
+++ b/core/sql/regress/newregr/mvs/BIG/expectedmv215IR
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>
>>obey TESTMV215IR(SET_UP);
>>-------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedmv215_DE
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedmv215_DE b/core/sql/regress/newregr/mvs/BIG/expectedmv215_DE
index f6dd036..9181929 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedmv215_DE
+++ b/core/sql/regress/newregr/mvs/BIG/expectedmv215_DE
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>
>>obey TESTMV215_DE(SET_UP);
>>----------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedmv215_RU
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedmv215_RU b/core/sql/regress/newregr/mvs/BIG/expectedmv215_RU
index af1c10c..4b6a6a7 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedmv215_RU
+++ b/core/sql/regress/newregr/mvs/BIG/expectedmv215_RU
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>
>>obey TESTMV215_RU(SET_UP);
>>----------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedmv215b
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedmv215b b/core/sql/regress/newregr/mvs/BIG/expectedmv215b
index 5d5f325..ab6a598 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedmv215b
+++ b/core/sql/regress/newregr/mvs/BIG/expectedmv215b
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>-- Run Tests
>> set schema cat.tpcd;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/mvs/BIG/expectedmv215m
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/expectedmv215m b/core/sql/regress/newregr/mvs/BIG/expectedmv215m
index c0a7e3a..a070e76 100644
--- a/core/sql/regress/newregr/mvs/BIG/expectedmv215m
+++ b/core/sql/regress/newregr/mvs/BIG/expectedmv215m
@@ -20,21 +20,6 @@
-- @@@ END COPYRIGHT @@@
-- @@@ START COPYRIGHT @@@
--
--- (C) Copyright 2014 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.
---
--- @@@ END COPYRIGHT @@@
>>
>>obey TESTMV215M(SET_UP);
>>-------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste001.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste001.sql b/core/sql/regress/newregr/rowsets/teste001.sql
index c697bef..d98c261 100644
--- a/core/sql/regress/newregr/rowsets/teste001.sql
+++ b/core/sql/regress/newregr/rowsets/teste001.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste005.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste005.sql b/core/sql/regress/newregr/rowsets/teste005.sql
index d1e3b45..1eb4ff2 100644
--- a/core/sql/regress/newregr/rowsets/teste005.sql
+++ b/core/sql/regress/newregr/rowsets/teste005.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste011.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste011.sql b/core/sql/regress/newregr/rowsets/teste011.sql
index db0827f..ca0c133 100644
--- a/core/sql/regress/newregr/rowsets/teste011.sql
+++ b/core/sql/regress/newregr/rowsets/teste011.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste015.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste015.sql b/core/sql/regress/newregr/rowsets/teste015.sql
index 63a39e6..72a2cea 100644
--- a/core/sql/regress/newregr/rowsets/teste015.sql
+++ b/core/sql/regress/newregr/rowsets/teste015.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste021.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste021.sql b/core/sql/regress/newregr/rowsets/teste021.sql
index ef4d9fd..f6941a5 100644
--- a/core/sql/regress/newregr/rowsets/teste021.sql
+++ b/core/sql/regress/newregr/rowsets/teste021.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste025.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste025.sql b/core/sql/regress/newregr/rowsets/teste025.sql
index 0d7aea3..a67ed05 100644
--- a/core/sql/regress/newregr/rowsets/teste025.sql
+++ b/core/sql/regress/newregr/rowsets/teste025.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste041.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste041.sql b/core/sql/regress/newregr/rowsets/teste041.sql
index 9a49ace..7fabda5 100644
--- a/core/sql/regress/newregr/rowsets/teste041.sql
+++ b/core/sql/regress/newregr/rowsets/teste041.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste045.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste045.sql b/core/sql/regress/newregr/rowsets/teste045.sql
index 90ed991..b74b57f 100644
--- a/core/sql/regress/newregr/rowsets/teste045.sql
+++ b/core/sql/regress/newregr/rowsets/teste045.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste051.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste051.sql b/core/sql/regress/newregr/rowsets/teste051.sql
index f536f1b..02feb97 100644
--- a/core/sql/regress/newregr/rowsets/teste051.sql
+++ b/core/sql/regress/newregr/rowsets/teste051.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste055.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste055.sql b/core/sql/regress/newregr/rowsets/teste055.sql
index 673c391..903e382 100644
--- a/core/sql/regress/newregr/rowsets/teste055.sql
+++ b/core/sql/regress/newregr/rowsets/teste055.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste061.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste061.sql b/core/sql/regress/newregr/rowsets/teste061.sql
index 4cae4d0..a67ff20 100644
--- a/core/sql/regress/newregr/rowsets/teste061.sql
+++ b/core/sql/regress/newregr/rowsets/teste061.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste065.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste065.sql b/core/sql/regress/newregr/rowsets/teste065.sql
index 259e87b..7a75819 100644
--- a/core/sql/regress/newregr/rowsets/teste065.sql
+++ b/core/sql/regress/newregr/rowsets/teste065.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste071.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste071.sql b/core/sql/regress/newregr/rowsets/teste071.sql
index 862fd0c..bda13f3 100644
--- a/core/sql/regress/newregr/rowsets/teste071.sql
+++ b/core/sql/regress/newregr/rowsets/teste071.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste075.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste075.sql b/core/sql/regress/newregr/rowsets/teste075.sql
index 8eabab4..1e63563 100644
--- a/core/sql/regress/newregr/rowsets/teste075.sql
+++ b/core/sql/regress/newregr/rowsets/teste075.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste081.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste081.sql b/core/sql/regress/newregr/rowsets/teste081.sql
index b4c74c0..aafe41a 100644
--- a/core/sql/regress/newregr/rowsets/teste081.sql
+++ b/core/sql/regress/newregr/rowsets/teste081.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste085.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste085.sql b/core/sql/regress/newregr/rowsets/teste085.sql
index faa148b..d4ae59f 100644
--- a/core/sql/regress/newregr/rowsets/teste085.sql
+++ b/core/sql/regress/newregr/rowsets/teste085.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste091.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste091.sql b/core/sql/regress/newregr/rowsets/teste091.sql
index b4ad962..20df15a 100644
--- a/core/sql/regress/newregr/rowsets/teste091.sql
+++ b/core/sql/regress/newregr/rowsets/teste091.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste101.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste101.sql b/core/sql/regress/newregr/rowsets/teste101.sql
index dff5076..183651e 100644
--- a/core/sql/regress/newregr/rowsets/teste101.sql
+++ b/core/sql/regress/newregr/rowsets/teste101.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste105.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste105.sql b/core/sql/regress/newregr/rowsets/teste105.sql
index 9e00b6e..cce23a1 100644
--- a/core/sql/regress/newregr/rowsets/teste105.sql
+++ b/core/sql/regress/newregr/rowsets/teste105.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste111.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste111.sql b/core/sql/regress/newregr/rowsets/teste111.sql
index fa2880f..feb4f83 100644
--- a/core/sql/regress/newregr/rowsets/teste111.sql
+++ b/core/sql/regress/newregr/rowsets/teste111.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste121.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste121.sql b/core/sql/regress/newregr/rowsets/teste121.sql
index 6d71c97..338fcd4 100644
--- a/core/sql/regress/newregr/rowsets/teste121.sql
+++ b/core/sql/regress/newregr/rowsets/teste121.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste135.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste135.sql b/core/sql/regress/newregr/rowsets/teste135.sql
index eeadeca..68751d8 100644
--- a/core/sql/regress/newregr/rowsets/teste135.sql
+++ b/core/sql/regress/newregr/rowsets/teste135.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste140.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste140.sql b/core/sql/regress/newregr/rowsets/teste140.sql
index 980fd94..b38e1ad 100644
--- a/core/sql/regress/newregr/rowsets/teste140.sql
+++ b/core/sql/regress/newregr/rowsets/teste140.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/11/22
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste141.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste141.sql b/core/sql/regress/newregr/rowsets/teste141.sql
index 0f2276c..bb8d5a2 100644
--- a/core/sql/regress/newregr/rowsets/teste141.sql
+++ b/core/sql/regress/newregr/rowsets/teste141.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/11/22
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste145.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste145.sql b/core/sql/regress/newregr/rowsets/teste145.sql
index a305e35..a99b5eb 100644
--- a/core/sql/regress/newregr/rowsets/teste145.sql
+++ b/core/sql/regress/newregr/rowsets/teste145.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/11/22
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste201.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste201.sql b/core/sql/regress/newregr/rowsets/teste201.sql
index 2c825df..377e821 100644
--- a/core/sql/regress/newregr/rowsets/teste201.sql
+++ b/core/sql/regress/newregr/rowsets/teste201.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2002/12/17
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste205.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste205.sql b/core/sql/regress/newregr/rowsets/teste205.sql
index c52966c..b87945a 100644
--- a/core/sql/regress/newregr/rowsets/teste205.sql
+++ b/core/sql/regress/newregr/rowsets/teste205.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2002/12/17
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste211.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste211.sql b/core/sql/regress/newregr/rowsets/teste211.sql
index 38c3a85..90bc91e 100644
--- a/core/sql/regress/newregr/rowsets/teste211.sql
+++ b/core/sql/regress/newregr/rowsets/teste211.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/9/12
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste215.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste215.sql b/core/sql/regress/newregr/rowsets/teste215.sql
index 5dab02b..bcb7966 100644
--- a/core/sql/regress/newregr/rowsets/teste215.sql
+++ b/core/sql/regress/newregr/rowsets/teste215.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2002/3/26
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste221.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste221.sql b/core/sql/regress/newregr/rowsets/teste221.sql
index 03af9f6..fccf872 100644
--- a/core/sql/regress/newregr/rowsets/teste221.sql
+++ b/core/sql/regress/newregr/rowsets/teste221.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/8/29
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste225.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste225.sql b/core/sql/regress/newregr/rowsets/teste225.sql
index ab3bf5a..a0883e3 100644
--- a/core/sql/regress/newregr/rowsets/teste225.sql
+++ b/core/sql/regress/newregr/rowsets/teste225.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/8/29
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste232.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste232.sql b/core/sql/regress/newregr/rowsets/teste232.sql
index 1ad93f7..f46a29e 100644
--- a/core/sql/regress/newregr/rowsets/teste232.sql
+++ b/core/sql/regress/newregr/rowsets/teste232.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
**********************************************************************/
/* Tests for compound statements containing rowsets and assignment
statements, on or below DP2. */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/rowsets/teste235.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/rowsets/teste235.sql b/core/sql/regress/newregr/rowsets/teste235.sql
index 654b4c2..d01d1d8 100644
--- a/core/sql/regress/newregr/rowsets/teste235.sql
+++ b/core/sql/regress/newregr/rowsets/teste235.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/8/29
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/triggers/etest_14_1.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/triggers/etest_14_1.sql b/core/sql/regress/newregr/triggers/etest_14_1.sql
index 046291d..c02d74d 100644
--- a/core/sql/regress/newregr/triggers/etest_14_1.sql
+++ b/core/sql/regress/newregr/triggers/etest_14_1.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/triggers/etest_14_2.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/triggers/etest_14_2.sql b/core/sql/regress/newregr/triggers/etest_14_2.sql
index a93db63..763fee5 100644
--- a/core/sql/regress/newregr/triggers/etest_14_2.sql
+++ b/core/sql/regress/newregr/triggers/etest_14_2.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/triggers/etest_14_3.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/triggers/etest_14_3.sql b/core/sql/regress/newregr/triggers/etest_14_3.sql
index ad3cf74..59e1f4d 100644
--- a/core/sql/regress/newregr/triggers/etest_14_3.sql
+++ b/core/sql/regress/newregr/triggers/etest_14_3.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/triggers/etest_14_4.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/triggers/etest_14_4.sql b/core/sql/regress/newregr/triggers/etest_14_4.sql
index 1ad548d..5bf9626 100644
--- a/core/sql/regress/newregr/triggers/etest_14_4.sql
+++ b/core/sql/regress/newregr/triggers/etest_14_4.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/triggers/etest_14_5.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/triggers/etest_14_5.sql b/core/sql/regress/newregr/triggers/etest_14_5.sql
index 58f2814..c1624ab 100644
--- a/core/sql/regress/newregr/triggers/etest_14_5.sql
+++ b/core/sql/regress/newregr/triggers/etest_14_5.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/sql/regress/newregr/triggers/etest_14_6.sql
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/triggers/etest_14_6.sql b/core/sql/regress/newregr/triggers/etest_14_6.sql
index bd692da..722c2cc 100644
--- a/core/sql/regress/newregr/triggers/etest_14_6.sql
+++ b/core/sql/regress/newregr/triggers/etest_14_6.sql
@@ -20,10 +20,6 @@
-- @@@ END COPYRIGHT @@@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-//
-// @@@ END COPYRIGHT @@@
// +++ Copyright added on 2003/12/3
// +++ Code modified on 2003/5/6
**********************************************************************/
[16/18] incubator-trafodion git commit: Merge remote branch
'origin/master' into sandhya_copyright2
Posted by rm...@apache.org.
Merge remote branch 'origin/master' into sandhya_copyright2
Conflicts:
core/sqf/sqenvcom.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a3390a73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a3390a73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a3390a73
Branch: refs/heads/master
Commit: a3390a73166770264d6dc6005946ed305d5da689
Parents: d3f73db 0147af8
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Fri Sep 18 06:44:04 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Fri Sep 18 06:44:04 2015 +0000
----------------------------------------------------------------------
core/dbsecurity/auth/src/ldapconfigfile.cpp | 8 +-
core/dbsecurity/auth/src/ldapconfignode.cpp | 11 +-
core/sqf/commonLogger/CommonLogger.cpp | 4 +-
.../sqf/conf/log4cxx.trafodion.masterexe.config | 5 +-
.../backup_restore_functions.sh | 4 +-
.../run_full_trafodion_backup.sh | 6 +-
.../run_full_trafodion_restore.sh | 10 +-
core/sqf/sqenvcom.sh | 164 ++++++++-
core/sql/bin/SqlciErrors.txt | 6 +-
core/sql/comexe/ComTdbHbaseAccess.cpp | 12 +-
core/sql/comexe/ComTdbHbaseAccess.h | 6 +-
core/sql/common/ComMisc.cpp | 66 +++-
core/sql/common/ComMisc.h | 9 +-
core/sql/common/ComObjectName.h | 29 +-
core/sql/common/ComSmallDefs.h | 1 +
core/sql/common/OperTypeEnum.h | 1 -
core/sql/executor/ExHbaseAccess.cpp | 11 +-
core/sql/executor/ExHbaseAccess.h | 11 +-
core/sql/executor/ExHbaseIUD.cpp | 150 ++++----
core/sql/executor/HBaseClient.java | 4 +-
core/sql/executor/HBaseClient_JNI.cpp | 5 +-
core/sql/executor/HTableClient.java | 82 +++--
core/sql/exp/ExpHbaseInterface.cpp | 10 +-
core/sql/exp/ExpHbaseInterface.h | 14 +-
core/sql/generator/GenPreCode.cpp | 44 ++-
core/sql/generator/GenRelUpdate.cpp | 45 ++-
core/sql/optimizer/BindRelExpr.cpp | 139 +++++---
core/sql/optimizer/BindWA.cpp | 2 +-
core/sql/optimizer/BindWA.h | 15 +-
core/sql/optimizer/Cost.cpp | 19 +
core/sql/optimizer/Cost.h | 2 +-
core/sql/optimizer/CostMethod.h | 64 +---
core/sql/optimizer/ImplRule.cpp | 3 +-
core/sql/optimizer/Inlining.cpp | 64 +++-
core/sql/optimizer/Inlining.h | 80 +++--
core/sql/optimizer/NAFileSet.cpp | 2 -
core/sql/optimizer/NAFileSet.h | 1 -
core/sql/optimizer/NARoutine.cpp | 8 +-
core/sql/optimizer/NATable.cpp | 144 +++++---
core/sql/optimizer/NormRelExpr.cpp | 18 +-
core/sql/optimizer/ObjectNames.h | 15 +-
core/sql/optimizer/OptPhysRelExpr.cpp | 11 +
core/sql/optimizer/OptUtilIncludes.h | 4 +-
core/sql/optimizer/RelExeUtil.cpp | 28 +-
core/sql/optimizer/RelExpr.cpp | 37 +-
core/sql/optimizer/RelUpdate.h | 36 +-
core/sql/optimizer/ScanOptimizer.cpp | 137 +++----
core/sql/optimizer/ScmCostMethod.cpp | 72 ++++
core/sql/optimizer/costmethod.cpp | 181 +++++++++-
core/sql/optimizer/disjuncts.h | 8 +
core/sql/optimizer/mdam.cpp | 68 ++++
core/sql/optimizer/opt.cpp | 10 +-
core/sql/parser/AllElemDDLFileAttr.h | 1 -
core/sql/parser/ElemDDLFileAttr.cpp | 32 --
core/sql/parser/ElemDDLNode.cpp | 6 -
core/sql/parser/ElemDDLNode.h | 2 -
core/sql/parser/ParDDLFileAttrs.cpp | 84 -----
core/sql/parser/ParDDLFileAttrsAlterTable.h | 28 --
core/sql/parser/ParDDLFileAttrsCreateIndex.h | 28 --
core/sql/parser/ParKeyWords.cpp | 1 -
core/sql/parser/StmtDDLAlter.cpp | 1 -
core/sql/parser/StmtDDLCreate.cpp | 4 -
core/sql/parser/StmtDDLDrop.cpp | 3 +-
core/sql/parser/sqlparser.y | 13 -
core/sql/qmscommon/QRLogger.cpp | 31 +-
core/sql/qmscommon/QRLogger.h | 3 +-
core/sql/regress/catman1/EXPECTED129 | 176 ++++-----
core/sql/regress/catman1/EXPECTED133 | 4 +-
core/sql/regress/catman1/EXPECTED137 | 180 +++++++++-
core/sql/regress/catman1/TEST137 | 6 +-
core/sql/regress/compGeneral/EXPECTED042 | 8 +-
core/sql/regress/compGeneral/TEST071 | 20 ++
core/sql/regress/executor/EXPECTED015.SB | 275 +++++++++++++--
core/sql/regress/executor/TEST015 | 36 +-
core/sql/regress/hive/EXPECTED009 | 313 +++++++++++++++-
core/sql/regress/hive/TEST009 | 108 +++++-
core/sql/regress/hive/TEST009_b.hive.sql | 48 +++
.../hive/TEST009_create_hbase_objects.hbase | 55 +++
core/sql/regress/seabase/EXPECTED011 | 84 ++++-
core/sql/regress/seabase/FILTER011 | 1 +
core/sql/regress/seabase/TEST011 | 2 +
core/sql/regress/tools/setuplnxenv | 2 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 2 +-
core/sql/sqlcomp/CmpDescribe.cpp | 14 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 10 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 3 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 8 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 248 +++++++------
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/PrivMgr.cpp | 67 ++++
core/sql/sqlcomp/PrivMgr.h | 11 +
core/sql/sqlcomp/PrivMgrCommands.cpp | 13 +-
core/sql/sqlcomp/PrivMgrCommands.h | 1 +
core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 289 ++++++++++++++-
core/sql/sqlcomp/PrivMgrComponentPrivileges.h | 6 +
core/sql/sqlcomp/PrivMgrDefs.h | 41 ++-
core/sql/sqlcomp/PrivMgrMD.h | 42 +++
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 353 +++++++++++++++++--
core/sql/sqlcomp/PrivMgrPrivileges.h | 7 +
core/sql/sqlcomp/nadefaults.cpp | 7 +-
core/sql/sqlmxevents/logmxevent_traf.cpp | 22 ++
core/sql/sqlmxevents/logmxevent_traf.h | 7 +
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 18 +-
core/sql/ustat/hs_globals.cpp | 3 -
core/sql/ustat/hs_parser.cpp | 1 -
.../org/trafodion/dcs/zookeeper/ZkClient.java | 2 +-
install/installer/traf_add_user | 9 +-
install/installer/traf_cloudera_mods98 | 18 +-
install/installer/traf_config_setup | 140 +++++---
install/installer/traf_hortonworks_mods98 | 10 +-
install/installer/traf_package_setup | 229 ++++++++++++
install/installer/traf_setup | 172 +--------
install/installer/traf_sqconfig | 32 +-
install/installer/trafodion_install | 62 +++-
114 files changed, 3867 insertions(+), 1422 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3390a73/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3390a73/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
----------------------------------------------------------------------
[09/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagetracing.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagetracing.cpp b/win-odbc64/odbcclient/drvr35adm/pagetracing.cpp
index 348be19..94e89b6 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagetracing.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/pagetracing.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagetracing.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagetracing.h b/win-odbc64/odbcclient/drvr35adm/pagetracing.h
index 613ed2a..22bf4cb 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagetracing.h
+++ b/win-odbc64/odbcclient/drvr35adm/pagetracing.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/propsheet.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/propsheet.cpp b/win-odbc64/odbcclient/drvr35adm/propsheet.cpp
index 06b8f7d..4de4f3c 100644
--- a/win-odbc64/odbcclient/drvr35adm/propsheet.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/propsheet.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/propsheet.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/propsheet.h b/win-odbc64/odbcclient/drvr35adm/propsheet.h
index de81cc1..ee38aad 100644
--- a/win-odbc64/odbcclient/drvr35adm/propsheet.h
+++ b/win-odbc64/odbcclient/drvr35adm/propsheet.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/stdafx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/stdafx.cpp b/win-odbc64/odbcclient/drvr35adm/stdafx.cpp
index fe7a327..ffb54ca 100644
--- a/win-odbc64/odbcclient/drvr35adm/stdafx.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/stdafx.cpp
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/stdafx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/stdafx.h b/win-odbc64/odbcclient/drvr35adm/stdafx.h
index 43625b9..817a21d 100644
--- a/win-odbc64/odbcclient/drvr35adm/stdafx.h
+++ b/win-odbc64/odbcclient/drvr35adm/stdafx.h
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.cpp b/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.cpp
index e4f37ad..92097db 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.h b/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.h
index 1ebf6bf..de813f6 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.h
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagegeneral.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.cpp b/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.cpp
index 8c26014..2fcf146 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.h b/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.h
index 156db90..89e17cd 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.h
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagelocaltr.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp b/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp
index e8af74b..afbcd74 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp
@@ -1,20 +1,23 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2002-2014 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.
+//
// @@@ END COPYRIGHT @@@
********************************************************************/
// TabPageNetwork.cpp : implementation file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.h b/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.h
index 2425220..a8f794e 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.h
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpageoptions.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpageoptions.cpp b/win-odbc64/odbcclient/drvr35adm/tabpageoptions.cpp
index 9ba30c3..1c8e1bf 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpageoptions.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/tabpageoptions.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpageoptions.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpageoptions.h b/win-odbc64/odbcclient/drvr35adm/tabpageoptions.h
index e80c9db..e8f31de 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpageoptions.h
+++ b/win-odbc64/odbcclient/drvr35adm/tabpageoptions.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagetesting.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagetesting.cpp b/win-odbc64/odbcclient/drvr35adm/tabpagetesting.cpp
index 3d9dd97..257b707 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagetesting.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagetesting.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2015 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagetesting.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagetesting.h b/win-odbc64/odbcclient/drvr35adm/tabpagetesting.h
index 6e84241..a344249 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagetesting.h
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagetesting.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagetracing.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagetracing.cpp b/win-odbc64/odbcclient/drvr35adm/tabpagetracing.cpp
index fceb62e..fa5801e 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagetracing.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagetracing.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/tabpagetracing.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagetracing.h b/win-odbc64/odbcclient/drvr35adm/tabpagetracing.h
index a237f11..5792c37 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagetracing.h
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagetracing.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/testdialog.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/testdialog.cpp b/win-odbc64/odbcclient/drvr35adm/testdialog.cpp
index 0c92d48..042d433 100644
--- a/win-odbc64/odbcclient/drvr35adm/testdialog.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/testdialog.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2015 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/testdialog.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/testdialog.h b/win-odbc64/odbcclient/drvr35adm/testdialog.h
index 688c9b1..db7e967 100644
--- a/win-odbc64/odbcclient/drvr35adm/testdialog.h
+++ b/win-odbc64/odbcclient/drvr35adm/testdialog.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/inc/trafsqlext.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/inc/trafsqlext.h b/win-odbc64/odbcclient/inc/trafsqlext.h
index ea08619..4fc1a4c 100644
--- a/win-odbc64/odbcclient/inc/trafsqlext.h
+++ b/win-odbc64/odbcclient/inc/trafsqlext.h
@@ -1,19 +1,22 @@
/*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2006-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/pkg.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/pkg.bat b/win-odbc64/odbcclient/pkg.bat
index 5c81272..c6151ef 100644
--- a/win-odbc64/odbcclient/pkg.bat
+++ b/win-odbc64/odbcclient/pkg.bat
@@ -1,19 +1,22 @@
REM @@@ START COPYRIGHT @@@
-REM
-REM (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM
+REM
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM
REM @@@ END COPYRIGHT @@@
set PACKDRIVER=E:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/common/clientErrCode.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/common/clientErrCode.h b/win-odbc64/security_dll/native/common/clientErrCode.h
index c43fd06..14cf53c 100644
--- a/win-odbc64/security_dll/native/common/clientErrCode.h
+++ b/win-odbc64/security_dll/native/common/clientErrCode.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/common/secdefsCommon.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/common/secdefsCommon.h b/win-odbc64/security_dll/native/common/secdefsCommon.h
index 9e8d000..8dd8cc1 100644
--- a/win-odbc64/security_dll/native/common/secdefsCommon.h
+++ b/win-odbc64/security_dll/native/common/secdefsCommon.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/common/timeval.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/common/timeval.h b/win-odbc64/security_dll/native/common/timeval.h
index a26dce4..575c78a 100644
--- a/win-odbc64/security_dll/native/common/timeval.h
+++ b/win-odbc64/security_dll/native/common/timeval.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/common/utils.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/common/utils.h b/win-odbc64/security_dll/native/common/utils.h
index 28969f9..9fb433e 100644
--- a/win-odbc64/security_dll/native/common/utils.h
+++ b/win-odbc64/security_dll/native/common/utils.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/header/Cipher.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/header/Cipher.h b/win-odbc64/security_dll/native/header/Cipher.h
index 4978389..7fd9ec8 100644
--- a/win-odbc64/security_dll/native/header/Cipher.h
+++ b/win-odbc64/security_dll/native/header/Cipher.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/header/Key.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/header/Key.h b/win-odbc64/security_dll/native/header/Key.h
index 93e7e75..0b1cef7 100644
--- a/win-odbc64/security_dll/native/header/Key.h
+++ b/win-odbc64/security_dll/native/header/Key.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/header/MessageDigest.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/header/MessageDigest.h b/win-odbc64/security_dll/native/header/MessageDigest.h
index 5dcd2ff..d9ed3ac 100644
--- a/win-odbc64/security_dll/native/header/MessageDigest.h
+++ b/win-odbc64/security_dll/native/header/MessageDigest.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/header/StaticLocking.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/header/StaticLocking.h b/win-odbc64/security_dll/native/header/StaticLocking.h
index 8f0e622..f78c68c 100644
--- a/win-odbc64/security_dll/native/header/StaticLocking.h
+++ b/win-odbc64/security_dll/native/header/StaticLocking.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
#ifndef STATICLOCKINGH
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/header/secpwd.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/header/secpwd.h b/win-odbc64/security_dll/native/header/secpwd.h
index adbcdeb..6878af7 100644
--- a/win-odbc64/security_dll/native/header/secpwd.h
+++ b/win-odbc64/security_dll/native/header/secpwd.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/header/security.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/header/security.h b/win-odbc64/security_dll/native/header/security.h
index 57f39f9..a902e1b 100644
--- a/win-odbc64/security_dll/native/header/security.h
+++ b/win-odbc64/security_dll/native/header/security.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/header/securityException.h
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/header/securityException.h b/win-odbc64/security_dll/native/header/securityException.h
index d290812..d3f5b0d 100644
--- a/win-odbc64/security_dll/native/header/securityException.h
+++ b/win-odbc64/security_dll/native/header/securityException.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/source/Cipher.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/source/Cipher.cpp b/win-odbc64/security_dll/native/source/Cipher.cpp
index 8e55cf7..91cfc14 100644
--- a/win-odbc64/security_dll/native/source/Cipher.cpp
+++ b/win-odbc64/security_dll/native/source/Cipher.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/source/Key.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/source/Key.cpp b/win-odbc64/security_dll/native/source/Key.cpp
index c3bd242..818957d 100644
--- a/win-odbc64/security_dll/native/source/Key.cpp
+++ b/win-odbc64/security_dll/native/source/Key.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/source/MessageDigest.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/source/MessageDigest.cpp b/win-odbc64/security_dll/native/source/MessageDigest.cpp
index 1475606..4f54f35 100644
--- a/win-odbc64/security_dll/native/source/MessageDigest.cpp
+++ b/win-odbc64/security_dll/native/source/MessageDigest.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/source/Security.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/source/Security.cpp b/win-odbc64/security_dll/native/source/Security.cpp
index 5110e25..0105a12 100644
--- a/win-odbc64/security_dll/native/source/Security.cpp
+++ b/win-odbc64/security_dll/native/source/Security.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/source/StaticLocking.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/source/StaticLocking.cpp b/win-odbc64/security_dll/native/source/StaticLocking.cpp
index ba20114..dfd9b92 100644
--- a/win-odbc64/security_dll/native/source/StaticLocking.cpp
+++ b/win-odbc64/security_dll/native/source/StaticLocking.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/source/securityException.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/source/securityException.cpp b/win-odbc64/security_dll/native/source/securityException.cpp
index 3bfa48f..fd4d823 100644
--- a/win-odbc64/security_dll/native/source/securityException.cpp
+++ b/win-odbc64/security_dll/native/source/securityException.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
#include "securityException.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/source/utils.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/source/utils.cpp b/win-odbc64/security_dll/native/source/utils.cpp
index 0d38de7..9070230 100644
--- a/win-odbc64/security_dll/native/source/utils.cpp
+++ b/win-odbc64/security_dll/native/source/utils.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/security_dll/native/source/version.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/security_dll/native/source/version.cpp b/win-odbc64/security_dll/native/source/version.cpp
index 9f11d48..469ea8b 100644
--- a/win-odbc64/security_dll/native/source/version.cpp
+++ b/win-odbc64/security_dll/native/source/version.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// HPODBC Version File generate 100203
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/cli/sqlcli.h
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/cli/sqlcli.h b/win-odbc64/sql/cli/sqlcli.h
index a2b4609..e076735 100644
--- a/win-odbc64/sql/cli/sqlcli.h
+++ b/win-odbc64/sql/cli/sqlcli.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/Platform.h
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/Platform.h b/win-odbc64/sql/common/Platform.h
index 5e6e381..08185c3 100644
--- a/win-odbc64/sql/common/Platform.h
+++ b/win-odbc64/sql/common/Platform.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1995-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/UCS_jp_data.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/UCS_jp_data.c b/win-odbc64/sql/common/UCS_jp_data.c
index 271cac6..c87a1fb 100644
--- a/win-odbc64/sql/common/UCS_jp_data.c
+++ b/win-odbc64/sql/common/UCS_jp_data.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
[08/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/UCS_ko_data.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/UCS_ko_data.c b/win-odbc64/sql/common/UCS_ko_data.c
index 42d56d2..5182eee 100644
--- a/win-odbc64/sql/common/UCS_ko_data.c
+++ b/win-odbc64/sql/common/UCS_ko_data.c
@@ -17,19 +17,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/UCS_zb_data.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/UCS_zb_data.c b/win-odbc64/sql/common/UCS_zb_data.c
index 82883dc..f954cc4 100644
--- a/win-odbc64/sql/common/UCS_zb_data.c
+++ b/win-odbc64/sql/common/UCS_zb_data.c
@@ -11,19 +11,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/UCS_zs_data.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/UCS_zs_data.c b/win-odbc64/sql/common/UCS_zs_data.c
index 15a398f..d8bdbf3 100644
--- a/win-odbc64/sql/common/UCS_zs_data.c
+++ b/win-odbc64/sql/common/UCS_zs_data.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/csconvert.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/csconvert.cpp b/win-odbc64/sql/common/csconvert.cpp
index 03393c7..b420340 100644
--- a/win-odbc64/sql/common/csconvert.cpp
+++ b/win-odbc64/sql/common/csconvert.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/csconvert.h
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/csconvert.h b/win-odbc64/sql/common/csconvert.h
index 43c9006..79077ab 100644
--- a/win-odbc64/sql/common/csconvert.h
+++ b/win-odbc64/sql/common/csconvert.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/fcconv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/fcconv.h b/win-odbc64/sql/common/fcconv.h
index 6ddb7e3..91be151 100644
--- a/win-odbc64/sql/common/fcconv.h
+++ b/win-odbc64/sql/common/fcconv.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1996-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/from_GB18030.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/from_GB18030.c b/win-odbc64/sql/common/from_GB18030.c
index f0660fa..09f1dbc 100644
--- a/win-odbc64/sql/common/from_GB18030.c
+++ b/win-odbc64/sql/common/from_GB18030.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/from_GB2312.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/from_GB2312.c b/win-odbc64/sql/common/from_GB2312.c
index d8939f5..1eeb949 100644
--- a/win-odbc64/sql/common/from_GB2312.c
+++ b/win-odbc64/sql/common/from_GB2312.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/from_GBK.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/from_GBK.c b/win-odbc64/sql/common/from_GBK.c
index 6d30af3..9527fd9 100644
--- a/win-odbc64/sql/common/from_GBK.c
+++ b/win-odbc64/sql/common/from_GBK.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/gb18030_data.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/gb18030_data.c b/win-odbc64/sql/common/gb18030_data.c
index 93fbc00..ca67143 100644
--- a/win-odbc64/sql/common/gb18030_data.c
+++ b/win-odbc64/sql/common/gb18030_data.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/iconv_gen.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/iconv_gen.c b/win-odbc64/sql/common/iconv_gen.c
index d1ee9dd..55de2ad 100644
--- a/win-odbc64/sql/common/iconv_gen.c
+++ b/win-odbc64/sql/common/iconv_gen.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/mb_iconv.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/mb_iconv.c b/win-odbc64/sql/common/mb_iconv.c
index 2aca556..3fdb20d 100644
--- a/win-odbc64/sql/common/mb_iconv.c
+++ b/win-odbc64/sql/common/mb_iconv.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/mb_lconv.c
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/mb_lconv.c b/win-odbc64/sql/common/mb_lconv.c
index c37977e..1810139 100644
--- a/win-odbc64/sql/common/mb_lconv.c
+++ b/win-odbc64/sql/common/mb_lconv.c
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1994-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/sql/common/multi-byte.h
----------------------------------------------------------------------
diff --git a/win-odbc64/sql/common/multi-byte.h b/win-odbc64/sql/common/multi-byte.h
index c8f270a..46c4337 100644
--- a/win-odbc64/sql/common/multi-byte.h
+++ b/win-odbc64/sql/common/multi-byte.h
@@ -1,19 +1,22 @@
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 1994-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.
-//
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
// @@@ END COPYRIGHT @@@
/*
* COPYRIGHT NOTICE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/local-servers.sh
----------------------------------------------------------------------
diff --git a/wms/bin/local-servers.sh b/wms/bin/local-servers.sh
index d4b3a39..8b4c50f 100755
--- a/wms/bin/local-servers.sh
+++ b/wms/bin/local-servers.sh
@@ -1,18 +1,25 @@
#!/bin/sh
#/**
-# *(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 is used for starting multiple servers on the same machine.
# run it from 'bin/wms'
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/scripts/sys_shell.py
----------------------------------------------------------------------
diff --git a/wms/bin/scripts/sys_shell.py b/wms/bin/scripts/sys_shell.py
index 24a278e..be9bcf3 100755
--- a/wms/bin/scripts/sys_shell.py
+++ b/wms/bin/scripts/sys_shell.py
@@ -1,17 +1,24 @@
#/**
-# *(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 @@@
# */
#
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/servers.sh
----------------------------------------------------------------------
diff --git a/wms/bin/servers.sh b/wms/bin/servers.sh
index 070a2af..f74ded0 100755
--- a/wms/bin/servers.sh
+++ b/wms/bin/servers.sh
@@ -1,18 +1,25 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
#
# Run a shell command on all server hosts.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/start-wms.sh
----------------------------------------------------------------------
diff --git a/wms/bin/start-wms.sh b/wms/bin/start-wms.sh
index efdab32..0ac0570 100755
--- a/wms/bin/start-wms.sh
+++ b/wms/bin/start-wms.sh
@@ -1,38 +1,28 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
#
#/**
-# * 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 wms daemons.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/stop-wms.sh
----------------------------------------------------------------------
diff --git a/wms/bin/stop-wms.sh b/wms/bin/stop-wms.sh
index 693e63e..aa64f45 100755
--- a/wms/bin/stop-wms.sh
+++ b/wms/bin/stop-wms.sh
@@ -1,38 +1,28 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
#
#/**
-# * 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.
# */
# Stop wms daemons.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/wms
----------------------------------------------------------------------
diff --git a/wms/bin/wms b/wms/bin/wms
index 4eb90ad..cb3edab 100755
--- a/wms/bin/wms
+++ b/wms/bin/wms
@@ -1,37 +1,28 @@
#! /usr/bin/env bash
#/**
-# *(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 @@@
# */
#/**
# * 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.
# */
#
# The wms command script.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/wms-config.sh
----------------------------------------------------------------------
diff --git a/wms/bin/wms-config.sh b/wms/bin/wms-config.sh
index 30ad2d3..8bb02ac 100755
--- a/wms/bin/wms-config.sh
+++ b/wms/bin/wms-config.sh
@@ -1,37 +1,27 @@
#/**
-# *(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 @@@
# */
#
#/**
-# * 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.
# */
#
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/wms-daemon.sh
----------------------------------------------------------------------
diff --git a/wms/bin/wms-daemon.sh b/wms/bin/wms-daemon.sh
index f6296cd..54cc7bc 100755
--- a/wms/bin/wms-daemon.sh
+++ b/wms/bin/wms-daemon.sh
@@ -1,38 +1,28 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
#
#/**
-# * 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.
# */
#
# Runs a WMS command as a daemon.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/wms-daemons.sh
----------------------------------------------------------------------
diff --git a/wms/bin/wms-daemons.sh b/wms/bin/wms-daemons.sh
index c9dadc6..5876fd1 100755
--- a/wms/bin/wms-daemons.sh
+++ b/wms/bin/wms-daemons.sh
@@ -1,38 +1,28 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
#
#/**
-# * 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.
# */
#
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/bin/zookeepers.sh
----------------------------------------------------------------------
diff --git a/wms/bin/zookeepers.sh b/wms/bin/zookeepers.sh
index 9cc0cd6..0621250 100755
--- a/wms/bin/zookeepers.sh
+++ b/wms/bin/zookeepers.sh
@@ -1,38 +1,28 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
#
#/**
-# * Copyright 2009 The Apache Software Foundation
-# *
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements. See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership. The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License. You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
# */
#
# Run a shell command on all zookeeper hosts.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/conf/wms-env.sh
----------------------------------------------------------------------
diff --git a/wms/conf/wms-env.sh b/wms/conf/wms-env.sh
index e17cdeb..bf57631 100644
--- a/wms/conf/wms-env.sh
+++ b/wms/conf/wms-env.sh
@@ -1,37 +1,27 @@
#/**
-# *(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 @@@
# */
#
#/**
-# * 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.
# */
# Set environment variables here.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/conf/wms-site.xml
----------------------------------------------------------------------
diff --git a/wms/conf/wms-site.xml b/wms/conf/wms-site.xml
index a2312e4..c3982ed 100644
--- a/wms/conf/wms-site.xml
+++ b/wms/conf/wms-site.xml
@@ -2,40 +2,30 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
- *(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 @@@
*/
-->
<!--
/**
- * 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.
*/
-->
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/pom.xml
----------------------------------------------------------------------
diff --git a/wms/pom.xml b/wms/pom.xml
index c36daca..0080020 100644
--- a/wms/pom.xml
+++ b/wms/pom.xml
@@ -1,23 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<!--
-/**
- *(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.
- */
--->
<!--
/**
* Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/wms/src/assembly/all.xml b/wms/src/assembly/all.xml
index 24d38b1..34e6540 100644
--- a/wms/src/assembly/all.xml
+++ b/wms/src/assembly/all.xml
@@ -4,40 +4,29 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<!--
/**
- *(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 @@@
*/
-->
-<!--
-/**
- * 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.
- */
--->
+
<!--This 'all' id is not appended to the produced bundle because we do this:
http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
-->
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/wms/src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon b/wms/src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon
index 2aa749a..3ca25e8 100644
--- a/wms/src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon
+++ b/wms/src/main/jamon/org/trafodion/wms/tmpl/master/MasterStatusTmpl.jamon
@@ -1,20 +1,5 @@
<%doc>
-(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.
-
-Copyright 2011 The Apache Software Foundation
-
+ @@@ 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
@@ -30,6 +15,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT 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 @@@
</%doc>
<%args>
WmsMaster master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/wms/src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon b/wms/src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon
index af1d302..a2e0dfa 100644
--- a/wms/src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon
+++ b/wms/src/main/jamon/org/trafodion/wms/tmpl/server/ServerStatusTmpl.jamon
@@ -1,20 +1,5 @@
<%doc>
-(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.
-
-Copyright 2011 The Apache Software Foundation
-
+@@@ 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
@@ -30,6 +15,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT 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 @@@
</%doc>
<%args>
WmsServer server;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/Constants.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/Constants.java b/wms/src/main/java/org/trafodion/wms/Constants.java
index 880dc6d..bdbf840 100644
--- a/wms/src/main/java/org/trafodion/wms/Constants.java
+++ b/wms/src/main/java/org/trafodion/wms/Constants.java
@@ -1,36 +1,24 @@
/**
- *(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.
- */
-/**
- * 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.wms;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/http/FilterContainer.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/http/FilterContainer.java b/wms/src/main/java/org/trafodion/wms/http/FilterContainer.java
index b2d519e..24640fa 100644
--- a/wms/src/main/java/org/trafodion/wms/http/FilterContainer.java
+++ b/wms/src/main/java/org/trafodion/wms/http/FilterContainer.java
@@ -1,35 +1,26 @@
/**
- *(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.
- */
-/**
- * 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.wms.http;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/http/HtmlQuoting.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/http/HtmlQuoting.java b/wms/src/main/java/org/trafodion/wms/http/HtmlQuoting.java
index 08f3ee4..b1cc275 100644
--- a/wms/src/main/java/org/trafodion/wms/http/HtmlQuoting.java
+++ b/wms/src/main/java/org/trafodion/wms/http/HtmlQuoting.java
@@ -1,35 +1,26 @@
/**
- *(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.
- */
-/**
- * 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.wms.http;
import java.io.ByteArrayOutputStream;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/http/HttpServer.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/http/HttpServer.java b/wms/src/main/java/org/trafodion/wms/http/HttpServer.java
index 596add9..89fbce0 100644
--- a/wms/src/main/java/org/trafodion/wms/http/HttpServer.java
+++ b/wms/src/main/java/org/trafodion/wms/http/HttpServer.java
@@ -1,38 +1,27 @@
/**
- *(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.
- */
-/**
- * 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.wms.http;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/master/MasterStatusServlet.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/master/MasterStatusServlet.java b/wms/src/main/java/org/trafodion/wms/master/MasterStatusServlet.java
index 534f381..b96584f 100644
--- a/wms/src/main/java/org/trafodion/wms/master/MasterStatusServlet.java
+++ b/wms/src/main/java/org/trafodion/wms/master/MasterStatusServlet.java
@@ -1,38 +1,27 @@
/**
- *(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.
- */
-/**
- * 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.wms.master;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/master/Metrics.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/master/Metrics.java b/wms/src/main/java/org/trafodion/wms/master/Metrics.java
index ee3d993..78eef65 100644
--- a/wms/src/main/java/org/trafodion/wms/master/Metrics.java
+++ b/wms/src/main/java/org/trafodion/wms/master/Metrics.java
@@ -1,17 +1,24 @@
/**
- *(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.wms.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/master/ServerManager.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/master/ServerManager.java b/wms/src/main/java/org/trafodion/wms/master/ServerManager.java
index 3f11394..8ca3a62 100644
--- a/wms/src/main/java/org/trafodion/wms/master/ServerManager.java
+++ b/wms/src/main/java/org/trafodion/wms/master/ServerManager.java
@@ -1,17 +1,24 @@
/**
- *(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.wms.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/master/WmsMaster.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/master/WmsMaster.java b/wms/src/main/java/org/trafodion/wms/master/WmsMaster.java
index e9fdd46..69f2743 100644
--- a/wms/src/main/java/org/trafodion/wms/master/WmsMaster.java
+++ b/wms/src/main/java/org/trafodion/wms/master/WmsMaster.java
@@ -1,17 +1,24 @@
/**
- *(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.wms.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/script/ScriptContext.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/script/ScriptContext.java b/wms/src/main/java/org/trafodion/wms/script/ScriptContext.java
index 46e73ce..c7bb83a 100644
--- a/wms/src/main/java/org/trafodion/wms/script/ScriptContext.java
+++ b/wms/src/main/java/org/trafodion/wms/script/ScriptContext.java
@@ -1,17 +1,24 @@
/**
- *(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.wms.script;
[13/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/model/VersionModel.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/model/VersionModel.java b/dcs/src/main/java/org/trafodion/dcs/rest/model/VersionModel.java
index c7bc872..3d3bebe 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/model/VersionModel.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/model/VersionModel.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2007 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/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 bb43595..db52101 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
@@ -47,7 +47,26 @@ import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * Simple representation of a list of workloads.
+* @@@ 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 @@@
*/
@XmlRootElement(name="Workloads")
public class WorkloadListModel {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/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 77defb0..6c432f1 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
@@ -42,7 +42,26 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * Simple representation of a workload.
+* @@@ 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 @@@
*/
@XmlRootElement(name="workload")
public class WorkloadModel implements Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/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 1f31f5a..e210785 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
@@ -49,10 +49,26 @@ import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.api.json.JSONJAXBContext;
/**
- * Plumbing for hooking up Jersey's JSON entity body encoding and decoding
- * support to JAXB. Modify how the context is created (by using e.g. a
- * different configuration builder) to control how JSON is processed and
- * created.
+* @@@ 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 @@@
*/
@Provider
public class JAXBContextResolver implements ContextResolver<JAXBContext> {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/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 53fda86..2339405 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
@@ -50,10 +50,26 @@ import javax.ws.rs.ext.Provider;
import org.trafodion.dcs.rest.RestConstants;
/**
- * An adapter between Jersey and Object.toString(). Hooks up plain text output
- * to the Jersey content handling framework.
- * Jersey will first call getSize() to learn the number of bytes that will be
- * sent, then writeTo to perform the actual I/O.
+* @@@ 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 @@@
*/
@Provider
@Produces(RestConstants.MIMETYPE_TEXT)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/script/ScriptManager.java b/dcs/src/main/java/org/trafodion/dcs/script/ScriptManager.java
index d10f222..f22b296 100644
--- a/dcs/src/main/java/org/trafodion/dcs/script/ScriptManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/script/ScriptManager.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/script/ScriptManagerWatcher.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/script/ScriptManagerWatcher.java b/dcs/src/main/java/org/trafodion/dcs/script/ScriptManagerWatcher.java
index 1341a04..cbb8435 100644
--- a/dcs/src/main/java/org/trafodion/dcs/script/ScriptManagerWatcher.java
+++ b/dcs/src/main/java/org/trafodion/dcs/script/ScriptManagerWatcher.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/server/DcsServer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/server/DcsServer.java b/dcs/src/main/java/org/trafodion/dcs/server/DcsServer.java
index 559854b..d47ebf2 100644
--- a/dcs/src/main/java/org/trafodion/dcs/server/DcsServer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/server/DcsServer.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/server/Metrics.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/server/Metrics.java b/dcs/src/main/java/org/trafodion/dcs/server/Metrics.java
index 34bd72a..9f6aa23 100644
--- a/dcs/src/main/java/org/trafodion/dcs/server/Metrics.java
+++ b/dcs/src/main/java/org/trafodion/dcs/server/Metrics.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/server/ServerStatusServlet.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/server/ServerStatusServlet.java b/dcs/src/main/java/org/trafodion/dcs/server/ServerStatusServlet.java
index 61bd3cf..6d5c682 100644
--- a/dcs/src/main/java/org/trafodion/dcs/server/ServerStatusServlet.java
+++ b/dcs/src/main/java/org/trafodion/dcs/server/ServerStatusServlet.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java b/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java
index c6d3d77..473f8cb 100644
--- a/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java
+++ b/dcs/src/main/java/org/trafodion/dcs/version/util/VerGen.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2011 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java
index 7366453..62883f9 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/DcsQuorumPeer.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2010 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java
index 3ddcadb..57095f4 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKConfig.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2010 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java
index 874ebae..728ce63 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZKServerTool.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2010 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
index d66c43d..f61f7c4 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkClient.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2011 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java
index b75e086..a66ecfa 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZkUtil.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2011 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java
index 5eedc42..5843717 100644
--- a/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java
+++ b/dcs/src/main/java/org/trafodion/dcs/zookeeper/ZooKeeperMainServerArg.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2010 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/resources/dcs-default.xml
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-default.xml b/dcs/src/main/resources/dcs-default.xml
index 529854f..577003c 100644
--- a/dcs/src/main/resources/dcs-default.xml
+++ b/dcs/src/main/resources/dcs-default.xml
@@ -1,40 +1,26 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- *(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.
- */
- -->
- <!--
-/**
- * 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 @@@
-->
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/dcs/src/saveVersion.sh b/dcs/src/saveVersion.sh
index 6d82e64..c25852f 100644
--- a/dcs/src/saveVersion.sh
+++ b/dcs/src/saveVersion.sh
@@ -1,38 +1,29 @@
#!/bin/sh
+#* @@@ 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 file is used to generate the annotation of package info that
# records the user, url, revision and timestamp.
-#
-# (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.
unset LANG
unset LC_CTYPE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java b/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java
index eb7e03c..589cb4e 100755
--- a/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java
+++ b/dcs/src/test/java/org/trafodion/dcs/IntegrationTestEndurance.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/IntegrationTests.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/IntegrationTests.java b/dcs/src/test/java/org/trafodion/dcs/IntegrationTests.java
index 890f6b9..9bdd2d4 100644
--- a/dcs/src/test/java/org/trafodion/dcs/IntegrationTests.java
+++ b/dcs/src/test/java/org/trafodion/dcs/IntegrationTests.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/LargeTests.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/LargeTests.java b/dcs/src/test/java/org/trafodion/dcs/LargeTests.java
index fcd1498..a1f6354 100644
--- a/dcs/src/test/java/org/trafodion/dcs/LargeTests.java
+++ b/dcs/src/test/java/org/trafodion/dcs/LargeTests.java
@@ -1,17 +1,24 @@
/**
- *(C) Copyright 2014 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/MediumTests.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/MediumTests.java b/dcs/src/test/java/org/trafodion/dcs/MediumTests.java
index 66dca87..34bb18c 100644
--- a/dcs/src/test/java/org/trafodion/dcs/MediumTests.java
+++ b/dcs/src/test/java/org/trafodion/dcs/MediumTests.java
@@ -1,17 +1,24 @@
/**
- *(C) Copyright 2014 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/ReposPublicationTest.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/ReposPublicationTest.java b/dcs/src/test/java/org/trafodion/dcs/ReposPublicationTest.java
index 2d34cfd..84d68ef 100644
--- a/dcs/src/test/java/org/trafodion/dcs/ReposPublicationTest.java
+++ b/dcs/src/test/java/org/trafodion/dcs/ReposPublicationTest.java
@@ -1,17 +1,24 @@
/**
- *(C) Copyright 2014 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/ReposTableAccessTest.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/ReposTableAccessTest.java b/dcs/src/test/java/org/trafodion/dcs/ReposTableAccessTest.java
index d92df63..022e690 100644
--- a/dcs/src/test/java/org/trafodion/dcs/ReposTableAccessTest.java
+++ b/dcs/src/test/java/org/trafodion/dcs/ReposTableAccessTest.java
@@ -1,17 +1,24 @@
/**
- *(C) Copyright 2014 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/ResourceChecker.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/ResourceChecker.java b/dcs/src/test/java/org/trafodion/dcs/ResourceChecker.java
index 45f9bf7..4914bed 100644
--- a/dcs/src/test/java/org/trafodion/dcs/ResourceChecker.java
+++ b/dcs/src/test/java/org/trafodion/dcs/ResourceChecker.java
@@ -1,17 +1,24 @@
/**
- *(C) Copyright 2014 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/ResourceCheckerJUnitRule.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/ResourceCheckerJUnitRule.java b/dcs/src/test/java/org/trafodion/dcs/ResourceCheckerJUnitRule.java
index f0135a6..a906ea1 100644
--- a/dcs/src/test/java/org/trafodion/dcs/ResourceCheckerJUnitRule.java
+++ b/dcs/src/test/java/org/trafodion/dcs/ResourceCheckerJUnitRule.java
@@ -1,17 +1,24 @@
/**
- *(C) Copyright 2014 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/java/org/trafodion/dcs/SmallTests.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/java/org/trafodion/dcs/SmallTests.java b/dcs/src/test/java/org/trafodion/dcs/SmallTests.java
index ad076ff..b61b8d4 100644
--- a/dcs/src/test/java/org/trafodion/dcs/SmallTests.java
+++ b/dcs/src/test/java/org/trafodion/dcs/SmallTests.java
@@ -1,17 +1,24 @@
/**
- *(C) Copyright 2014 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/README.rst
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/README.rst b/dcs/src/test/jdbc_test/README.rst
index ed4852e..b6ce976 100644
--- a/dcs/src/test/jdbc_test/README.rst
+++ b/dcs/src/test/jdbc_test/README.rst
@@ -1,20 +1,24 @@
-.. # @@@ START COPYRIGHT @@@
- #
- # (C) Copyright 2014 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.
- #
- # @@@ END COPYRIGHT @@@
+.. #* @@@ START COPYRIGHT @@@
+#*
+#* Licensed to the Apache Software Foundation (ASF) under one
+#* or more contributor license agreements. See the NOTICE file
+#* distributed with this work for additional information
+#* regarding copyright ownership. The ASF licenses this file
+#* to you under the Apache License, Version 2.0 (the
+#* "License"); you may not use this file except in compliance
+#* with the License. You may obtain a copy of the License at
+#*
+#* http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing,
+#* software distributed under the License is distributed on an
+#* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#* KIND, either express or implied. See the License for the
+#* specific language governing permissions and limitations
+#* under the License.
+#*
+#* @@@ END COPYRIGHT @@@
+# */
==========================
Trafodion JDBC Test README
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/jdbc_test.py
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/jdbc_test.py b/dcs/src/test/jdbc_test/jdbc_test.py
index 48e50d8..7f67879 100755
--- a/dcs/src/test/jdbc_test/jdbc_test.py
+++ b/dcs/src/test/jdbc_test/jdbc_test.py
@@ -1,22 +1,27 @@
#! /usr/bin/env python
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
+#/**
+#* @@@ START COPYRIGHT @@@
+#*
+#* Licensed to the Apache Software Foundation (ASF) under one
+#* or more contributor license agreements. See the NOTICE file
+#* distributed with this work for additional information
+#* regarding copyright ownership. The ASF licenses this file
+#* to you under the Apache License, Version 2.0 (the
+#* "License"); you may not use this file except in compliance
+#* with the License. You may obtain a copy of the License at
+#*
+#* http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing,
+#* software distributed under the License is distributed on an
+#* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#* KIND, either express or implied. See the License for the
+#* specific language governing permissions and limitations
+#* under the License.
+#*
+#* @@@ END COPYRIGHT @@@
+# */
import sys
import subprocess
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/pom.xml.template
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/pom.xml.template b/dcs/src/test/jdbc_test/pom.xml.template
index 3917f40..ec75439 100644
--- a/dcs/src/test/jdbc_test/pom.xml.template
+++ b/dcs/src/test/jdbc_test/pom.xml.template
@@ -2,10 +2,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<licenses>
<license>
- <name>(C) Copyright 2013 Hewlett-Packard Development Company, L.P</name>
- <comments>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</comments>
- </license>
- <license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
index 60874e5..a4a269e 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/PropTest.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import java.sql.*;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBasic.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBasic.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBasic.java
index 470ac5f..e17c484 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBasic.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBasic.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import org.junit.Test;
import static org.junit.Assert.*;
@@ -572,10 +589,26 @@ public class TestBasic
System.out.println(e.getMessage());
} finally {
/**/
- if (pass)
- System.out.println("JDBCBasic19 - Param All : Passed");
- else
- System.out.println("JDBCBasic19 - Param All : FAILED");
+/* @@@ 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 @@@
/**/
assertEquals(true, pass);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBatch.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBatch.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBatch.java
index 40cb64b..283692a 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBatch.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBatch.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import org.junit.Test;
import static org.junit.Assert.*;
@@ -180,10 +197,26 @@ public class TestBatch
System.out.println(e.getMessage());
} finally {
/**/
- if (pass)
- System.out.println("JDBCBatch1 : Passed");
- else
- System.out.println("JDBCBatch1 : FAILED");
+/* @@@ 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 @@@
/**/
assertEquals(true, pass);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigCol.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigCol.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigCol.java
index 3f8bd15..405139e 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigCol.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigCol.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import org.junit.Test;
import static org.junit.Assert.*;
@@ -754,10 +771,26 @@ public class TestBigCol
System.out.println(e.getMessage());
} finally {
/**/
- if (pass)
- System.out.println("Big Col Batch1 : Passed");
- else
- System.out.println("Big Col Batch1 : FAILED");
+/* @@@ 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 @@@
/**/
assertEquals(true, pass);
}
@@ -1557,7 +1590,7 @@ public class TestBigCol
assertEquals(true, pass);
}
}
-*/
+/*/
public static void handleBatchUpdateException(BatchUpdateException e)
{
int[] bueUpdateCount = e.getUpdateCounts();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigColumnSize.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigColumnSize.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigColumnSize.java
index 014a361..d32a50f 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigColumnSize.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestBigColumnSize.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import java.net.*;
import java.sql.*;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
index 0ef6296..934b097 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import org.junit.Test;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestMisc.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestMisc.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestMisc.java
index 2d9b42a..2a87f02 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestMisc.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestMisc.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import org.junit.Test;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestTrx.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestTrx.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestTrx.java
index 1b796a4..f7d127d 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestTrx.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestTrx.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import org.junit.Test;
import static org.junit.Assert.*;
@@ -541,10 +558,26 @@ public class TestTrx
System.out.println(e.getMessage());
} finally {
/**/
- if (pass)
- System.out.println("JDBCTrxBatch1 : Passed");
- else
- System.out.println("JDBCTrxBatch1 : FAILED");
+/* @@@ 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 @@@
/**/
assertEquals(true, pass);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/Utils.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/Utils.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/Utils.java
index 5d6ca80..9f0d983 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/Utils.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/Utils.java
@@ -1,22 +1,39 @@
/*
-# @@@ START COPYRIGHT @@@
-#
-# (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.
-#
-# @@@ END COPYRIGHT @@@
-*/
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements. See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership. The ASF licenses this file
+/*
+to you under the Apache License, Version 2.0 (the
+/*
+"License"); you may not use this file except in compliance
+/*
+with the License. You may obtain a copy of the License at
+/*
+/*
+ http://www.apache.org/licenses/LICENSE-2.0
+/*
+/*
+Unless required by applicable law or agreed to in writing,
+/*
+software distributed under the License is distributed on an
+/*
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+/*
+KIND, either express or implied. See the License for the
+/*
+specific language governing permissions and limitations
+/*
+under the License.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
import java.sql.Date;
import java.sql.Time;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/test/pytests/test-requirements.txt
----------------------------------------------------------------------
diff --git a/dcs/src/test/pytests/test-requirements.txt b/dcs/src/test/pytests/test-requirements.txt
index 6a0ba66..c606808 100644
--- a/dcs/src/test/pytests/test-requirements.txt
+++ b/dcs/src/test/pytests/test-requirements.txt
@@ -6,6 +6,6 @@ mock>=1.0
sphinx>=1.1.2,<1.2
testrepository>=0.0.17
testtools>=0.9.32
-configparser>=3.3.0r2
+configparser>=3.3.0
xmlrunner>=1.7.4
http://pyodbc.googlecode.com/files/pyodbc-3.0.7.zip
[10/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/chandle.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/chandle.cpp b/win-odbc64/odbcclient/drvr35/chandle.cpp
index fae3562..ce92c38 100644
--- a/win-odbc64/odbcclient/drvr35/chandle.cpp
+++ b/win-odbc64/odbcclient/drvr35/chandle.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/chandle.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/chandle.h b/win-odbc64/odbcclient/drvr35/chandle.h
index cd54293..7f67ffb 100644
--- a/win-odbc64/odbcclient/drvr35/chandle.h
+++ b/win-odbc64/odbcclient/drvr35/chandle.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/charsetconv.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/charsetconv.cpp b/win-odbc64/odbcclient/drvr35/charsetconv.cpp
index 2672b6d..34a2179 100644
--- a/win-odbc64/odbcclient/drvr35/charsetconv.cpp
+++ b/win-odbc64/odbcclient/drvr35/charsetconv.cpp
@@ -1,19 +1,22 @@
/**************************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2009-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/charsetconv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/charsetconv.h b/win-odbc64/odbcclient/drvr35/charsetconv.h
index d128dc5..6216a69 100644
--- a/win-odbc64/odbcclient/drvr35/charsetconv.h
+++ b/win-odbc64/odbcclient/drvr35/charsetconv.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
#ifndef CHARSETCONV_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cstmt.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cstmt.h b/win-odbc64/odbcclient/drvr35/cstmt.h
index 9cbeeb9..5bb2d20 100644
--- a/win-odbc64/odbcclient/drvr35/cstmt.h
+++ b/win-odbc64/odbcclient/drvr35/cstmt.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/ctosqlconv.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/ctosqlconv.cpp b/win-odbc64/odbcclient/drvr35/ctosqlconv.cpp
index 94ca532..c70b296 100644
--- a/win-odbc64/odbcclient/drvr35/ctosqlconv.cpp
+++ b/win-odbc64/odbcclient/drvr35/ctosqlconv.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2015 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/ctosqlconv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/ctosqlconv.h b/win-odbc64/odbcclient/drvr35/ctosqlconv.h
index 00189d6..9c22f2f 100644
--- a/win-odbc64/odbcclient/drvr35/ctosqlconv.h
+++ b/win-odbc64/odbcclient/drvr35/ctosqlconv.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/diagfunctions.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/diagfunctions.cpp b/win-odbc64/odbcclient/drvr35/diagfunctions.cpp
index b5af7ca..eb898a0 100644
--- a/win-odbc64/odbcclient/drvr35/diagfunctions.cpp
+++ b/win-odbc64/odbcclient/drvr35/diagfunctions.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/diagfunctions.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/diagfunctions.h b/win-odbc64/odbcclient/drvr35/diagfunctions.h
index edf210f..cbff529 100644
--- a/win-odbc64/odbcclient/drvr35/diagfunctions.h
+++ b/win-odbc64/odbcclient/drvr35/diagfunctions.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/drvr35.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvr35.def b/win-odbc64/odbcclient/drvr35/drvr35.def
index 6e8c7d0..58fea42 100644
--- a/win-odbc64/odbcclient/drvr35/drvr35.def
+++ b/win-odbc64/odbcclient/drvr35/drvr35.def
@@ -1,7 +1,22 @@
;// @@@ START COPYRIGHT @@@
-;//
-;// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
-;//
+;//
+;// Licensed to the Apache Software Foundation (ASF) under one
+;// or more contributor license agreements. See the NOTICE file
+;// distributed with this work for additional information
+;// regarding copyright ownership. The ASF licenses this file
+;// to you under the Apache License, Version 2.0 (the
+;// "License"); you may not use this file except in compliance
+;// with the License. You may obtain a copy of the License at
+;//
+;// 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 @@@
; Drvr35.def : Declares the module parameters for the DLL.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/drvrglobal.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvrglobal.cpp b/win-odbc64/odbcclient/drvr35/drvrglobal.cpp
index 47e2c77..8d1124c 100644
--- a/win-odbc64/odbcclient/drvr35/drvrglobal.cpp
+++ b/win-odbc64/odbcclient/drvr35/drvrglobal.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/drvrglobal.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvrglobal.h b/win-odbc64/odbcclient/drvr35/drvrglobal.h
index 903f334..0865698 100644
--- a/win-odbc64/odbcclient/drvr35/drvrglobal.h
+++ b/win-odbc64/odbcclient/drvr35/drvrglobal.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/drvrnet.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvrnet.cpp b/win-odbc64/odbcclient/drvr35/drvrnet.cpp
index 81dcd29..05d2f59 100644
--- a/win-odbc64/odbcclient/drvr35/drvrnet.cpp
+++ b/win-odbc64/odbcclient/drvr35/drvrnet.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/drvrnet.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvrnet.h b/win-odbc64/odbcclient/drvr35/drvrnet.h
index 4f31afb..4df7da5 100644
--- a/win-odbc64/odbcclient/drvr35/drvrnet.h
+++ b/win-odbc64/odbcclient/drvr35/drvrnet.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/netcommon.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/netcommon.cpp b/win-odbc64/odbcclient/drvr35/netcommon.cpp
index aef3614..7c8289f 100644
--- a/win-odbc64/odbcclient/drvr35/netcommon.cpp
+++ b/win-odbc64/odbcclient/drvr35/netcommon.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/netconnect.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/netconnect.cpp b/win-odbc64/odbcclient/drvr35/netconnect.cpp
index 2684f58..e44202c 100644
--- a/win-odbc64/odbcclient/drvr35/netconnect.cpp
+++ b/win-odbc64/odbcclient/drvr35/netconnect.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/netstmt.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/netstmt.cpp b/win-odbc64/odbcclient/drvr35/netstmt.cpp
index d46cf67..38e09c4 100644
--- a/win-odbc64/odbcclient/drvr35/netstmt.cpp
+++ b/win-odbc64/odbcclient/drvr35/netstmt.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlconnect.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlconnect.cpp b/win-odbc64/odbcclient/drvr35/sqlconnect.cpp
index ffc2196..7b93884 100644
--- a/win-odbc64/odbcclient/drvr35/sqlconnect.cpp
+++ b/win-odbc64/odbcclient/drvr35/sqlconnect.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlconnect.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlconnect.h b/win-odbc64/odbcclient/drvr35/sqlconnect.h
index f0bcaeb..ef8c8a6 100644
--- a/win-odbc64/odbcclient/drvr35/sqlconnect.h
+++ b/win-odbc64/odbcclient/drvr35/sqlconnect.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqldesc.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqldesc.cpp b/win-odbc64/odbcclient/drvr35/sqldesc.cpp
index 037e183..a4e72b7 100644
--- a/win-odbc64/odbcclient/drvr35/sqldesc.cpp
+++ b/win-odbc64/odbcclient/drvr35/sqldesc.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqldesc.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqldesc.h b/win-odbc64/odbcclient/drvr35/sqldesc.h
index 9af9bed..7d2e3b7 100644
--- a/win-odbc64/odbcclient/drvr35/sqldesc.h
+++ b/win-odbc64/odbcclient/drvr35/sqldesc.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlenv.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlenv.cpp b/win-odbc64/odbcclient/drvr35/sqlenv.cpp
index a14c04c..15a0d96 100644
--- a/win-odbc64/odbcclient/drvr35/sqlenv.cpp
+++ b/win-odbc64/odbcclient/drvr35/sqlenv.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlenv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlenv.h b/win-odbc64/odbcclient/drvr35/sqlenv.h
index a7646e7..ed155f0 100644
--- a/win-odbc64/odbcclient/drvr35/sqlenv.h
+++ b/win-odbc64/odbcclient/drvr35/sqlenv.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp b/win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp
index 52bc66c..dd02238 100644
--- a/win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp
+++ b/win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlhandle.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlhandle.cpp b/win-odbc64/odbcclient/drvr35/sqlhandle.cpp
index 44ae4be..e5ac7ae 100644
--- a/win-odbc64/odbcclient/drvr35/sqlhandle.cpp
+++ b/win-odbc64/odbcclient/drvr35/sqlhandle.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlhandle.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlhandle.h b/win-odbc64/odbcclient/drvr35/sqlhandle.h
index 6de2cf0..2e89674 100644
--- a/win-odbc64/odbcclient/drvr35/sqlhandle.h
+++ b/win-odbc64/odbcclient/drvr35/sqlhandle.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlstmt.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlstmt.cpp b/win-odbc64/odbcclient/drvr35/sqlstmt.cpp
index 3123371..061ff31 100644
--- a/win-odbc64/odbcclient/drvr35/sqlstmt.cpp
+++ b/win-odbc64/odbcclient/drvr35/sqlstmt.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqlstmt.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqlstmt.h b/win-odbc64/odbcclient/drvr35/sqlstmt.h
index 83918ad..e7463a0 100644
--- a/win-odbc64/odbcclient/drvr35/sqlstmt.h
+++ b/win-odbc64/odbcclient/drvr35/sqlstmt.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqltocconv.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqltocconv.cpp b/win-odbc64/odbcclient/drvr35/sqltocconv.cpp
index 7ed0edc..c584fab 100644
--- a/win-odbc64/odbcclient/drvr35/sqltocconv.cpp
+++ b/win-odbc64/odbcclient/drvr35/sqltocconv.cpp
@@ -1,19 +1,22 @@
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-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.
-//
+//
+// 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 @@@
//
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqltocconv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqltocconv.h b/win-odbc64/odbcclient/drvr35/sqltocconv.h
index 42a1bdf..00d4eaf 100644
--- a/win-odbc64/odbcclient/drvr35/sqltocconv.h
+++ b/win-odbc64/odbcclient/drvr35/sqltocconv.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2015 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/sqltrace.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqltrace.h b/win-odbc64/odbcclient/drvr35/sqltrace.h
index e30284b..f267a1a 100644
--- a/win-odbc64/odbcclient/drvr35/sqltrace.h
+++ b/win-odbc64/odbcclient/drvr35/sqltrace.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp b/win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp
index 4f65bbe..d2accbd 100644
--- a/win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/drvr35adm.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.def b/win-odbc64/odbcclient/drvr35adm/drvr35adm.def
index 9476060..35d1a04 100644
--- a/win-odbc64/odbcclient/drvr35adm/drvr35adm.def
+++ b/win-odbc64/odbcclient/drvr35adm/drvr35adm.def
@@ -1,7 +1,22 @@
;// @@@ START COPYRIGHT @@@
-;//
-;// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
-;//
+;//
+;// Licensed to the Apache Software Foundation (ASF) under one
+;// or more contributor license agreements. See the NOTICE file
+;// distributed with this work for additional information
+;// regarding copyright ownership. The ASF licenses this file
+;// to you under the Apache License, Version 2.0 (the
+;// "License"); you may not use this file except in compliance
+;// with the License. You may obtain a copy of the License at
+;//
+;// 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 @@@
; Drvr35Adm.def : Declares the module parameters for the DLL.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/drvr35adm.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.h b/win-odbc64/odbcclient/drvr35adm/drvr35adm.h
index 7edd3eb..7b9480b 100644
--- a/win-odbc64/odbcclient/drvr35adm/drvr35adm.h
+++ b/win-odbc64/odbcclient/drvr35adm/drvr35adm.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp b/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp
index 75aa553..7c1ad32 100644
--- a/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h b/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h
index eb9bcfe..778081b 100644
--- a/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h
+++ b/win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h
@@ -2,19 +2,22 @@
*
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
**************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp b/win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp
index d20c7c2..f150565 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagegeneral.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagegeneral.h b/win-odbc64/odbcclient/drvr35adm/pagegeneral.h
index edf65c7..6fdba9a 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagegeneral.h
+++ b/win-odbc64/odbcclient/drvr35adm/pagegeneral.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp b/win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp
index 3da1011..be7c068 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// PageLocalTr.cpp : implementation file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagelocaltr.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagelocaltr.h b/win-odbc64/odbcclient/drvr35adm/pagelocaltr.h
index 15fa031..609e0e7 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagelocaltr.h
+++ b/win-odbc64/odbcclient/drvr35adm/pagelocaltr.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp b/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp
index 256a85f..b42a029 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp
@@ -1,20 +1,23 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2002-2014 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.
+//
// @@@ END COPYRIGHT @@@
********************************************************************/
// PageNetwork.cpp : implementation file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagenetwork.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagenetwork.h b/win-odbc64/odbcclient/drvr35adm/pagenetwork.h
index dff3d62..b94caef 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagenetwork.h
+++ b/win-odbc64/odbcclient/drvr35adm/pagenetwork.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pageoptions.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pageoptions.cpp b/win-odbc64/odbcclient/drvr35adm/pageoptions.cpp
index fe26400..164eb9a 100644
--- a/win-odbc64/odbcclient/drvr35adm/pageoptions.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/pageoptions.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pageoptions.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pageoptions.h b/win-odbc64/odbcclient/drvr35adm/pageoptions.h
index a066c48..3037272 100644
--- a/win-odbc64/odbcclient/drvr35adm/pageoptions.h
+++ b/win-odbc64/odbcclient/drvr35adm/pageoptions.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35adm/pagetesting.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagetesting.h b/win-odbc64/odbcclient/drvr35adm/pagetesting.h
index b8387da..975fdab 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagetesting.h
+++ b/win-odbc64/odbcclient/drvr35adm/pagetesting.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
[15/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
copyright changes in dcs and rest and removing HP references in asciidocs
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d3f73dbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d3f73dbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d3f73dbc
Branch: refs/heads/master
Commit: d3f73dbcb50ae74229f67da883be48733f99e5a2
Parents: 8f822e7
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Fri Sep 18 06:15:46 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Fri Sep 18 06:15:46 2015 +0000
----------------------------------------------------------------------
.../jdbc/t4/HPT4ConnectionPoolDataSource.java | 2 +-
.../src/org/trafodion/jdbc/t4/T4Driver.java | 2 +-
.../src/org/trafodion/jdbc/t4/T4Properties.java | 2 +-
core/rest/bin/rest | 40 +++++-----
core/rest/pom.xml | 37 +++++----
core/rest/src/main/asciidoc/index.adoc | 26 ++++---
.../java/org/trafodion/rest/ServerResource.java | 37 +++++----
.../trafodion/rest/TransactionsResource.java | 37 +++++----
.../org/trafodion/rest/VersionAnnotation.java | 59 ++++++---------
.../org/trafodion/rest/VersionResource.java | 37 +++++----
.../rest/provider/JAXBContextResolver.java | 37 +++++----
.../producer/PlainTextMessageBodyProducer.java | 37 +++++----
.../xslt/configuration_to_asciidoc_chapter.xsl | 67 ++++++++++-------
core/sqf/sqenvcom.sh | 2 +-
core/sql/bin/vprocmxlobsrvr.cpp | 4 +-
dcs/bin/dcs | 33 ++++----
dcs/bin/dcs-config.sh | 33 ++++----
dcs/bin/dcs-daemon.sh | 33 ++++----
dcs/bin/dcs-daemons.sh | 33 ++++----
dcs/bin/local-servers.sh | 33 ++++----
dcs/bin/scripts/dcsbind.sh | 33 ++++----
dcs/bin/scripts/sys_shell.py | 35 +++++----
dcs/conf/dcs-env.sh | 53 +++++--------
dcs/conf/dcs-site.xml | 63 ++++++----------
dcs/pom.xml | 10 +--
dcs/src/assembly/all.xml | 21 +-----
dcs/src/main/asciidoc/dcs.css | 33 ++++----
dcs/src/main/asciidoc/index.adoc | 61 ++++++++-------
.../dcs/tmpl/master/MasterStatusTmpl.jamon | 50 +++++--------
.../dcs/tmpl/server/ServerStatusTmpl.jamon | 51 +++++--------
.../dcs/tmpl/servermt/ServerStatusTmpl.jamon | 51 +++++--------
.../org/trafodion/dcs/VersionAnnotation.java | 22 +++++-
.../org/trafodion/dcs/http/FilterContainer.java | 33 ++++----
.../org/trafodion/dcs/http/HtmlQuoting.java | 33 ++++----
.../java/org/trafodion/dcs/http/HttpServer.java | 33 ++++----
.../org/trafodion/dcs/master/DcsMaster.java | 33 ++++----
.../org/trafodion/dcs/master/FloatingIp.java | 33 ++++----
.../dcs/master/MasterLeaderElection.java | 33 ++++----
.../dcs/master/MasterStatusServlet.java | 33 ++++----
.../java/org/trafodion/dcs/master/Metrics.java | 33 ++++----
.../trafodion/dcs/master/RegisteredServer.java | 33 ++++----
.../org/trafodion/dcs/master/RunningServer.java | 33 ++++----
.../org/trafodion/dcs/master/ServerItem.java | 33 ++++----
.../org/trafodion/dcs/master/ServerManager.java | 33 ++++----
.../dcs/master/listener/ClientData.java | 33 ++++----
.../dcs/master/listener/ConnectReply.java | 33 ++++----
.../dcs/master/listener/ConnectionContext.java | 33 ++++----
.../dcs/master/listener/DataEvent.java | 33 ++++----
.../dcs/master/listener/GetObjRefException.java | 33 ++++----
.../trafodion/dcs/master/listener/Header.java | 33 ++++----
.../dcs/master/listener/ListenerConstants.java | 33 ++++----
.../dcs/master/listener/ListenerMetrics.java | 33 ++++----
.../dcs/master/listener/ListenerService.java | 33 ++++----
.../dcs/master/listener/ListenerWorker.java | 33 ++++----
.../dcs/master/listener/PendingRequest.java | 33 ++++----
.../dcs/master/listener/RequestCancelQuery.java | 33 ++++----
.../master/listener/RequestGetObjectRef.java | 33 ++++----
.../dcs/master/listener/RequestUnknown.java | 33 ++++----
.../trafodion/dcs/master/listener/UserDesc.java | 33 ++++----
.../org/trafodion/dcs/master/listener/Util.java | 33 ++++----
.../trafodion/dcs/master/listener/Version.java | 33 ++++----
.../dcs/master/listener/VersionList.java | 33 ++++----
.../java/org/trafodion/dcs/rest/DcsRest.java | 33 ++++----
.../trafodion/dcs/rest/GetStatusResponse.java | 54 ++++++-------
.../org/trafodion/dcs/rest/RESTServlet.java | 33 ++++----
.../org/trafodion/dcs/rest/ResourceBase.java | 54 ++++++-------
.../org/trafodion/dcs/rest/ResourceConfig.java | 54 ++++++-------
.../org/trafodion/dcs/rest/RestConstants.java | 33 ++++----
.../org/trafodion/dcs/rest/RootResource.java | 54 ++++++-------
.../org/trafodion/dcs/rest/ServerConnector.java | 33 ++++----
.../org/trafodion/dcs/rest/ServerResource.java | 22 +++++-
.../org/trafodion/dcs/rest/VersionResource.java | 25 +++++--
.../trafodion/dcs/rest/WorkloadResource.java | 22 +++++-
.../trafodion/dcs/rest/model/VersionModel.java | 33 ++++----
.../dcs/rest/model/WorkloadListModel.java | 21 +++++-
.../trafodion/dcs/rest/model/WorkloadModel.java | 21 +++++-
.../dcs/rest/provider/JAXBContextResolver.java | 24 +++++-
.../producer/PlainTextMessageBodyProducer.java | 24 +++++-
.../org/trafodion/dcs/script/ScriptManager.java | 33 ++++----
.../dcs/script/ScriptManagerWatcher.java | 33 ++++----
.../org/trafodion/dcs/server/DcsServer.java | 33 ++++----
.../java/org/trafodion/dcs/server/Metrics.java | 33 ++++----
.../dcs/server/ServerStatusServlet.java | 33 ++++----
.../org/trafodion/dcs/version/util/VerGen.java | 33 ++++----
.../trafodion/dcs/zookeeper/DcsQuorumPeer.java | 33 ++++----
.../org/trafodion/dcs/zookeeper/ZKConfig.java | 33 ++++----
.../trafodion/dcs/zookeeper/ZKServerTool.java | 33 ++++----
.../org/trafodion/dcs/zookeeper/ZkClient.java | 33 ++++----
.../org/trafodion/dcs/zookeeper/ZkUtil.java | 33 ++++----
.../dcs/zookeeper/ZooKeeperMainServerArg.java | 33 ++++----
dcs/src/main/resources/dcs-default.xml | 56 ++++++--------
dcs/src/saveVersion.sh | 49 +++++-------
.../trafodion/dcs/IntegrationTestEndurance.java | 33 ++++----
.../org/trafodion/dcs/IntegrationTests.java | 33 ++++----
.../test/java/org/trafodion/dcs/LargeTests.java | 33 ++++----
.../java/org/trafodion/dcs/MediumTests.java | 33 ++++----
.../org/trafodion/dcs/ReposPublicationTest.java | 33 ++++----
.../org/trafodion/dcs/ReposTableAccessTest.java | 33 ++++----
.../java/org/trafodion/dcs/ResourceChecker.java | 33 ++++----
.../trafodion/dcs/ResourceCheckerJUnitRule.java | 33 ++++----
.../test/java/org/trafodion/dcs/SmallTests.java | 33 ++++----
dcs/src/test/jdbc_test/README.rst | 38 +++++-----
dcs/src/test/jdbc_test/jdbc_test.py | 39 +++++-----
dcs/src/test/jdbc_test/pom.xml.template | 4 -
.../java/org/trafodion/jdbc_test/PropTest.java | 53 ++++++++-----
.../java/org/trafodion/jdbc_test/TestBasic.java | 77 +++++++++++++------
.../java/org/trafodion/jdbc_test/TestBatch.java | 77 +++++++++++++------
.../org/trafodion/jdbc_test/TestBigCol.java | 79 ++++++++++++++------
.../trafodion/jdbc_test/TestBigColumnSize.java | 53 ++++++++-----
.../java/org/trafodion/jdbc_test/TestCat.java | 53 ++++++++-----
.../java/org/trafodion/jdbc_test/TestMisc.java | 53 ++++++++-----
.../java/org/trafodion/jdbc_test/TestTrx.java | 77 +++++++++++++------
.../java/org/trafodion/jdbc_test/Utils.java | 53 ++++++++-----
dcs/src/test/pytests/test-requirements.txt | 2 +-
dcs/src/test/pytests/test_p2.py | 35 +++++----
dcs/src/test/resources/dcs-default.xml | 35 +++++----
tests/phx/pom.xml.template | 4 -
win-odbc64/Common/Compression.cpp | 27 ++++---
win-odbc64/Common/Compression.h | 33 ++++----
win-odbc64/Common/DrvrSrvr.h | 25 ++++---
win-odbc64/Common/ExpConvMxcs.cpp | 25 ++++---
win-odbc64/Common/NLSFunctions.cpp | 25 ++++---
win-odbc64/Common/NLSFunctions.h | 25 ++++---
win-odbc64/Common/OdbcMsg.cpp | 25 ++++---
win-odbc64/Common/OdbcMsg.h | 25 ++++---
win-odbc64/Common/RegValues.h | 25 ++++---
win-odbc64/Common/TCPIPSystemDrvr.cpp | 33 ++++----
win-odbc64/Common/TCPIPSystemDrvr.h | 25 ++++---
win-odbc64/Common/TransportBase.cpp | 25 ++++---
win-odbc64/Common/TransportBase.h | 25 ++++---
win-odbc64/Common/inoutparams.h | 25 ++++---
win-odbc64/Common/iputils.h | 25 ++++---
win-odbc64/Common/marshaling.cpp | 25 ++++---
win-odbc64/Common/marshaling.h | 25 ++++---
win-odbc64/Common/marshalingdrvr_drvr.cpp | 25 ++++---
win-odbc64/Common/marshalingdrvr_drvr.h | 25 ++++---
win-odbc64/Common/nskieee.cpp | 25 ++++---
win-odbc64/Common/nskieee.h | 25 ++++---
win-odbc64/Common/odbcMxSecurity.h | 25 ++++---
win-odbc64/Common/ping.cpp | 25 ++++---
win-odbc64/Common/ping.h | 25 ++++---
win-odbc64/Common/swap.cpp | 25 ++++---
win-odbc64/Common/swap.h | 25 ++++---
.../SetCertificateDirReg/SetCertDirDlg.cpp | 25 ++++---
.../SetCertificateDirReg/SetCertDirDlg.h | 25 ++++---
.../SetCertificateDirReg.cpp | 25 ++++---
.../SetCertificateDirReg/SetCertificateDirReg.h | 25 ++++---
.../SetCertificateDirReg/resource.h | 25 ++++---
.../SetCertificateDirReg/stdafx.cpp | 25 ++++---
.../SetCertificateDirReg/stdafx.h | 25 ++++---
.../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp | 25 ++++---
.../Install/UpdateDSN/UpdateDSN/stdafx.cpp | 25 ++++---
win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h | 25 ++++---
win-odbc64/odbcclient/DSNConverter/DSList.cpp | 25 ++++---
win-odbc64/odbcclient/DSNConverter/DSList.h | 25 ++++---
.../odbcclient/DSNConverter/DSNConverter.cpp | 25 ++++---
.../odbcclient/DSNConverter/DSNConverter.def | 33 ++++----
.../odbcclient/DSNConverter/DSNConverter.h | 25 ++++---
.../odbcclient/DSNConverter/ODBCMXAttribs.h | 25 ++++---
win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp | 25 ++++---
win-odbc64/odbcclient/DSNConverter/OdbcDS.h | 25 ++++---
win-odbc64/odbcclient/DSNConverter/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/DSNConverter/StdAfx.h | 25 ++++---
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp | 25 ++++---
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def | 33 ++++----
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h | 25 ++++---
win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/Drvr35Res/StdAfx.h | 25 ++++---
win-odbc64/odbcclient/README.txt | 33 ++++----
win-odbc64/odbcclient/TranslationDll/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/TranslationDll/StdAfx.h | 25 ++++---
.../TranslationDll/TranslationDll.cpp | 25 ++++---
.../TranslationDll/TranslationDll.def | 33 ++++----
.../odbcclient/TranslationDll/TranslationDll.h | 25 ++++---
win-odbc64/odbcclient/build_os.bat | 33 ++++----
.../odbcclient/drvr35/Interface/Transport.cpp | 25 ++++---
.../odbcclient/drvr35/Interface/Transport.h | 25 ++++---
.../odbcclient/drvr35/Interface/odbcas_drvr.cpp | 25 ++++---
.../odbcclient/drvr35/Interface/odbcas_drvr.h | 25 ++++---
.../odbcclient/drvr35/Interface/odbcs_drvr.cpp | 25 ++++---
.../odbcclient/drvr35/Interface/odbcs_drvr.h | 25 ++++---
win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h | 25 ++++---
.../odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp | 25 ++++---
.../odbcclient/drvr35/TCPIPV4/TCPIPV4.def | 21 +++++-
win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h | 25 ++++---
win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h | 25 ++++---
.../odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp | 25 ++++---
.../odbcclient/drvr35/TCPIPV6/TCPIPV6.def | 21 +++++-
win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cconnect.cpp | 33 ++++----
win-odbc64/odbcclient/drvr35/cconnect.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cdatasource.cpp | 33 ++++----
win-odbc64/odbcclient/drvr35/cdatasource.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cdesc.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/cdesc.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cdiag.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/cdiag.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cenv.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/cenv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/chandle.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/chandle.h | 25 ++++---
win-odbc64/odbcclient/drvr35/charsetconv.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/charsetconv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/cstmt.h | 25 ++++---
win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/ctosqlconv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/diagfunctions.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/diagfunctions.h | 25 ++++---
win-odbc64/odbcclient/drvr35/drvr35.def | 21 +++++-
win-odbc64/odbcclient/drvr35/drvrglobal.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/drvrglobal.h | 25 ++++---
win-odbc64/odbcclient/drvr35/drvrnet.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/drvrnet.h | 25 ++++---
win-odbc64/odbcclient/drvr35/netcommon.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/netconnect.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/netstmt.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlconnect.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlconnect.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqldesc.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqldesc.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlenv.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlenv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlexportfunc.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlhandle.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlhandle.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlstmt.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35/sqlstmt.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 33 ++++----
win-odbc64/odbcclient/drvr35/sqltocconv.h | 25 ++++---
win-odbc64/odbcclient/drvr35/sqltrace.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/drvr35adm.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/drvr35adm.def | 21 +++++-
win-odbc64/odbcclient/drvr35adm/drvr35adm.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/odbcsvcdlg.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagegeneral.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagegeneral.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagelocaltr.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagelocaltr.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp | 33 ++++----
win-odbc64/odbcclient/drvr35adm/pagenetwork.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pageoptions.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pageoptions.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagetesting.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagetracing.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/pagetracing.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/propsheet.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/propsheet.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/stdafx.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/stdafx.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagegeneral.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpagegeneral.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagelocaltr.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpagelocaltr.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagenetwork.cpp | 33 ++++----
.../odbcclient/drvr35adm/tabpagenetwork.h | 25 ++++---
.../odbcclient/drvr35adm/tabpageoptions.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpageoptions.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagetesting.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpagetesting.h | 25 ++++---
.../odbcclient/drvr35adm/tabpagetracing.cpp | 25 ++++---
.../odbcclient/drvr35adm/tabpagetracing.h | 25 ++++---
win-odbc64/odbcclient/drvr35adm/testdialog.cpp | 25 ++++---
win-odbc64/odbcclient/drvr35adm/testdialog.h | 25 ++++---
win-odbc64/odbcclient/inc/trafsqlext.h | 25 ++++---
win-odbc64/odbcclient/pkg.bat | 33 ++++----
.../security_dll/native/common/clientErrCode.h | 25 ++++---
.../security_dll/native/common/secdefsCommon.h | 25 ++++---
win-odbc64/security_dll/native/common/timeval.h | 25 ++++---
win-odbc64/security_dll/native/common/utils.h | 25 ++++---
win-odbc64/security_dll/native/header/Cipher.h | 25 ++++---
win-odbc64/security_dll/native/header/Key.h | 25 ++++---
.../security_dll/native/header/MessageDigest.h | 25 ++++---
.../security_dll/native/header/StaticLocking.h | 25 ++++---
win-odbc64/security_dll/native/header/secpwd.h | 25 ++++---
.../security_dll/native/header/security.h | 25 ++++---
.../native/header/securityException.h | 25 ++++---
.../security_dll/native/source/Cipher.cpp | 25 ++++---
win-odbc64/security_dll/native/source/Key.cpp | 25 ++++---
.../native/source/MessageDigest.cpp | 25 ++++---
.../security_dll/native/source/Security.cpp | 25 ++++---
.../native/source/StaticLocking.cpp | 25 ++++---
.../native/source/securityException.cpp | 25 ++++---
win-odbc64/security_dll/native/source/utils.cpp | 25 ++++---
.../security_dll/native/source/version.cpp | 25 ++++---
win-odbc64/sql/cli/sqlcli.h | 25 ++++---
win-odbc64/sql/common/Platform.h | 25 ++++---
win-odbc64/sql/common/UCS_jp_data.c | 25 ++++---
win-odbc64/sql/common/UCS_ko_data.c | 25 ++++---
win-odbc64/sql/common/UCS_zb_data.c | 25 ++++---
win-odbc64/sql/common/UCS_zs_data.c | 25 ++++---
win-odbc64/sql/common/csconvert.cpp | 25 ++++---
win-odbc64/sql/common/csconvert.h | 25 ++++---
win-odbc64/sql/common/fcconv.h | 25 ++++---
win-odbc64/sql/common/from_GB18030.c | 25 ++++---
win-odbc64/sql/common/from_GB2312.c | 25 ++++---
win-odbc64/sql/common/from_GBK.c | 25 ++++---
win-odbc64/sql/common/gb18030_data.c | 25 ++++---
win-odbc64/sql/common/iconv_gen.c | 25 ++++---
win-odbc64/sql/common/mb_iconv.c | 25 ++++---
win-odbc64/sql/common/mb_lconv.c | 25 ++++---
win-odbc64/sql/common/multi-byte.h | 33 ++++----
wms/bin/local-servers.sh | 33 ++++----
wms/bin/scripts/sys_shell.py | 33 ++++----
wms/bin/servers.sh | 33 ++++----
wms/bin/start-wms.sh | 50 +++++--------
wms/bin/stop-wms.sh | 50 +++++--------
wms/bin/wms | 49 +++++-------
wms/bin/wms-config.sh | 50 +++++--------
wms/bin/wms-daemon.sh | 50 +++++--------
wms/bin/wms-daemons.sh | 50 +++++--------
wms/bin/zookeepers.sh | 50 +++++--------
wms/conf/wms-env.sh | 50 +++++--------
wms/conf/wms-site.xml | 50 +++++--------
wms/pom.xml | 17 -----
wms/src/assembly/all.xml | 53 ++++++-------
.../wms/tmpl/master/MasterStatusTmpl.jamon | 18 +----
.../wms/tmpl/server/ServerStatusTmpl.jamon | 18 +----
.../main/java/org/trafodion/wms/Constants.java | 52 +++++--------
.../org/trafodion/wms/http/FilterContainer.java | 51 ++++++-------
.../org/trafodion/wms/http/HtmlQuoting.java | 51 ++++++-------
.../java/org/trafodion/wms/http/HttpServer.java | 53 ++++++-------
.../wms/master/MasterStatusServlet.java | 53 ++++++-------
.../java/org/trafodion/wms/master/Metrics.java | 33 ++++----
.../org/trafodion/wms/master/ServerManager.java | 33 ++++----
.../org/trafodion/wms/master/WmsMaster.java | 33 ++++----
.../org/trafodion/wms/script/ScriptContext.java | 33 ++++----
.../org/trafodion/wms/script/ScriptManager.java | 33 ++++----
.../wms/script/ScriptManagerWatcher.java | 33 ++++----
.../java/org/trafodion/wms/server/Metrics.java | 33 ++++----
.../wms/server/ServerStatusServlet.java | 33 ++++----
.../java/org/trafodion/wms/util/InfoServer.java | 53 ++++++-------
.../org/trafodion/wms/util/VersionInfo.java | 53 ++++++-------
.../trafodion/wms/util/WmsConfiguration.java | 53 ++++++-------
.../org/trafodion/wms/version/util/VerGen.java | 53 ++++++-------
.../trafodion/wms/zookeeper/WmsQuorumPeer.java | 33 ++++----
.../org/trafodion/wms/zookeeper/ZKConfig.java | 53 ++++++-------
.../trafodion/wms/zookeeper/ZKServerTool.java | 53 ++++++-------
.../org/trafodion/wms/zookeeper/ZkClient.java | 53 ++++++-------
.../wms/zookeeper/ZooKeeperMainServerArg.java | 53 ++++++-------
wms/src/main/resources/wms-default.xml | 54 ++++++-------
.../resources/wms-webapps/master/index.html | 48 +++++-------
.../resources/wms-webapps/master/master.jsp | 48 +++++-------
.../resources/wms-webapps/server/index.html | 48 +++++-------
.../resources/wms-webapps/server/server.jsp | 48 +++++-------
.../main/resources/wms-webapps/static/wms.css | 48 +++++-------
348 files changed, 5956 insertions(+), 4880 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSource.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSource.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSource.java
index 81649dd..39e39dd 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSource.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSource.java
@@ -62,7 +62,7 @@ import javax.sql.PooledConnection;
* are done at the higher level objects such as DataSource or DriverManager.
*
* <p>
- * Copyright: (C) Copyright 2004-2007 Hewlett-Packard Development Company, L.P.
+ * Licensed to the Apache Software Foundation (ASF)
* </p>
*
* @see T4Properties
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Driver.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Driver.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Driver.java
index 6f4248b..a1724aa 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Driver.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Driver.java
@@ -46,7 +46,7 @@ import java.util.logging.Logger;
* the Java program.
* </p>
* <p>
- * Copyright: (C) Copyright 2004-2007 Hewlett-Packard Development Company, L.P.
+ * Licensed to the Apache Software Foundation (ASF)
* </p>
*
* @see java.sql.DriverManager
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Properties.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Properties.java b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Properties.java
index 56f0989..49100b4 100644
--- a/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Properties.java
+++ b/core/conn/jdbc_type4/src/org/trafodion/jdbc/t4/T4Properties.java
@@ -73,7 +73,7 @@ import javax.naming.StringRefAddr;
* </p>
* </blockquote>
* <p>
- * Copyright: (C) Copyright 2004-2007 Hewlett-Packard Development Company, L.P.
+ * Licensed to the Apache Software Foundation (ASF)
* </p>
*/
public class T4Properties {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/bin/rest
----------------------------------------------------------------------
diff --git a/core/rest/bin/rest b/core/rest/bin/rest
index 15a5dde..03bba55 100755
--- a/core/rest/bin/rest
+++ b/core/rest/bin/rest
@@ -1,25 +1,25 @@
#! /usr/bin/env bash
#/**
-* @@@ START COPYRIGHT @@@
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-* @@@ END COPYRIGHT @@@
+#* @@@ 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 @@@
# */
#
# The rest command script.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index 9386826..14b3243 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -1,22 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<!--
-/**
- *(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 @@@
-->
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/src/main/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/index.adoc b/core/rest/src/main/asciidoc/index.adoc
index 0181740..166cbc4 100644
--- a/core/rest/src/main/asciidoc/index.adoc
+++ b/core/rest/src/main/asciidoc/index.adoc
@@ -41,19 +41,23 @@
// processing of files found in directories starting with an _. This
// prevents each chapter being built as its own book.
-Copyright (C) 2015 Hewlett-Packard Development Company, L.P.
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
-The information contained herein is subject to change without notice.
-This documentation is distributed on an “AS IS” basis, without warranties or conditions of any kind, either express or implied.
-Nothing herein should be construed as constituting an additional warranty.
-HP shall not be liable for technical or editorial errors or omissions contained herein.
+ 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.
-NOTICE REGARDING OPEN SOURCE SOFTWARE: Project Trafodion is licensed under the Apache License, Version 2.0 (the "License");
-you may not use software from Project Trafodion except in compliance with the License.
-You may obtain a copy of the License at link:http://www.apache.org/licenses/LICENSE-2.0[http://www.apache.org/licenses/LICENSE-2.0].
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
[cols="2"]
|===
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/ServerResource.java b/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
index 5ed8222..40ab9e1 100644
--- a/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/ServerResource.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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java b/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
index f11f61e..4e6f6c5 100644
--- a/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java b/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java
index 81d9b3a..ffa8b5e 100644
--- a/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java
+++ b/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java
@@ -1,45 +1,30 @@
-/*
- *(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.rest;
import java.lang.annotation.*;
-/**
-* @@@ 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 @@@
- */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.PACKAGE)
public @interface VersionAnnotation {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/VersionResource.java b/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
index 52b90b0..63501f5 100644
--- a/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/VersionResource.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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java b/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
index 70d1696..5f1d27d 100644
--- a/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.java
+++ b/core/rest/src/main/java/org/trafodion/rest/provider/JAXBContextResolver.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.rest.provider;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java b/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
index 8bb6abe..1646ddd 100644
--- a/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.java
+++ b/core/rest/src/main/java/org/trafodion/rest/provider/producer/PlainTextMessageBodyProducer.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.rest.provider.producer;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/rest/src/main/xslt/configuration_to_asciidoc_chapter.xsl
----------------------------------------------------------------------
diff --git a/core/rest/src/main/xslt/configuration_to_asciidoc_chapter.xsl b/core/rest/src/main/xslt/configuration_to_asciidoc_chapter.xsl
index 91dd2b7..79a080d 100644
--- a/core/rest/src/main/xslt/configuration_to_asciidoc_chapter.xsl
+++ b/core/rest/src/main/xslt/configuration_to_asciidoc_chapter.xsl
@@ -2,20 +2,27 @@
<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 rest-default.adoc.
@@ -35,21 +42,23 @@ This stylesheet is used making an html version of rest-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.
- */
+
+* 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.
////
:doctype: book
:numbered:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 1d817a6..25c6ddd 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -30,7 +30,7 @@
##############################################################
#Product version (Trafodion, Enterprise or Enterprise Adv)
-export TRAFODION_VER_PROD="Apache Trafodion "
+export TRAFODION_VER_PROD="Apache Trafodion"
# Trafodion version (also update file ../sql/common/copyright.h)
export TRAFODION_VER_MAJOR=1
export TRAFODION_VER_MINOR=2
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/core/sql/bin/vprocmxlobsrvr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/vprocmxlobsrvr.cpp b/core/sql/bin/vprocmxlobsrvr.cpp
index 66d6934..62e1ef1 100644
--- a/core/sql/bin/vprocmxlobsrvr.cpp
+++ b/core/sql/bin/vprocmxlobsrvr.cpp
@@ -37,10 +37,10 @@
#include "vproc.h"
#include <stdio.h>
-extern "C" { void
+/*extern "C" { void
VPROC (PRODNUMMXCI,DATE1MXCI,MXCI_CC_LABEL)
() {} }
-
+*/
#include "SCMVersHelp.h"
#define VERS_CV_MAJ 1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/bin/dcs
----------------------------------------------------------------------
diff --git a/dcs/bin/dcs b/dcs/bin/dcs
index ec01152..5c506fe 100755
--- a/dcs/bin/dcs
+++ b/dcs/bin/dcs
@@ -1,18 +1,25 @@
#! /usr/bin/env bash
#/**
-# *(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 @@@
# */
#/**
# * Copyright 2007 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/bin/dcs-config.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/dcs-config.sh b/dcs/bin/dcs-config.sh
index e1c3c10..de1b860 100755
--- a/dcs/bin/dcs-config.sh
+++ b/dcs/bin/dcs-config.sh
@@ -1,17 +1,24 @@
#/**
-# *(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.
+## @@@ 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 @@@
# */
#
#/**
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/bin/dcs-daemon.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/dcs-daemon.sh b/dcs/bin/dcs-daemon.sh
index af87b8a..1078a07 100755
--- a/dcs/bin/dcs-daemon.sh
+++ b/dcs/bin/dcs-daemon.sh
@@ -1,18 +1,25 @@
#!/usr/bin/env bash
#/**
-# *(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.
+# @@@ 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 @@@
# */
#
#/**
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/bin/dcs-daemons.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/dcs-daemons.sh b/dcs/bin/dcs-daemons.sh
index 8392625..09fc671 100755
--- a/dcs/bin/dcs-daemons.sh
+++ b/dcs/bin/dcs-daemons.sh
@@ -1,18 +1,25 @@
#!/usr/bin/env bash
#/**
-# *(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.
+# @@@ 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 @@@
# */
#
#/**
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/bin/local-servers.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/local-servers.sh b/dcs/bin/local-servers.sh
index d1190ea..f508b98 100755
--- a/dcs/bin/local-servers.sh
+++ b/dcs/bin/local-servers.sh
@@ -1,18 +1,25 @@
#!/bin/sh
#/**
-# *(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.
+# @@@ 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 is used for starting multiple servers on the same machine.
# run it from 'bin/dcs'
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/bin/scripts/dcsbind.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/scripts/dcsbind.sh b/dcs/bin/scripts/dcsbind.sh
index c166f5d..87da0dd 100755
--- a/dcs/bin/scripts/dcsbind.sh
+++ b/dcs/bin/scripts/dcsbind.sh
@@ -1,18 +1,25 @@
#!/bin/bash
#/**
-# *(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 @@@
# */
#
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/bin/scripts/sys_shell.py
----------------------------------------------------------------------
diff --git a/dcs/bin/scripts/sys_shell.py b/dcs/bin/scripts/sys_shell.py
index e697e50..096a1bc 100755
--- a/dcs/bin/scripts/sys_shell.py
+++ b/dcs/bin/scripts/sys_shell.py
@@ -1,17 +1,24 @@
#/**
-# *(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 @@@
# */
#
@@ -62,4 +69,4 @@ if isDebug() == True :
start()
if isDebug() == True :
- log ('End script[' + scriptcontext.getScriptName() + ']')
\ No newline at end of file
+ log ('End script[' + scriptcontext.getScriptName() + ']')
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/conf/dcs-env.sh
----------------------------------------------------------------------
diff --git a/dcs/conf/dcs-env.sh b/dcs/conf/dcs-env.sh
index 50b24a3..0851940 100644
--- a/dcs/conf/dcs-env.sh
+++ b/dcs/conf/dcs-env.sh
@@ -1,37 +1,24 @@
#/**
-# *(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 @@@
# */
# Set environment variables here.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/conf/dcs-site.xml
----------------------------------------------------------------------
diff --git a/dcs/conf/dcs-site.xml b/dcs/conf/dcs-site.xml
index 7c4afa3..b5e7782 100644
--- a/dcs/conf/dcs-site.xml
+++ b/dcs/conf/dcs-site.xml
@@ -1,42 +1,27 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- *(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 @@@ -->
+
<configuration>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index 6452e99..7b2f6b3 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<!--
* @@@ START COPYRIGHT @@@
*
@@ -18,12 +22,8 @@
* specific language governing permissions and limitations
* under the License.
*
-* @@@ END COPYRIGHT @@@
+* @@@ END COPYRIGHT @@@
-->
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<!--To build a release I do this:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/dcs/src/assembly/all.xml b/dcs/src/assembly/all.xml
index 196678f..57c9555 100644
--- a/dcs/src/assembly/all.xml
+++ b/dcs/src/assembly/all.xml
@@ -2,25 +2,10 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-<!--
-/**
- *(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.
- */
--->
+
<!--
/**
+ * @@@ 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
@@ -36,7 +21,9 @@
* WITHOUT 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 'all' id is not appended to the produced bundle because we do this:
http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/asciidoc/dcs.css
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/dcs.css b/dcs/src/main/asciidoc/dcs.css
index 32543ab..e597a9b 100644
--- a/dcs/src/main/asciidoc/dcs.css
+++ b/dcs/src/main/asciidoc/dcs.css
@@ -1,17 +1,24 @@
/**
- *(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 @@@
*/
/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
/* Remove the comments around the @import statement below when using this as a custom stylesheet */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/index.adoc b/dcs/src/main/asciidoc/index.adoc
index 7fa7b5c..5cf6a9e 100644
--- a/dcs/src/main/asciidoc/index.adoc
+++ b/dcs/src/main/asciidoc/index.adoc
@@ -1,19 +1,24 @@
////
-/**
- *(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 @@@
////
= Trafodion Database Connectivity Services Reference Guide
@@ -34,19 +39,23 @@
// processing of files found in directories starting with an _. This
// prevents each chapter being built as its own book.
-Copyright (C) 2014-2015 Hewlett-Packard Development Company, L.P.
-The information contained herein is subject to change without notice.
-This documentation is distributed on an “AS IS” basis, without warranties or conditions of any kind, either express or implied.
-Nothing herein should be construed as constituting an additional warranty.
-HP shall not be liable for technical or editorial errors or omissions contained herein.
+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
-NOTICE REGARDING OPEN SOURCE SOFTWARE: Project Trafodion is licensed under the Apache License, Version 2.0 (the "License");
-you may not use software from Project Trafodion except in compliance with the License.
-You may obtain a copy of the License at link:http://www.apache.org/licenses/LICENSE-2.0[http://www.apache.org/licenses/LICENSE-2.0].
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
+ 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.
[cols="2"]
|===
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/jamon/org/trafodion/dcs/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/master/MasterStatusTmpl.jamon b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/master/MasterStatusTmpl.jamon
index 0685a68..e287f71 100644
--- a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/master/MasterStatusTmpl.jamon
+++ b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/master/MasterStatusTmpl.jamon
@@ -1,35 +1,23 @@
<%doc>
-(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 2011 The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+* @@@ 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 @@@
</%doc>
<%args>
DcsMaster master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon
index 9da2705..fe24e73 100644
--- a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon
+++ b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon
@@ -1,35 +1,24 @@
<%doc>
-(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 2011 The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+* @@@ 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 @@@
</%doc>
<%args>
DcsServer server;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon
index 89cf791..3dfd113 100644
--- a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon
+++ b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon
@@ -1,35 +1,24 @@
<%doc>
-(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 2011 The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+* @@@ 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 @@@
</%doc>
<%args>
DcsServer server;
[17/18] incubator-trafodion git commit: Changes from revew comments.
Posted by rm...@apache.org.
Changes from revew comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/10ad97a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/10ad97a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/10ad97a7
Branch: refs/heads/master
Commit: 10ad97a70acc003c2fa3b9de63f3a81ca9ed6118
Parents: a3390a7
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Fri Sep 18 21:25:27 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Fri Sep 18 21:25:27 2015 +0000
----------------------------------------------------------------------
core/dbsecurity/scripts/sqcertgen | 7 ++++---
.../trafodion/rest/TransactionsResource.java | 21 --------------------
core/sqf/sqenvcom.sh | 2 +-
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C | 1 -
4 files changed, 5 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10ad97a7/core/dbsecurity/scripts/sqcertgen
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/sqcertgen b/core/dbsecurity/scripts/sqcertgen
index 6b772f9..68012b5 100755
--- a/core/dbsecurity/scripts/sqcertgen
+++ b/core/dbsecurity/scripts/sqcertgen
@@ -104,11 +104,11 @@ countryName_default = US
countryName_min = 2
countryName_max = 2
stateOrProvinceName = State or Province Name (full name)
-stateOrProvinceName_default = California
+stateOrProvinceName_default = My State
localityName = Locality Name (eg, city)
-localityName_default = Cupertino
+localityName_default = My Location
0.organizationName = Organization Name (eg, company)
-0.organizationName_default = Esgyn Corporation
+0.organizationName_default = My Company
organizationalUnitName = Organizational Unit Name (eg, section)
commonName = Common Name (eg, your name or your server's hostname)
commonName_default = $HNAME
@@ -144,6 +144,7 @@ generate_csr()
openssl req -new -nodes -keyout $1 -out $2 -config ca_config.cnf -batch
}
+
if [ $# -lt 1 ]
then
options=ss
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10ad97a7/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java b/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
index 4e6f6c5..a709ce9 100644
--- a/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
@@ -68,28 +68,7 @@ public class TransactionsResource extends ResourceBase {
cacheControl.setNoTransform(false);
}
- /**
-* @@@ 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 @@@
- */
public TransactionsResource() throws IOException {
super();
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10ad97a7/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 6c6f86a..df7eb52 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -29,7 +29,7 @@
# * Add an entry in sqf/LocalSettingsTemplate.sh to make path configurable.
##############################################################
-#Product version (Trafodion, Enterprise or Enterprise Adv)
+#Product version (Trafodion or derivative product)
export TRAFODION_VER_PROD="Apache Trafodion"
# Trafodion version (also update file ../sql/common/copyright.h)
export TRAFODION_VER_MAJOR=1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10ad97a7/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
----------------------------------------------------------------------
diff --git a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
index db780cd..b11662d 100644
--- a/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
+++ b/core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C
@@ -18,7 +18,6 @@
-- under the License.
--
-- @@@ END COPYRIGHT @@@
--- @@@ START COPYRIGHT @@@
--
>>-- Run Tests
>> set schema cat.tpcd;
[07/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/script/ScriptManager.java b/wms/src/main/java/org/trafodion/wms/script/ScriptManager.java
index fcdf02f..cc3254d 100644
--- a/wms/src/main/java/org/trafodion/wms/script/ScriptManager.java
+++ b/wms/src/main/java/org/trafodion/wms/script/ScriptManager.java
@@ -1,17 +1,24 @@
/**
- *(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.wms.script;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java b/wms/src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java
index b12e5b3..ef8bf25 100644
--- a/wms/src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java
+++ b/wms/src/main/java/org/trafodion/wms/script/ScriptManagerWatcher.java
@@ -1,17 +1,24 @@
/**
- *(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.wms.script;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/server/Metrics.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/server/Metrics.java b/wms/src/main/java/org/trafodion/wms/server/Metrics.java
index dce808a..f978f47 100644
--- a/wms/src/main/java/org/trafodion/wms/server/Metrics.java
+++ b/wms/src/main/java/org/trafodion/wms/server/Metrics.java
@@ -1,17 +1,24 @@
/**
- *(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.wms.server;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/server/ServerStatusServlet.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/server/ServerStatusServlet.java b/wms/src/main/java/org/trafodion/wms/server/ServerStatusServlet.java
index d0620fd..ab78b93 100644
--- a/wms/src/main/java/org/trafodion/wms/server/ServerStatusServlet.java
+++ b/wms/src/main/java/org/trafodion/wms/server/ServerStatusServlet.java
@@ -1,17 +1,24 @@
/**
- *(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.wms.server;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/util/InfoServer.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/util/InfoServer.java b/wms/src/main/java/org/trafodion/wms/util/InfoServer.java
index ba24f55..e2443f5 100644
--- a/wms/src/main/java/org/trafodion/wms/util/InfoServer.java
+++ b/wms/src/main/java/org/trafodion/wms/util/InfoServer.java
@@ -1,37 +1,26 @@
/**
- *(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.
- */
-/**
- * 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.wms.util;
import java.io.FileNotFoundException;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/util/VersionInfo.java b/wms/src/main/java/org/trafodion/wms/util/VersionInfo.java
index 5e4ab98..8f9a8b6 100644
--- a/wms/src/main/java/org/trafodion/wms/util/VersionInfo.java
+++ b/wms/src/main/java/org/trafodion/wms/util/VersionInfo.java
@@ -1,38 +1,27 @@
/**
- *(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.
- */
-/**
- * Copyright 2011 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* @@@ 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.wms.util;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/util/WmsConfiguration.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/util/WmsConfiguration.java b/wms/src/main/java/org/trafodion/wms/util/WmsConfiguration.java
index 0a853b5..98195f6 100644
--- a/wms/src/main/java/org/trafodion/wms/util/WmsConfiguration.java
+++ b/wms/src/main/java/org/trafodion/wms/util/WmsConfiguration.java
@@ -1,37 +1,26 @@
/**
- *(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.
- */
-/**
- * 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.wms.util;
import java.util.Map.Entry;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/version/util/VerGen.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/version/util/VerGen.java b/wms/src/main/java/org/trafodion/wms/version/util/VerGen.java
index b2d4e82..583bee3 100644
--- a/wms/src/main/java/org/trafodion/wms/version/util/VerGen.java
+++ b/wms/src/main/java/org/trafodion/wms/version/util/VerGen.java
@@ -1,38 +1,27 @@
/**
- *(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.
- */
-/**
- * Copyright 2011 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* @@@ 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.wms.version.util;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java b/wms/src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java
index 7cd53ea..e96f4c2 100644
--- a/wms/src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java
+++ b/wms/src/main/java/org/trafodion/wms/zookeeper/WmsQuorumPeer.java
@@ -1,17 +1,24 @@
/**
- *(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 @@@
*/
/**
* Copyright 2010 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java b/wms/src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java
index e9a6243..928a85c 100644
--- a/wms/src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java
+++ b/wms/src/main/java/org/trafodion/wms/zookeeper/ZKConfig.java
@@ -1,37 +1,26 @@
/**
- *(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.
- */
-/**
- * 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.wms.zookeeper;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java b/wms/src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java
index 99ceffa..f082d63 100644
--- a/wms/src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java
+++ b/wms/src/main/java/org/trafodion/wms/zookeeper/ZKServerTool.java
@@ -1,38 +1,27 @@
/**
- *(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.
- */
-/**
- * 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.wms.zookeeper;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/zookeeper/ZkClient.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/zookeeper/ZkClient.java b/wms/src/main/java/org/trafodion/wms/zookeeper/ZkClient.java
index bcde5ad..b16cc40 100644
--- a/wms/src/main/java/org/trafodion/wms/zookeeper/ZkClient.java
+++ b/wms/src/main/java/org/trafodion/wms/zookeeper/ZkClient.java
@@ -1,38 +1,27 @@
/**
- *(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.
- */
-/**
- * Copyright 2011 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* @@@ 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.wms.zookeeper;
import java.io.*;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java
----------------------------------------------------------------------
diff --git a/wms/src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java b/wms/src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java
index df1a52c..061fc96 100644
--- a/wms/src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java
+++ b/wms/src/main/java/org/trafodion/wms/zookeeper/ZooKeeperMainServerArg.java
@@ -1,38 +1,27 @@
/**
- *(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.
- */
-/**
- * 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.wms.zookeeper;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/resources/wms-default.xml
----------------------------------------------------------------------
diff --git a/wms/src/main/resources/wms-default.xml b/wms/src/main/resources/wms-default.xml
index e052279..22a17e6 100644
--- a/wms/src/main/resources/wms-default.xml
+++ b/wms/src/main/resources/wms-default.xml
@@ -2,40 +2,30 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
- *(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 @@@
*/
-->
- <!--
-/**
- * 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.
- */
--->
+
+
<configuration>
<property>
<name>wms.tmp.dir</name>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/resources/wms-webapps/master/index.html
----------------------------------------------------------------------
diff --git a/wms/src/main/resources/wms-webapps/master/index.html b/wms/src/main/resources/wms-webapps/master/index.html
index 532a4bb..c24b62b 100644
--- a/wms/src/main/resources/wms-webapps/master/index.html
+++ b/wms/src/main/resources/wms-webapps/master/index.html
@@ -1,35 +1,27 @@
<!--
/**
- *(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 @@@
*/
/**
- * 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.
*/
-->
<meta HTTP-EQUIV="REFRESH" content="0;url=/master-status"/>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/resources/wms-webapps/master/master.jsp
----------------------------------------------------------------------
diff --git a/wms/src/main/resources/wms-webapps/master/master.jsp b/wms/src/main/resources/wms-webapps/master/master.jsp
index 14922bd..bb48958 100644
--- a/wms/src/main/resources/wms-webapps/master/master.jsp
+++ b/wms/src/main/resources/wms-webapps/master/master.jsp
@@ -1,35 +1,27 @@
<%--
/**
- *(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 @@@
*/
/**
- * 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.
*/
--%>
<meta HTTP-EQUIV="REFRESH" content="0;url=/master-status"/>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/resources/wms-webapps/server/index.html
----------------------------------------------------------------------
diff --git a/wms/src/main/resources/wms-webapps/server/index.html b/wms/src/main/resources/wms-webapps/server/index.html
index a75282e..d0e7e1e 100644
--- a/wms/src/main/resources/wms-webapps/server/index.html
+++ b/wms/src/main/resources/wms-webapps/server/index.html
@@ -1,35 +1,27 @@
<!--
/**
- *(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 @@@
*/
/**
- * 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.
*/
-->
<meta HTTP-EQUIV="REFRESH" content="0;url=/server-status"/>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/resources/wms-webapps/server/server.jsp
----------------------------------------------------------------------
diff --git a/wms/src/main/resources/wms-webapps/server/server.jsp b/wms/src/main/resources/wms-webapps/server/server.jsp
index 28c4219..26073b4 100644
--- a/wms/src/main/resources/wms-webapps/server/server.jsp
+++ b/wms/src/main/resources/wms-webapps/server/server.jsp
@@ -1,35 +1,27 @@
<%--
/**
- *(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 @@@
*/
/**
- * 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.
*/
--%>
<meta HTTP-EQUIV="REFRESH" content="0;url=/server-status"/>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/wms/src/main/resources/wms-webapps/static/wms.css
----------------------------------------------------------------------
diff --git a/wms/src/main/resources/wms-webapps/static/wms.css b/wms/src/main/resources/wms-webapps/static/wms.css
index 4b5fa73..05f98dd 100644
--- a/wms/src/main/resources/wms-webapps/static/wms.css
+++ b/wms/src/main/resources/wms-webapps/static/wms.css
@@ -1,34 +1,26 @@
/**
- *(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 @@@
*/
/**
- * 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.
*/
h1, h2, h3 { color: DarkSlateBlue }
table { border: thin solid DodgerBlue }
[06/18] incubator-trafodion git commit: copuright header changes set 2
Posted by rm...@apache.org.
copuright header changes set 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8f822e76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8f822e76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8f822e76
Branch: refs/heads/master
Commit: 8f822e76472472c0856f7f279e1725492c0c2e9a
Parents: 6103052
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Fri Sep 11 21:31:14 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Fri Sep 11 21:31:14 2015 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/jdbcUtil.cpp | 1 -
.../src/main/java/JdbcMxLobAdmin.java | 3 +-
core/conn/jdbc_type4/test/RunAllTests.java | 36 ++++++++++--------
.../test/org/trafodion/jdbc/t4/BaseTest.java | 36 ++++++++++--------
.../org/trafodion/jdbc/t4/T4DriverTest.java | 36 ++++++++++--------
.../odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC | 4 +-
core/dbsecurity/scripts/sqcertgen | 2 +-
core/rest/bin/rest | 33 +++++++++-------
core/rest/bin/rest-config.sh | 33 +++++++++-------
core/rest/bin/rest-daemon.sh | 33 +++++++++-------
core/rest/bin/scripts/sys_shell.py | 33 +++++++++-------
core/rest/bin/start-rest.sh | 33 +++++++++-------
core/rest/bin/stop-rest.sh | 33 +++++++++-------
core/rest/conf/rest-env.sh | 33 +++++++++-------
core/rest/conf/rest-site.xml | 33 +++++++++-------
core/rest/src/assembly/all.xml | 36 ++++++++++--------
core/rest/src/main/asciidoc/_chapters/apis.adoc | 33 +++++++++-------
.../appendix_contributing_to_documentation.adoc | 33 +++++++++-------
.../main/asciidoc/_chapters/architecture.adoc | 33 +++++++++-------
.../main/asciidoc/_chapters/configuration.adoc | 33 +++++++++-------
.../asciidoc/_chapters/getting_started.adoc | 33 +++++++++-------
.../src/main/asciidoc/_chapters/preface.adoc | 33 +++++++++-------
.../asciidoc/_chapters/troubleshooting.adoc | 33 +++++++++-------
core/rest/src/main/asciidoc/index.adoc | 33 +++++++++-------
core/rest/src/main/asciidoc/rest.css | 33 +++++++++-------
.../main/java/org/trafodion/rest/Constants.java | 33 +++++++++-------
.../org/trafodion/rest/GetStatusResponse.java | 34 ++++++++++-------
.../java/org/trafodion/rest/RESTServlet.java | 33 +++++++++-------
.../org/trafodion/rest/RegisteredServer.java | 33 +++++++++-------
.../java/org/trafodion/rest/ResourceBase.java | 34 ++++++++++-------
.../java/org/trafodion/rest/ResourceConfig.java | 34 ++++++++++-------
.../java/org/trafodion/rest/RestConstants.java | 33 +++++++++-------
.../java/org/trafodion/rest/RootResource.java | 34 ++++++++++-------
.../java/org/trafodion/rest/RunningServer.java | 33 +++++++++-------
.../java/org/trafodion/rest/ServerResource.java | 22 ++++++++++-
.../java/org/trafodion/rest/TrafodionRest.java | 33 +++++++++-------
.../trafodion/rest/TransactionsResource.java | 22 ++++++++++-
.../org/trafodion/rest/VersionAnnotation.java | 22 ++++++++++-
.../org/trafodion/rest/VersionResource.java | 25 +++++++++---
.../java/org/trafodion/rest/client/Client.java | 33 +++++++++-------
.../java/org/trafodion/rest/client/Cluster.java | 33 +++++++++-------
.../org/trafodion/rest/client/Response.java | 33 +++++++++-------
.../org/trafodion/rest/model/VersionModel.java | 33 +++++++++-------
.../rest/provider/JAXBContextResolver.java | 24 ++++++++++--
.../producer/PlainTextMessageBodyProducer.java | 24 ++++++++++--
.../trafodion/rest/script/ScriptContext.java | 33 +++++++++-------
.../trafodion/rest/script/ScriptManager.java | 33 +++++++++-------
.../rest/script/ScriptManagerWatcher.java | 33 +++++++++-------
.../java/org/trafodion/rest/util/Base64.java | 33 +++++++++-------
.../java/org/trafodion/rest/util/Bytes.java | 33 +++++++++-------
.../java/org/trafodion/rest/util/ConfTool.java | 33 +++++++++-------
.../trafodion/rest/util/GetJavaProperty.java | 33 +++++++++-------
.../org/trafodion/rest/util/JdbcT2Util.java | 33 +++++++++-------
.../org/trafodion/rest/util/JdbcT4Util.java | 33 +++++++++-------
.../rest/util/NetworkConfiguration.java | 33 +++++++++-------
.../trafodion/rest/util/RestConfiguration.java | 33 +++++++++-------
.../org/trafodion/rest/util/RetryCounter.java | 33 +++++++++-------
.../rest/util/RetryCounterFactory.java | 33 +++++++++-------
.../java/org/trafodion/rest/util/Strings.java | 33 +++++++++-------
.../org/trafodion/rest/util/VersionInfo.java | 33 +++++++++-------
.../org/trafodion/rest/version/util/VerGen.java | 33 +++++++++-------
.../org/trafodion/rest/zookeeper/ZKConfig.java | 33 +++++++++-------
.../trafodion/rest/zookeeper/ZKServerTool.java | 33 +++++++++-------
.../org/trafodion/rest/zookeeper/ZkClient.java | 33 +++++++++-------
.../trafodion/rest/zookeeper/ZkQuorumPeer.java | 33 +++++++++-------
.../org/trafodion/rest/zookeeper/ZkUtil.java | 33 +++++++++-------
.../rest/zookeeper/ZooKeeperMainServerArg.java | 33 +++++++++-------
core/rest/src/main/resources/rest-default.xml | 38 ++++++++++---------
core/rest/src/saveVersion.sh | 40 +++++++++++---------
.../org/trafodion/rest/IntegrationTests.java | 33 +++++++++-------
.../java/org/trafodion/rest/LargeTests.java | 33 +++++++++-------
.../java/org/trafodion/rest/MediumTests.java | 33 +++++++++-------
.../org/trafodion/rest/ResourceChecker.java | 33 +++++++++-------
.../rest/ResourceCheckerJUnitRule.java | 33 +++++++++-------
.../java/org/trafodion/rest/SmallTests.java | 33 +++++++++-------
core/rest/src/test/resources/rest-default.xml | 33 +++++++++-------
.../transactional/TrxRegionObserver.java | 40 ++++++++++----------
core/sqf/src/tm/tmddlrequests.cpp | 36 ++++++++++--------
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215C | 15 --------
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV215N | 15 --------
core/sql/regress/newregr/mvs/BIG/EXPECTEDMV640 | 15 --------
core/sql/regress/newregr/mvs/BIG/TESTMV215C | 15 --------
core/sql/regress/newregr/mvs/BIG/TESTMV640 | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215 | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215IR | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215_DE | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215_RU | 15 --------
.../mvs/BIG/TestMV215_With_RefreshUtilty | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215b | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215e | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215g | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215h | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215j | 15 --------
core/sql/regress/newregr/mvs/BIG/TestMV215n | 15 --------
core/sql/regress/newregr/mvs/BIG/Testmv215m | 15 --------
core/sql/regress/newregr/mvs/BIG/expectedMV215e | 15 --------
core/sql/regress/newregr/mvs/BIG/expectedMV215g | 15 --------
core/sql/regress/newregr/mvs/BIG/expectedMV215h | 15 --------
core/sql/regress/newregr/mvs/BIG/expectedmv215 | 15 --------
.../sql/regress/newregr/mvs/BIG/expectedmv215IR | 15 --------
.../regress/newregr/mvs/BIG/expectedmv215_DE | 15 --------
.../regress/newregr/mvs/BIG/expectedmv215_RU | 15 --------
core/sql/regress/newregr/mvs/BIG/expectedmv215b | 15 --------
core/sql/regress/newregr/mvs/BIG/expectedmv215m | 15 --------
core/sql/regress/newregr/rowsets/teste001.sql | 4 --
core/sql/regress/newregr/rowsets/teste005.sql | 4 --
core/sql/regress/newregr/rowsets/teste011.sql | 4 --
core/sql/regress/newregr/rowsets/teste015.sql | 4 --
core/sql/regress/newregr/rowsets/teste021.sql | 4 --
core/sql/regress/newregr/rowsets/teste025.sql | 4 --
core/sql/regress/newregr/rowsets/teste041.sql | 4 --
core/sql/regress/newregr/rowsets/teste045.sql | 4 --
core/sql/regress/newregr/rowsets/teste051.sql | 4 --
core/sql/regress/newregr/rowsets/teste055.sql | 4 --
core/sql/regress/newregr/rowsets/teste061.sql | 4 --
core/sql/regress/newregr/rowsets/teste065.sql | 4 --
core/sql/regress/newregr/rowsets/teste071.sql | 4 --
core/sql/regress/newregr/rowsets/teste075.sql | 4 --
core/sql/regress/newregr/rowsets/teste081.sql | 4 --
core/sql/regress/newregr/rowsets/teste085.sql | 4 --
core/sql/regress/newregr/rowsets/teste091.sql | 4 --
core/sql/regress/newregr/rowsets/teste101.sql | 4 --
core/sql/regress/newregr/rowsets/teste105.sql | 4 --
core/sql/regress/newregr/rowsets/teste111.sql | 4 --
core/sql/regress/newregr/rowsets/teste121.sql | 4 --
core/sql/regress/newregr/rowsets/teste135.sql | 4 --
core/sql/regress/newregr/rowsets/teste140.sql | 4 --
core/sql/regress/newregr/rowsets/teste141.sql | 4 --
core/sql/regress/newregr/rowsets/teste145.sql | 4 --
core/sql/regress/newregr/rowsets/teste201.sql | 4 --
core/sql/regress/newregr/rowsets/teste205.sql | 4 --
core/sql/regress/newregr/rowsets/teste211.sql | 4 --
core/sql/regress/newregr/rowsets/teste215.sql | 4 --
core/sql/regress/newregr/rowsets/teste221.sql | 4 --
core/sql/regress/newregr/rowsets/teste225.sql | 4 --
core/sql/regress/newregr/rowsets/teste232.sql | 4 --
core/sql/regress/newregr/rowsets/teste235.sql | 4 --
.../sql/regress/newregr/triggers/etest_14_1.sql | 4 --
.../sql/regress/newregr/triggers/etest_14_2.sql | 4 --
.../sql/regress/newregr/triggers/etest_14_3.sql | 4 --
.../sql/regress/newregr/triggers/etest_14_4.sql | 4 --
.../sql/regress/newregr/triggers/etest_14_5.sql | 4 --
.../sql/regress/newregr/triggers/etest_14_6.sql | 4 --
143 files changed, 1493 insertions(+), 1484 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/conn/jdbc_type2/native/jdbcUtil.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/jdbcUtil.cpp b/core/conn/jdbc_type2/native/jdbcUtil.cpp
index caaedeb..f0a0bda 100644
--- a/core/conn/jdbc_type2/native/jdbcUtil.cpp
+++ b/core/conn/jdbc_type2/native/jdbcUtil.cpp
@@ -141,7 +141,6 @@ int main(int argc, char *argv[])
if (!noHeader)
{
printf("JDBC/MX Utility Program\n");
- printf("Copyright 2004 Hewlett-Packard Development Company, L.P.\n");
printf("--------------------------------------------------------\n");
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/conn/jdbc_type2/src/main/java/JdbcMxLobAdmin.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/JdbcMxLobAdmin.java b/core/conn/jdbc_type2/src/main/java/JdbcMxLobAdmin.java
index 509c090..205ad78 100644
--- a/core/conn/jdbc_type2/src/main/java/JdbcMxLobAdmin.java
+++ b/core/conn/jdbc_type2/src/main/java/JdbcMxLobAdmin.java
@@ -40,8 +40,7 @@ public class JdbcMxLobAdmin
String fileName = null;
JdbcMxLobAdmin lobAdmin;
- System.err.println("Hewlett-Packard JDBC/MX Lob Admin Utility 2.0");
- System.err.println("(c) Copyright 2004, 2005 Hewlett-Packard Development Company, LP.");
+ System.err.println(" JDBC/MX Lob Admin Utility 2.0");
if (args.length == 0)
doSql_ = false;
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/conn/jdbc_type4/test/RunAllTests.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/test/RunAllTests.java b/core/conn/jdbc_type4/test/RunAllTests.java
index 5af3811..0de5f33 100644
--- a/core/conn/jdbc_type4/test/RunAllTests.java
+++ b/core/conn/jdbc_type4/test/RunAllTests.java
@@ -1,18 +1,24 @@
-/**
- *(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 @@@ */
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java b/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java
index bbe3b60..71a9486 100644
--- a/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java
+++ b/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java
@@ -1,18 +1,24 @@
-/**
- *(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.jdbc.t4;
import org.junit.After;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java b/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java
index f43d6c7..a464910 100644
--- a/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java
+++ b/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java
@@ -1,18 +1,24 @@
-/**
- * *(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.jdbc.t4;
import java.sql.SQLException;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/conn/unixodbc/odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC b/core/conn/unixodbc/odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC
index 1c44ff5..beceebf 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/TCPIPV4/TCPIPV4.RC
@@ -45,11 +45,11 @@ BEGIN
BLOCK "000004b0"
BEGIN
VALUE "Comments", "T7968G10_01NOV2004_ABC_IPV4_1220\0"
- VALUE "CompanyName", "Hewlett-Packard Company\0"
+ VALUE "CompanyName", "Esgyn Corporation\0"
VALUE "FileDescription", "NonStop� ODBC/MX TCPIPV4 DLL\0"
VALUE "FileVersion", "3, 51, 201, 113\0"
VALUE "InternalName", "NonStop� ODBC/MX TCPIPV4 DLL\0"
- VALUE "LegalCopyright", "� Copyright 2003 Hewlett-Packard Development Company, LP\0"
+ VALUE "LegalCopyright", "� Copyright Apache Software Foundation\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "tdm_TCPIPV4.dll\0"
VALUE "PrivateBuild", "\0"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/dbsecurity/scripts/sqcertgen
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/sqcertgen b/core/dbsecurity/scripts/sqcertgen
index 3007dba..6b772f9 100755
--- a/core/dbsecurity/scripts/sqcertgen
+++ b/core/dbsecurity/scripts/sqcertgen
@@ -108,7 +108,7 @@ stateOrProvinceName_default = California
localityName = Locality Name (eg, city)
localityName_default = Cupertino
0.organizationName = Organization Name (eg, company)
-0.organizationName_default = Hewlett-Packard Company
+0.organizationName_default = Esgyn Corporation
organizationalUnitName = Organizational Unit Name (eg, section)
commonName = Common Name (eg, your name or your server's hostname)
commonName_default = $HNAME
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/bin/rest
----------------------------------------------------------------------
diff --git a/core/rest/bin/rest b/core/rest/bin/rest
index f37f587..15a5dde 100755
--- a/core/rest/bin/rest
+++ b/core/rest/bin/rest
@@ -1,18 +1,25 @@
#! /usr/bin/env bash
#/**
-# *(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 @@@
# */
#
# The rest command script.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/bin/rest-config.sh
----------------------------------------------------------------------
diff --git a/core/rest/bin/rest-config.sh b/core/rest/bin/rest-config.sh
index 7c110dd..c7103e0 100755
--- a/core/rest/bin/rest-config.sh
+++ b/core/rest/bin/rest-config.sh
@@ -1,17 +1,24 @@
#/**
-# *(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 @@@
# */
#
# should not be executable directly
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/bin/rest-daemon.sh
----------------------------------------------------------------------
diff --git a/core/rest/bin/rest-daemon.sh b/core/rest/bin/rest-daemon.sh
index 97fd5e0..210150f 100755
--- a/core/rest/bin/rest-daemon.sh
+++ b/core/rest/bin/rest-daemon.sh
@@ -1,18 +1,25 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
#
# Runs a REST command as a daemon.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/bin/scripts/sys_shell.py
----------------------------------------------------------------------
diff --git a/core/rest/bin/scripts/sys_shell.py b/core/rest/bin/scripts/sys_shell.py
index 2452e57..38bf783 100755
--- a/core/rest/bin/scripts/sys_shell.py
+++ b/core/rest/bin/scripts/sys_shell.py
@@ -1,17 +1,24 @@
#/**
-# *(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 @@@
# */
#
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/bin/start-rest.sh
----------------------------------------------------------------------
diff --git a/core/rest/bin/start-rest.sh b/core/rest/bin/start-rest.sh
index df2fab0..b9010dc 100755
--- a/core/rest/bin/start-rest.sh
+++ b/core/rest/bin/start-rest.sh
@@ -1,18 +1,25 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
# Start rest daemons.
usage="Usage: start-rest.sh"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/bin/stop-rest.sh
----------------------------------------------------------------------
diff --git a/core/rest/bin/stop-rest.sh b/core/rest/bin/stop-rest.sh
index 56b54ae..681566e 100755
--- a/core/rest/bin/stop-rest.sh
+++ b/core/rest/bin/stop-rest.sh
@@ -1,18 +1,25 @@
#!/usr/bin/env bash
#/**
-# *(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 @@@
# */
# Stop rest daemons.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/conf/rest-env.sh
----------------------------------------------------------------------
diff --git a/core/rest/conf/rest-env.sh b/core/rest/conf/rest-env.sh
index 75c13f2..cb5b838 100644
--- a/core/rest/conf/rest-env.sh
+++ b/core/rest/conf/rest-env.sh
@@ -1,17 +1,24 @@
#/**
-# *(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 @@@
# */
#
# Set environment variables here.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/conf/rest-site.xml
----------------------------------------------------------------------
diff --git a/core/rest/conf/rest-site.xml b/core/rest/conf/rest-site.xml
index 89abea4..fc58f1b 100644
--- a/core/rest/conf/rest-site.xml
+++ b/core/rest/conf/rest-site.xml
@@ -2,19 +2,26 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
- *(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 @@@
*/
-->
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/core/rest/src/assembly/all.xml b/core/rest/src/assembly/all.xml
index 14c842a..d228092 100644
--- a/core/rest/src/assembly/all.xml
+++ b/core/rest/src/assembly/all.xml
@@ -3,22 +3,28 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<!--
-/**
- *(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 'all' id is not appended to the produced bundle because we do this:
http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
-->
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/_chapters/apis.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/apis.adoc b/core/rest/src/main/asciidoc/_chapters/apis.adoc
index 1428e34..45cb7ec 100644
--- a/core/rest/src/main/asciidoc/_chapters/apis.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/apis.adoc
@@ -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 @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc b/core/rest/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
index 34786c5..818fed5 100644
--- a/core/rest/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
@@ -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 @@@
*/
////
[appendix]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/_chapters/architecture.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/architecture.adoc b/core/rest/src/main/asciidoc/_chapters/architecture.adoc
index eb19021..0272cb3 100644
--- a/core/rest/src/main/asciidoc/_chapters/architecture.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/architecture.adoc
@@ -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 @@@
*/
////
[[architecture]]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/_chapters/configuration.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/configuration.adoc b/core/rest/src/main/asciidoc/_chapters/configuration.adoc
index a059ed6..7b99b28 100644
--- a/core/rest/src/main/asciidoc/_chapters/configuration.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/configuration.adoc
@@ -1,19 +1,26 @@
////
<!--
/**
- *(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 @@@
*/
-->
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/getting_started.adoc b/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
index 87d5e03..5ffc14a 100644
--- a/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/getting_started.adoc
@@ -1,19 +1,26 @@
////
<!--
/**
- *(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 @@@
*/
-->
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/_chapters/preface.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/preface.adoc b/core/rest/src/main/asciidoc/_chapters/preface.adoc
index 2eee77b..fedb1c8 100644
--- a/core/rest/src/main/asciidoc/_chapters/preface.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/preface.adoc
@@ -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 @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/_chapters/troubleshooting.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/troubleshooting.adoc b/core/rest/src/main/asciidoc/_chapters/troubleshooting.adoc
index 746aa50..da08821 100644
--- a/core/rest/src/main/asciidoc/_chapters/troubleshooting.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/troubleshooting.adoc
@@ -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 @@@
*/
////
[[troubleshooting]]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/index.adoc b/core/rest/src/main/asciidoc/index.adoc
index 40f02ef..0181740 100644
--- a/core/rest/src/main/asciidoc/index.adoc
+++ b/core/rest/src/main/asciidoc/index.adoc
@@ -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 @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/asciidoc/rest.css
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/rest.css b/core/rest/src/main/asciidoc/rest.css
index 32543ab..1fbfa5c 100644
--- a/core/rest/src/main/asciidoc/rest.css
+++ b/core/rest/src/main/asciidoc/rest.css
@@ -1,17 +1,24 @@
/**
- *(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 @@@
*/
/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
/* Remove the comments around the @import statement below when using this as a custom stylesheet */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/Constants.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/Constants.java b/core/rest/src/main/java/org/trafodion/rest/Constants.java
index b4cf043..2c6e001 100644
--- a/core/rest/src/main/java/org/trafodion/rest/Constants.java
+++ b/core/rest/src/main/java/org/trafodion/rest/Constants.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java b/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java
index 4665c4a..4386922 100644
--- a/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java
+++ b/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java
@@ -1,18 +1,24 @@
/*
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/RESTServlet.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/RESTServlet.java b/core/rest/src/main/java/org/trafodion/rest/RESTServlet.java
index 63ddfdb..5b53f21 100644
--- a/core/rest/src/main/java/org/trafodion/rest/RESTServlet.java
+++ b/core/rest/src/main/java/org/trafodion/rest/RESTServlet.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/RegisteredServer.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/RegisteredServer.java b/core/rest/src/main/java/org/trafodion/rest/RegisteredServer.java
index f79773e..829a46d 100644
--- a/core/rest/src/main/java/org/trafodion/rest/RegisteredServer.java
+++ b/core/rest/src/main/java/org/trafodion/rest/RegisteredServer.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/ResourceBase.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/ResourceBase.java b/core/rest/src/main/java/org/trafodion/rest/ResourceBase.java
index 98f5806..9f96ced 100644
--- a/core/rest/src/main/java/org/trafodion/rest/ResourceBase.java
+++ b/core/rest/src/main/java/org/trafodion/rest/ResourceBase.java
@@ -1,18 +1,24 @@
/*
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/ResourceConfig.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/ResourceConfig.java b/core/rest/src/main/java/org/trafodion/rest/ResourceConfig.java
index 0148003..49bd77d 100644
--- a/core/rest/src/main/java/org/trafodion/rest/ResourceConfig.java
+++ b/core/rest/src/main/java/org/trafodion/rest/ResourceConfig.java
@@ -1,18 +1,24 @@
/*
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/RestConstants.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/RestConstants.java b/core/rest/src/main/java/org/trafodion/rest/RestConstants.java
index 1486bc1..26c1e35 100644
--- a/core/rest/src/main/java/org/trafodion/rest/RestConstants.java
+++ b/core/rest/src/main/java/org/trafodion/rest/RestConstants.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/RootResource.java b/core/rest/src/main/java/org/trafodion/rest/RootResource.java
index e383abc..e4b5cb6 100644
--- a/core/rest/src/main/java/org/trafodion/rest/RootResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/RootResource.java
@@ -1,18 +1,24 @@
/*
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/RunningServer.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/RunningServer.java b/core/rest/src/main/java/org/trafodion/rest/RunningServer.java
index 85464b4..f77cdf1 100644
--- a/core/rest/src/main/java/org/trafodion/rest/RunningServer.java
+++ b/core/rest/src/main/java/org/trafodion/rest/RunningServer.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/ServerResource.java b/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
index 0865996..5ed8222 100644
--- a/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/ServerResource.java
@@ -61,8 +61,26 @@ public class ServerResource extends ResourceBase {
}
/**
- * Constructor
- * @throws IOException
+* @@@ 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 @@@
*/
public ServerResource() throws IOException {
super();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/TrafodionRest.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/TrafodionRest.java b/core/rest/src/main/java/org/trafodion/rest/TrafodionRest.java
index 0fd9f21..2f7848f 100644
--- a/core/rest/src/main/java/org/trafodion/rest/TrafodionRest.java
+++ b/core/rest/src/main/java/org/trafodion/rest/TrafodionRest.java
@@ -1,17 +1,24 @@
/**
- *(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.rest;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java b/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
index 15ffa01..f11f61e 100644
--- a/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/TransactionsResource.java
@@ -62,8 +62,26 @@ public class TransactionsResource extends ResourceBase {
}
/**
- * Constructor
- * @throws IOException
+* @@@ 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 @@@
*/
public TransactionsResource() throws IOException {
super();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java b/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java
index 571f2c3..81d9b3a 100644
--- a/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java
+++ b/core/rest/src/main/java/org/trafodion/rest/VersionAnnotation.java
@@ -19,8 +19,26 @@ package org.trafodion.rest;
import java.lang.annotation.*;
/**
- * A package attribute that captures the version of dcs that was compiled.
- * Copied down from hadoop. All is same except name of interface.
+* @@@ 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 @@@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.PACKAGE)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/VersionResource.java b/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
index da1d80a..52b90b0 100644
--- a/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
+++ b/core/rest/src/main/java/org/trafodion/rest/VersionResource.java
@@ -34,11 +34,26 @@ import org.apache.commons.logging.LogFactory;
import org.trafodion.rest.model.VersionModel;
/**
- * Implements REST software version reporting
- * <p>
- * <tt>/version/rest</tt>
- * <p>
- * <tt>/version</tt> (alias for <tt>/version/rest</tt>)
+* @@@ 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 @@@
*/
public class VersionResource extends ResourceBase {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/client/Client.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/client/Client.java b/core/rest/src/main/java/org/trafodion/rest/client/Client.java
index 5163b96..319e161 100644
--- a/core/rest/src/main/java/org/trafodion/rest/client/Client.java
+++ b/core/rest/src/main/java/org/trafodion/rest/client/Client.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.client;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8f822e76/core/rest/src/main/java/org/trafodion/rest/client/Cluster.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/client/Cluster.java b/core/rest/src/main/java/org/trafodion/rest/client/Cluster.java
index 80324bc..8152d07 100644
--- a/core/rest/src/main/java/org/trafodion/rest/client/Cluster.java
+++ b/core/rest/src/main/java/org/trafodion/rest/client/Cluster.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.client;
[03/18] incubator-trafodion git commit: Copyright headers set #1
Posted by rm...@apache.org.
Copyright headers set #1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/61030521
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/61030521
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/61030521
Branch: refs/heads/master
Commit: 610305210ecf99114f45f936eb362b0c036b0356
Parents: 8dec724
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Fri Sep 11 06:07:23 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Fri Sep 11 06:07:23 2015 +0000
----------------------------------------------------------------------
dcs/pom.xml | 60 ++++++++------------
.../appendix_contributing_to_documentation.adoc | 3 +-
.../main/asciidoc/_chapters/architecture.adoc | 32 ++++++-----
.../main/asciidoc/_chapters/configuration.adoc | 34 +++++------
.../main/asciidoc/_chapters/external_apis.adoc | 3 +-
dcs/src/main/asciidoc/_chapters/faq.adoc | 3 +-
.../asciidoc/_chapters/getting_started.adoc | 34 +++++------
dcs/src/main/asciidoc/_chapters/ops_mgt.adoc | 3 +-
.../main/asciidoc/_chapters/performance.adoc | 3 +-
dcs/src/main/asciidoc/_chapters/preface.adoc | 32 ++++++-----
.../asciidoc/_chapters/troubleshooting.adoc | 3 +-
.../main/java/org/trafodion/dcs/Constants.java | 53 +++++++----------
.../org/trafodion/dcs/rest/client/Client.java | 33 ++++++-----
.../org/trafodion/dcs/rest/client/Cluster.java | 33 ++++++-----
.../org/trafodion/dcs/rest/client/Response.java | 33 ++++++-----
.../trafodion/dcs/rest/model/ServerModel.java | 54 +++++++-----------
.../org/trafodion/dcs/servermt/DcsServer.java | 33 ++++++-----
.../org/trafodion/dcs/servermt/Metrics.java | 33 ++++++-----
.../trafodion/dcs/servermt/ServerConstants.java | 33 ++++++-----
.../trafodion/dcs/servermt/ServerManager.java | 33 ++++++-----
.../dcs/servermt/ServerStatusServlet.java | 33 ++++++-----
.../org/trafodion/dcs/servermt/ServerUtils.java | 33 ++++++-----
.../servermt/serverDriverInputOutput/Close.java | 33 ++++++-----
.../ConnectionContext.java | 33 ++++++-----
.../serverDriverInputOutput/Descriptor2.java | 33 ++++++-----
.../Descriptor2List.java | 33 ++++++-----
.../serverDriverInputOutput/ErrorDesc.java | 33 ++++++-----
.../serverDriverInputOutput/ErrorDescList.java | 33 ++++++-----
.../serverDriverInputOutput/Header.java | 33 ++++++-----
.../OutConnectionContext.java | 33 ++++++-----
.../serverDriverInputOutput/SQLDataValue.java | 33 ++++++-----
.../serverDriverInputOutput/SQLValue.java | 33 ++++++-----
.../serverDriverInputOutput/SQLValueList.java | 33 ++++++-----
.../SQLWarningOrError.java | 33 ++++++-----
.../SQLWarningOrErrorList.java | 33 ++++++-----
.../ServerException.java | 33 ++++++-----
.../SetConnectionOption.java | 33 ++++++-----
.../serverDriverInputOutput/UserDesc.java | 33 ++++++-----
.../serverDriverInputOutput/Version.java | 33 ++++++-----
.../serverDriverInputOutput/VersionList.java | 33 ++++++-----
.../dcs/servermt/serverHandler/ClientData.java | 33 ++++++-----
.../dcs/servermt/serverHandler/DataEvent.java | 33 ++++++-----
.../servermt/serverHandler/PendingRequest.java | 33 ++++++-----
.../serverHandler/ServerApiGetCatalogs.java | 33 ++++++-----
.../serverHandler/ServerApiSqlClose.java | 33 ++++++-----
.../serverHandler/ServerApiSqlConnect.java | 33 ++++++-----
.../serverHandler/ServerApiSqlDisconnect.java | 33 ++++++-----
.../serverHandler/ServerApiSqlEndTransact.java | 33 ++++++-----
.../serverHandler/ServerApiSqlExecDirect.java | 33 ++++++-----
.../serverHandler/ServerApiSqlExecute.java | 33 ++++++-----
.../serverHandler/ServerApiSqlFetch.java | 33 ++++++-----
.../serverHandler/ServerApiSqlPrepare.java | 33 ++++++-----
.../ServerApiSqlSetConnectAttr.java | 33 ++++++-----
.../servermt/serverHandler/ServerHandler.java | 33 ++++++-----
.../servermt/serverHandler/ServerWorker.java | 33 ++++++-----
.../dcs/servermt/serverSql/TrafConnection.java | 33 ++++++-----
.../dcs/servermt/serverSql/TrafStatement.java | 33 ++++++-----
.../java/org/trafodion/dcs/util/Base64.java | 14 -----
.../main/java/org/trafodion/dcs/util/Bytes.java | 14 -----
.../org/trafodion/dcs/util/DcsConfTool.java | 14 -----
.../trafodion/dcs/util/DcsConfiguration.java | 14 -----
.../org/trafodion/dcs/util/GetJavaProperty.java | 14 -----
.../java/org/trafodion/dcs/util/InfoServer.java | 14 -----
.../org/trafodion/dcs/util/RetryCounter.java | 14 -----
.../trafodion/dcs/util/RetryCounterFactory.java | 14 -----
.../java/org/trafodion/dcs/util/Strings.java | 14 -----
.../org/trafodion/dcs/util/VersionInfo.java | 14 -----
.../dcs-webapps/master/aggr_querystats.html | 33 ++++++-----
.../dcs-webapps/master/aggr_querystats.jsp | 31 +++++-----
.../dcs-webapps/master/css/Spacetree.css | 33 ++++++-----
.../resources/dcs-webapps/master/css/base.css | 33 ++++++-----
.../dcs-webapps/master/executeQuery.jsp | 31 +++++-----
.../resources/dcs-webapps/master/explain.html | 33 ++++++-----
.../resources/dcs-webapps/master/index.html | 14 -----
.../dcs-webapps/master/js/ExplainPlanView.js | 33 ++++++-----
.../main/resources/dcs-webapps/master/logs.html | 33 ++++++-----
.../resources/dcs-webapps/master/master.jsp | 14 -----
.../resources/dcs-webapps/master/queryPlan.jsp | 31 +++++-----
.../dcs-webapps/master/querystats.html | 33 ++++++-----
.../resources/dcs-webapps/master/querystats.jsp | 35 ++++++------
.../resources/dcs-webapps/master/repository.jsp | 31 +++++-----
.../resources/dcs-webapps/master/servers.jsp | 30 ++++------
.../resources/dcs-webapps/master/sessions.html | 33 ++++++-----
.../resources/dcs-webapps/master/sessions.jsp | 36 ++++++------
.../resources/dcs-webapps/server/index.html | 14 -----
.../resources/dcs-webapps/server/server.jsp | 14 -----
.../main/resources/dcs-webapps/static/dcs.css | 14 -----
pom.xml | 35 +++++++-----
88 files changed, 1311 insertions(+), 1192 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index d3e1c09..6452e99 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -1,42 +1,30 @@
+<!--
+* @@@ 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 @@@
+-->
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<!--
-/**
- *(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.
- */
--->
-<!--
-/**
- * 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.
- */
--->
+
+
<modelVersion>4.0.0</modelVersion>
<!--To build a release I do this:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc b/dcs/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
index a0b1bb7..2ca591d 100644
--- a/dcs/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
+++ b/dcs/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
@@ -1,6 +1,6 @@
////
/**
- *
+ *@@@ 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
@@ -16,6 +16,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * @@@ END COPYRIGHT @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/architecture.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/architecture.adoc b/dcs/src/main/asciidoc/_chapters/architecture.adoc
index 40fab18..d43741f 100644
--- a/dcs/src/main/asciidoc/_chapters/architecture.adoc
+++ b/dcs/src/main/asciidoc/_chapters/architecture.adoc
@@ -1,19 +1,23 @@
////
/**
- *(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 @@@
+ */
////
[[architecture]]
= Architecture
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/configuration.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/configuration.adoc b/dcs/src/main/asciidoc/_chapters/configuration.adoc
index 8807dfc..abcaa9c 100644
--- a/dcs/src/main/asciidoc/_chapters/configuration.adoc
+++ b/dcs/src/main/asciidoc/_chapters/configuration.adoc
@@ -1,21 +1,23 @@
////
-<!--
/**
- *(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 @@@
+ */
////
[[configuration]]
= Configuration
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/external_apis.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/external_apis.adoc b/dcs/src/main/asciidoc/_chapters/external_apis.adoc
index a9a1711..9e307a0 100644
--- a/dcs/src/main/asciidoc/_chapters/external_apis.adoc
+++ b/dcs/src/main/asciidoc/_chapters/external_apis.adoc
@@ -1,6 +1,6 @@
////
/**
- *
+ *@@@ 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
@@ -16,6 +16,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * @@@ END COPYRIGHT @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/faq.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/faq.adoc b/dcs/src/main/asciidoc/_chapters/faq.adoc
index 31adbc9..8fbbf1e 100644
--- a/dcs/src/main/asciidoc/_chapters/faq.adoc
+++ b/dcs/src/main/asciidoc/_chapters/faq.adoc
@@ -1,6 +1,6 @@
////
/**
- *
+ *@@@ 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
@@ -16,6 +16,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * @@@ END COPYRIGHT @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/getting_started.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/getting_started.adoc b/dcs/src/main/asciidoc/_chapters/getting_started.adoc
index 6d9b7f2..f98a53b 100644
--- a/dcs/src/main/asciidoc/_chapters/getting_started.adoc
+++ b/dcs/src/main/asciidoc/_chapters/getting_started.adoc
@@ -1,21 +1,23 @@
////
-<!--
/**
- *(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 @@@
+ */
////
= Getting Started
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc b/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc
index 7d7ea82..87991ff 100644
--- a/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc
+++ b/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc
@@ -1,6 +1,6 @@
////
/**
- *
+ *@@@ 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
@@ -16,6 +16,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * @@@ END COPYRIGHT @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/performance.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/performance.adoc b/dcs/src/main/asciidoc/_chapters/performance.adoc
index 0972cfe..8f2fb8c 100644
--- a/dcs/src/main/asciidoc/_chapters/performance.adoc
+++ b/dcs/src/main/asciidoc/_chapters/performance.adoc
@@ -1,6 +1,6 @@
////
/**
- *
+ *@@@ 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
@@ -16,6 +16,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * @@@ END COPYRIGHT @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/preface.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/preface.adoc b/dcs/src/main/asciidoc/_chapters/preface.adoc
index fcba8ee..5271e97 100644
--- a/dcs/src/main/asciidoc/_chapters/preface.adoc
+++ b/dcs/src/main/asciidoc/_chapters/preface.adoc
@@ -1,19 +1,23 @@
////
/**
- *(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 @@@
+ */
////
[preface]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/asciidoc/_chapters/troubleshooting.adoc
----------------------------------------------------------------------
diff --git a/dcs/src/main/asciidoc/_chapters/troubleshooting.adoc b/dcs/src/main/asciidoc/_chapters/troubleshooting.adoc
index f48cd2c..a1cb2b2 100644
--- a/dcs/src/main/asciidoc/_chapters/troubleshooting.adoc
+++ b/dcs/src/main/asciidoc/_chapters/troubleshooting.adoc
@@ -1,6 +1,6 @@
////
/**
- *
+ *@@@ 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
@@ -16,6 +16,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * @@@ END COPYRIGHT @@@
*/
////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/Constants.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/Constants.java b/dcs/src/main/java/org/trafodion/dcs/Constants.java
index a8ca58b..ae61215 100644
--- a/dcs/src/main/java/org/trafodion/dcs/Constants.java
+++ b/dcs/src/main/java/org/trafodion/dcs/Constants.java
@@ -1,38 +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 @@@
*/
-/**
- * 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.
- */
-
package org.trafodion.dcs;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/rest/client/Client.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/client/Client.java b/dcs/src/main/java/org/trafodion/dcs/rest/client/Client.java
index ae11279..d21eb3a 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/client/Client.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/client/Client.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.client;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/rest/client/Cluster.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/client/Cluster.java b/dcs/src/main/java/org/trafodion/dcs/rest/client/Cluster.java
index 414e541..51721d6 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/client/Cluster.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/client/Cluster.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.client;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/rest/client/Response.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/client/Response.java b/dcs/src/main/java/org/trafodion/dcs/rest/client/Response.java
index c6c3bae..025eb2f 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/client/Response.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/client/Response.java
@@ -1,17 +1,24 @@
/**
- *(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.rest.client;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/rest/model/ServerModel.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/model/ServerModel.java b/dcs/src/main/java/org/trafodion/dcs/rest/model/ServerModel.java
index 85ace3a..e254eca 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/model/ServerModel.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/model/ServerModel.java
@@ -1,36 +1,24 @@
-/*
- *(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.
- */
-/*
- * 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/DcsServer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/DcsServer.java b/dcs/src/main/java/org/trafodion/dcs/servermt/DcsServer.java
index f3ca43f..0843cff 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/DcsServer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/DcsServer.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/Metrics.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/Metrics.java b/dcs/src/main/java/org/trafodion/dcs/servermt/Metrics.java
index 8903e16..34173d4 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/Metrics.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/Metrics.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java
index fa1964c..ae619e9 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerConstants.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
index 7dbf0f3..8a45c07 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerManager.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/ServerStatusServlet.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerStatusServlet.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerStatusServlet.java
index d9fcaa4..a237bb0 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerStatusServlet.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerStatusServlet.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java
index 6e53b55..8fc93d0 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Close.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Close.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Close.java
index 7d16ddd..8bc02a0 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Close.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Close.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.java
index 0fba883..3bc483b 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ConnectionContext.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.java
index 1ba73e3..beadf89 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.java
index ae15956..b5a07bd 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.java
index 59d0330..8a4dbe7 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDesc.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.java
index fa96a58..b600355 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ErrorDescList.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Header.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Header.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Header.java
index 38fb9b3..a1ce834 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Header.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Header.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.java
index 36ad928..5d545a4 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/OutConnectionContext.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.java
index 40f8d7d..a33906c 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLDataValue.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.java
index dc6569f..aa95a3a 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValue.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.java
index 1a7262c..ebd66f2 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLValueList.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.java
index f074c88..9be219b 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrError.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.java
index c4c1236..d0c82a7 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SQLWarningOrErrorList.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.java
index 4a6fb81..f5e831c 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/ServerException.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.java
index 292656b..16cca34 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/SetConnectionOption.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.java
index d336518..3aee79d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/UserDesc.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Version.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Version.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Version.java
index 119a52b..b9eb4b0 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Version.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/Version.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.java
index b98c4ba..58fe51c 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverDriverInputOutput/VersionList.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverDriverInputOutput;
[02/18] incubator-trafodion git commit: Copyright headers set #1
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java
index 7f38055..0dd9a97 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ClientData.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java
index 4b40ccb..18b2411 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/DataEvent.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java
index 8f3d0b2..cf33a3d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/PendingRequest.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
index 9da2e85..18895a5 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java
index c031cff..f583f72 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlClose.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java
index fa726c2..eb3f5b2 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlConnect.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java
index a598cbd..fa489d8 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlDisconnect.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java
index c2bc1a7..dc1a323 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlEndTransact.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java
index e03d1ed..4a62eff 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecDirect.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java
index 5331887..2044bb1 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlExecute.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java
index c9b54f2..f07e20d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlFetch.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java
index fd6219f..6472a43 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlPrepare.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java
index 351b754..6da2db6 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiSqlSetConnectAttr.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java
index daa198b..8d9b48b 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java
index 217bdad..f11ccde 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerWorker.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverHandler;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java
index 7ef1ec8..35129ef 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafConnection.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverSql;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java
index 474dec9..484aaba 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverSql/TrafStatement.java
@@ -1,17 +1,24 @@
/**
- *(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.servermt.serverSql;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/Base64.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/Base64.java b/dcs/src/main/java/org/trafodion/dcs/util/Base64.java
index f4a6fb4..3cfc0c1 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/Base64.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/Base64.java
@@ -1,18 +1,4 @@
/**
- *(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 2007 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java b/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java
index 1e116cc..f7ab41b 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/Bytes.java
@@ -1,18 +1,4 @@
/**
- *(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 2007 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java b/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java
index 5fcacef..e82995d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/DcsConfTool.java
@@ -1,18 +1,4 @@
/**
- *(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 2007 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java b/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java
index a552246..93298ce 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/DcsConfiguration.java
@@ -1,18 +1,4 @@
/**
- *(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 2007 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java b/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java
index 5ee8718..c9a4f17 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/GetJavaProperty.java
@@ -1,18 +1,4 @@
/**
- *(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 2007 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java b/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java
index e687a39..6b02eef 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/InfoServer.java
@@ -1,18 +1,4 @@
/**
- *(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 2007 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
index 4cf8ee2..8acb750 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
@@ -1,18 +1,4 @@
/**
- *(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 2011 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java
index 50d1e0b..cd83693 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounterFactory.java
@@ -1,18 +1,4 @@
/**
- *(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 2011 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/Strings.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/Strings.java b/dcs/src/main/java/org/trafodion/dcs/util/Strings.java
index a2ddea2..9558d65 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/Strings.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/Strings.java
@@ -1,18 +1,4 @@
/**
- *(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 2011 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java b/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
index ee7f944..75958f6 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
@@ -1,18 +1,4 @@
/**
- *(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 2011 The Apache Software Foundation
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html b/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html
index 642655e..76545ae 100644
--- a/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html
+++ b/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.html
@@ -1,19 +1,22 @@
<!-- @@@ START COPYRIGHT @@@ -->
-<!-- -->
-<!-- (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. -->
-<!-- -->
+<!--
+<!-- 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 @@@ -->
<head>
<link type="text/css" href="datatables/css/jquery.dataTables_themeroller.css" rel="stylesheet" />
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp b/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
index 23a3049..ff80698 100644
--- a/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/aggr_querystats.jsp
@@ -2,20 +2,23 @@
/**
* @@@ START COPYRIGHT @@@
*
- * (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.
- *
+ * 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 @@@
*/
--%>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css b/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css
index e11013e..f928074 100644
--- a/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css
+++ b/dcs/src/main/resources/dcs-webapps/master/css/Spacetree.css
@@ -1,19 +1,22 @@
/* @@@ START COPYRIGHT @@@
-**
-** (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.
-**
+/*
+/* 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 @@@ */
.jit-autoadjust-label {
padding: 15px;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/css/base.css
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/css/base.css b/dcs/src/main/resources/dcs-webapps/master/css/base.css
index f664e9d..039a55a 100644
--- a/dcs/src/main/resources/dcs-webapps/master/css/base.css
+++ b/dcs/src/main/resources/dcs-webapps/master/css/base.css
@@ -1,19 +1,22 @@
/* @@@ START COPYRIGHT @@@
-**
-** (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.
-**
+/*
+/* 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 @@@ */
/*html, body {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp b/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp
index ddae091..0ce2171 100644
--- a/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/executeQuery.jsp
@@ -2,20 +2,23 @@
/**
* @@@ START COPYRIGHT @@@
*
- * (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.
- *
+ * 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 @@@
*/
--%>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/explain.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/explain.html b/dcs/src/main/resources/dcs-webapps/master/explain.html
index 03fad4c..d8ddd12 100644
--- a/dcs/src/main/resources/dcs-webapps/master/explain.html
+++ b/dcs/src/main/resources/dcs-webapps/master/explain.html
@@ -1,19 +1,22 @@
<!-- @@@ START COPYRIGHT @@@ -->
-<!-- -->
-<!-- (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. -->
-<!-- -->
+<!--
+<!-- 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 @@@ -->
<head>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/index.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/index.html b/dcs/src/main/resources/dcs-webapps/master/index.html
index 69d5c75..a0661e1 100644
--- a/dcs/src/main/resources/dcs-webapps/master/index.html
+++ b/dcs/src/main/resources/dcs-webapps/master/index.html
@@ -1,19 +1,5 @@
<!--
/**
- *(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
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js b/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
index efb1c15..697dc02 100644
--- a/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
+++ b/dcs/src/main/resources/dcs-webapps/master/js/ExplainPlanView.js
@@ -1,20 +1,23 @@
/**
* @@@ START COPYRIGHT @@@
- *
- * (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.
- *
+ *
+ * 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 @@@
*/
var setRootNode = false;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/logs.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/logs.html b/dcs/src/main/resources/dcs-webapps/master/logs.html
index aa9d7d2..8f00c51 100644
--- a/dcs/src/main/resources/dcs-webapps/master/logs.html
+++ b/dcs/src/main/resources/dcs-webapps/master/logs.html
@@ -1,19 +1,22 @@
<!-- @@@ START COPYRIGHT @@@ -->
-<!-- -->
-<!-- (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. -->
-<!-- -->
+<!--
+<!-- 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 @@@ -->
<body>
<p> Place holder for log data </p>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/master.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/master.jsp b/dcs/src/main/resources/dcs-webapps/master/master.jsp
index e23f39b..0fe30fa 100644
--- a/dcs/src/main/resources/dcs-webapps/master/master.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/master.jsp
@@ -1,19 +1,5 @@
<%--
/**
- *(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
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp b/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp
index d30c86b..51f74ce 100644
--- a/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/queryPlan.jsp
@@ -2,20 +2,23 @@
/**
* @@@ START COPYRIGHT @@@
*
- * (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.
- *
+ * 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 @@@
*/
--%>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/querystats.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/querystats.html b/dcs/src/main/resources/dcs-webapps/master/querystats.html
index bbd7735..d7f2fdb 100644
--- a/dcs/src/main/resources/dcs-webapps/master/querystats.html
+++ b/dcs/src/main/resources/dcs-webapps/master/querystats.html
@@ -1,19 +1,22 @@
<!-- @@@ START COPYRIGHT @@@ -->
-<!-- -->
-<!-- (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. -->
-<!-- -->
+<!--
+<!-- 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 @@@ -->
<head>
<link type="text/css" href="datatables/css/jquery.dataTables_themeroller.css" rel="stylesheet" />
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/querystats.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/querystats.jsp b/dcs/src/main/resources/dcs-webapps/master/querystats.jsp
index da83d53..4f1e668 100644
--- a/dcs/src/main/resources/dcs-webapps/master/querystats.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/querystats.jsp
@@ -1,22 +1,25 @@
<%--
/**
- * @@@ START COPYRIGHT @@@
+ *@@@ START COPYRIGHT @@@
*
- * (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.
- *
- * @@@ END COPYRIGHT @@@
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements. See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership. The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *KIND, either express or implied. See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ *
+ * @@@ END COPYRIGHT @@@
*/
--%>
<%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/repository.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/repository.jsp b/dcs/src/main/resources/dcs-webapps/master/repository.jsp
index d94b954..bf748fa 100644
--- a/dcs/src/main/resources/dcs-webapps/master/repository.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/repository.jsp
@@ -2,20 +2,23 @@
/**
* @@@ START COPYRIGHT @@@
*
- * (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.
- *
+ * 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 @@@
*/
--%>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/servers.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/servers.jsp b/dcs/src/main/resources/dcs-webapps/master/servers.jsp
index 472449b..0e6316d 100644
--- a/dcs/src/main/resources/dcs-webapps/master/servers.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/servers.jsp
@@ -1,20 +1,7 @@
<%--
/**
- *(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
+ * @@@ START COPYRIGHT @@@
*
- * 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
@@ -23,13 +10,16 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * @@@ END COPYRIGHT @@@
*/
--%>
<%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/61030521/dcs/src/main/resources/dcs-webapps/master/sessions.html
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/sessions.html b/dcs/src/main/resources/dcs-webapps/master/sessions.html
index 6f2795b..c2af17f 100644
--- a/dcs/src/main/resources/dcs-webapps/master/sessions.html
+++ b/dcs/src/main/resources/dcs-webapps/master/sessions.html
@@ -1,19 +1,22 @@
<!-- @@@ START COPYRIGHT @@@ -->
-<!-- -->
-<!-- (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. -->
-<!-- -->
+<!--
+<!-- 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 @@@ -->
<head>
<link type="text/css" href="datatables/css/jquery.dataTables_themeroller.css" rel="stylesheet" />
[14/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/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 70c83c1..25a0d23 100644
--- a/dcs/src/main/java/org/trafodion/dcs/VersionAnnotation.java
+++ b/dcs/src/main/java/org/trafodion/dcs/VersionAnnotation.java
@@ -35,8 +35,26 @@ package org.trafodion.dcs;
import java.lang.annotation.*;
/**
- * A package attribute that captures the version of dcs that was compiled.
- * Copied down from hadoop. All is same except name of interface.
+* @@@ 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 @@@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.PACKAGE)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/http/FilterContainer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/http/FilterContainer.java b/dcs/src/main/java/org/trafodion/dcs/http/FilterContainer.java
index a211355..114bb8f 100644
--- a/dcs/src/main/java/org/trafodion/dcs/http/FilterContainer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/http/FilterContainer.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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 @@@
*/
/**
* Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/http/HtmlQuoting.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/http/HtmlQuoting.java b/dcs/src/main/java/org/trafodion/dcs/http/HtmlQuoting.java
index 7ee4973..03823a9 100644
--- a/dcs/src/main/java/org/trafodion/dcs/http/HtmlQuoting.java
+++ b/dcs/src/main/java/org/trafodion/dcs/http/HtmlQuoting.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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 @@@
*/
/**
* Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/http/HttpServer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/http/HttpServer.java b/dcs/src/main/java/org/trafodion/dcs/http/HttpServer.java
index a5aecf0..132b1e8 100644
--- a/dcs/src/main/java/org/trafodion/dcs/http/HttpServer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/http/HttpServer.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2007 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/DcsMaster.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/DcsMaster.java b/dcs/src/main/java/org/trafodion/dcs/master/DcsMaster.java
index 003eba8..8a31e38 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/DcsMaster.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/DcsMaster.java
@@ -1,17 +1,24 @@
/**
- *(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.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/FloatingIp.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/FloatingIp.java b/dcs/src/main/java/org/trafodion/dcs/master/FloatingIp.java
index 8599105..b969b7a 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/FloatingIp.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/FloatingIp.java
@@ -1,17 +1,24 @@
/**
- *(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.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/MasterLeaderElection.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/MasterLeaderElection.java b/dcs/src/main/java/org/trafodion/dcs/master/MasterLeaderElection.java
index cedd95f..c8bd221 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/MasterLeaderElection.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/MasterLeaderElection.java
@@ -1,17 +1,24 @@
/**
- *(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 @@@
*/
/**
* Copyright 2007 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/MasterStatusServlet.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/MasterStatusServlet.java b/dcs/src/main/java/org/trafodion/dcs/master/MasterStatusServlet.java
index b16b3c1..6b02123 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/MasterStatusServlet.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/MasterStatusServlet.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2007 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/Metrics.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/Metrics.java b/dcs/src/main/java/org/trafodion/dcs/master/Metrics.java
index 7bfba7a..b048f64 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/Metrics.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/Metrics.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/RegisteredServer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/RegisteredServer.java b/dcs/src/main/java/org/trafodion/dcs/master/RegisteredServer.java
index b65e0de..4662502 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/RegisteredServer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/RegisteredServer.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/RunningServer.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/RunningServer.java b/dcs/src/main/java/org/trafodion/dcs/master/RunningServer.java
index 260751a..5d19d14 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/RunningServer.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/RunningServer.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/ServerItem.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/ServerItem.java b/dcs/src/main/java/org/trafodion/dcs/master/ServerItem.java
index 64e5bbd..10470c3 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/ServerItem.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/ServerItem.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
index 142321c..878bfcd 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
@@ -1,17 +1,24 @@
/**
- *(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.master;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/ClientData.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ClientData.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ClientData.java
index 897240a..b608e41 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ClientData.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ClientData.java
@@ -1,17 +1,24 @@
/**
- *(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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
index 027bf46..f0880b6 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
@@ -1,17 +1,24 @@
/**
- *(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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectionContext.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectionContext.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectionContext.java
index 283f4e2..1984130 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectionContext.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectionContext.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/DataEvent.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/DataEvent.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/DataEvent.java
index 1bd6968..c106342 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/DataEvent.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/DataEvent.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/GetObjRefException.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/GetObjRefException.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/GetObjRefException.java
index f801454..9b01a6f 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/GetObjRefException.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/GetObjRefException.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/Header.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/Header.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/Header.java
index cbdc191..b8add17 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/Header.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/Header.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerConstants.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerConstants.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerConstants.java
index f3df38d..05c67c4 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerConstants.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerConstants.java
@@ -1,17 +1,24 @@
/**
- *(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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerMetrics.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerMetrics.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerMetrics.java
index fdfa7f9..3aa51bc 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerMetrics.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerMetrics.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerService.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerService.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerService.java
index b251edb..fd6ff84 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerService.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerService.java
@@ -1,17 +1,24 @@
/**
- *(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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java
index 4321ea8..182e437 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ListenerWorker.java
@@ -1,17 +1,24 @@
/**
- *(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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/PendingRequest.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/PendingRequest.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/PendingRequest.java
index 37d9b59..b3ec52f 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/PendingRequest.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/PendingRequest.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java
index 99edb62..f0ba9c5 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestCancelQuery.java
@@ -1,17 +1,24 @@
/**
- *(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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java
index 5d5e75f..a24106d 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestGetObjectRef.java
@@ -1,17 +1,24 @@
/**
- *(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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java
index efb6e6b..e0569d4 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/RequestUnknown.java
@@ -1,17 +1,24 @@
/**
- *(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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/UserDesc.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/UserDesc.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/UserDesc.java
index 4d894cd..f063f86 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/UserDesc.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/UserDesc.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/Util.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/Util.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/Util.java
index 6b33580..15267cb 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/Util.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/Util.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/Version.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/Version.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/Version.java
index c70a4cd..b780d75 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/Version.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/Version.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/master/listener/VersionList.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/VersionList.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/VersionList.java
index 6b63f09..5933772 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/VersionList.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/VersionList.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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.master.listener;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/DcsRest.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/DcsRest.java b/dcs/src/main/java/org/trafodion/dcs/rest/DcsRest.java
index 598c6c5..046b308 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/DcsRest.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/DcsRest.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2011 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/GetStatusResponse.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/GetStatusResponse.java b/dcs/src/main/java/org/trafodion/dcs/rest/GetStatusResponse.java
index a4e2e45..c8ee6c4 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/GetStatusResponse.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/GetStatusResponse.java
@@ -1,36 +1,24 @@
-/*
- *(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/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/RESTServlet.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/RESTServlet.java b/dcs/src/main/java/org/trafodion/dcs/rest/RESTServlet.java
index 3022876..13016b4 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/RESTServlet.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/RESTServlet.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2007 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/ResourceBase.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/ResourceBase.java b/dcs/src/main/java/org/trafodion/dcs/rest/ResourceBase.java
index e983ead..00d64eb 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/ResourceBase.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/ResourceBase.java
@@ -1,36 +1,24 @@
-/*
- *(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/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/ResourceConfig.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/ResourceConfig.java b/dcs/src/main/java/org/trafodion/dcs/rest/ResourceConfig.java
index 1490a8b..32a211e 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/ResourceConfig.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/ResourceConfig.java
@@ -1,36 +1,24 @@
-/*
- *(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/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/RestConstants.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/RestConstants.java b/dcs/src/main/java/org/trafodion/dcs/rest/RestConstants.java
index 62f36f5..1eee4df 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/RestConstants.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/RestConstants.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ START COPYRIGHT @@@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+* @@@ END COPYRIGHT @@@
*/
/**
* Copyright 2007 The Apache Software Foundation
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/RootResource.java b/dcs/src/main/java/org/trafodion/dcs/rest/RootResource.java
index ed7c579..eb9d0dc 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/RootResource.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/RootResource.java
@@ -1,36 +1,24 @@
-/*
- *(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/d3f73dbc/dcs/src/main/java/org/trafodion/dcs/rest/ServerConnector.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/rest/ServerConnector.java b/dcs/src/main/java/org/trafodion/dcs/rest/ServerConnector.java
index a178df9..35cafd9 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/ServerConnector.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/ServerConnector.java
@@ -1,17 +1,24 @@
/**
- *(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.
+* @@@ 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/d3f73dbc/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 31cb80e..166e25b 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/ServerResource.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/ServerResource.java
@@ -73,8 +73,26 @@ public class ServerResource extends ResourceBase {
}
/**
- * Constructor
- * @throws IOException
+* @@@ 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 @@@
*/
public ServerResource() throws IOException {
super();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/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 1b4f487..6b013cd 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/VersionResource.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/VersionResource.java
@@ -53,11 +53,26 @@ import org.apache.commons.logging.LogFactory;
import org.trafodion.dcs.rest.model.VersionModel;
/**
- * Implements REST software version reporting
- * <p>
- * <tt>/version/rest</tt>
- * <p>
- * <tt>/version</tt> (alias for <tt>/version/rest</tt>)
+* @@@ 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 @@@
*/
public class VersionResource extends ResourceBase {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/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 a005c7d..e088be8 100644
--- a/dcs/src/main/java/org/trafodion/dcs/rest/WorkloadResource.java
+++ b/dcs/src/main/java/org/trafodion/dcs/rest/WorkloadResource.java
@@ -74,8 +74,26 @@ public class WorkloadResource extends ResourceBase {
}
/**
- * Constructor
- * @throws IOException
+* @@@ 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 @@@
*/
public WorkloadResource() throws IOException {
super();
[11/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/ODBCMXAttribs.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/ODBCMXAttribs.h b/win-odbc64/odbcclient/DSNConverter/ODBCMXAttribs.h
index 7a7f383..63e58da 100644
--- a/win-odbc64/odbcclient/DSNConverter/ODBCMXAttribs.h
+++ b/win-odbc64/odbcclient/DSNConverter/ODBCMXAttribs.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp b/win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp
index 13ac42a..afef142 100644
--- a/win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp
+++ b/win-odbc64/odbcclient/DSNConverter/OdbcDS.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/OdbcDS.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/OdbcDS.h b/win-odbc64/odbcclient/DSNConverter/OdbcDS.h
index 742780f..e0eec8b 100644
--- a/win-odbc64/odbcclient/DSNConverter/OdbcDS.h
+++ b/win-odbc64/odbcclient/DSNConverter/OdbcDS.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/StdAfx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/StdAfx.cpp b/win-odbc64/odbcclient/DSNConverter/StdAfx.cpp
index 67a89c6..daa33cd 100644
--- a/win-odbc64/odbcclient/DSNConverter/StdAfx.cpp
+++ b/win-odbc64/odbcclient/DSNConverter/StdAfx.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/DSNConverter/StdAfx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/DSNConverter/StdAfx.h b/win-odbc64/odbcclient/DSNConverter/StdAfx.h
index d81a6b2..96c115f 100644
--- a/win-odbc64/odbcclient/DSNConverter/StdAfx.h
+++ b/win-odbc64/odbcclient/DSNConverter/StdAfx.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp
index 2da5f50..e205f81 100644
--- a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp
+++ b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// Drvr35Res.cpp : Defines the initialization routines for the DLL.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def
index 21175e7..c5789b7 100644
--- a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def
+++ b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.def
@@ -1,19 +1,22 @@
;// @@@ START COPYRIGHT @@@
-;//
-;// (C) Copyright 2010-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.
-;//
+;//
+;// 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 @@@
; Drvr35Res.def : Declares the module parameters for the DLL.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h
index dfd0381..178f8af 100644
--- a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h
+++ b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// Drvr35Res.h : main header file for the DRVR35RES DLL
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp b/win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp
index 9353e06..1469986 100644
--- a/win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp
+++ b/win-odbc64/odbcclient/Drvr35Res/StdAfx.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// stdafx.cpp : source file that includes just the standard includes
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/Drvr35Res/StdAfx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/StdAfx.h b/win-odbc64/odbcclient/Drvr35Res/StdAfx.h
index cc5d551..faec457 100644
--- a/win-odbc64/odbcclient/Drvr35Res/StdAfx.h
+++ b/win-odbc64/odbcclient/Drvr35Res/StdAfx.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2010-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
// stdafx.h : include file for standard system include files,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/README.txt
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/README.txt b/win-odbc64/odbcclient/README.txt
index af56870..57820d8 100644
--- a/win-odbc64/odbcclient/README.txt
+++ b/win-odbc64/odbcclient/README.txt
@@ -1,19 +1,22 @@
# @@@ START COPYRIGHT @@@
-#
-# (C) Copyright 2014-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.
-#
+#
+# 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 @@@
Prerequisite:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/TranslationDll/StdAfx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/StdAfx.cpp b/win-odbc64/odbcclient/TranslationDll/StdAfx.cpp
index 1892962..bc7110f 100644
--- a/win-odbc64/odbcclient/TranslationDll/StdAfx.cpp
+++ b/win-odbc64/odbcclient/TranslationDll/StdAfx.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/TranslationDll/StdAfx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/StdAfx.h b/win-odbc64/odbcclient/TranslationDll/StdAfx.h
index 1620f9e..810c546 100644
--- a/win-odbc64/odbcclient/TranslationDll/StdAfx.h
+++ b/win-odbc64/odbcclient/TranslationDll/StdAfx.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/TranslationDll/TranslationDll.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.cpp b/win-odbc64/odbcclient/TranslationDll/TranslationDll.cpp
index 00e69c0..26c476c 100644
--- a/win-odbc64/odbcclient/TranslationDll/TranslationDll.cpp
+++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/TranslationDll/TranslationDll.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.def b/win-odbc64/odbcclient/TranslationDll/TranslationDll.def
index 21d246b..6ea5a6f 100644
--- a/win-odbc64/odbcclient/TranslationDll/TranslationDll.def
+++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll.def
@@ -1,19 +1,22 @@
;// @@@ START COPYRIGHT @@@
-;//
-;// (C) Copyright 1997-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.
-;//
+;//
+;// 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 @@@
; TranslationDll.def : Declares the module parameters for the DLL.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/TranslationDll/TranslationDll.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.h b/win-odbc64/odbcclient/TranslationDll/TranslationDll.h
index 6bd3989..bcb7f65 100644
--- a/win-odbc64/odbcclient/TranslationDll/TranslationDll.h
+++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2007-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/build_os.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/build_os.bat b/win-odbc64/odbcclient/build_os.bat
index aace29f..a5f9be7 100644
--- a/win-odbc64/odbcclient/build_os.bat
+++ b/win-odbc64/odbcclient/build_os.bat
@@ -1,20 +1,23 @@
@echo off
REM @@@ START COPYRIGHT @@@
-REM
-REM (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM
+REM
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM
REM @@@ END COPYRIGHT @@@
REM set this to openssl binary directory.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/Interface/Transport.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/Interface/Transport.cpp b/win-odbc64/odbcclient/drvr35/Interface/Transport.cpp
index b164616..db1e2df 100644
--- a/win-odbc64/odbcclient/drvr35/Interface/Transport.cpp
+++ b/win-odbc64/odbcclient/drvr35/Interface/Transport.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/Interface/Transport.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/Interface/Transport.h b/win-odbc64/odbcclient/drvr35/Interface/Transport.h
index 1b477c1..d6499d9 100644
--- a/win-odbc64/odbcclient/drvr35/Interface/Transport.h
+++ b/win-odbc64/odbcclient/drvr35/Interface/Transport.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.cpp b/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.cpp
index c823459..4b52a97 100644
--- a/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.cpp
+++ b/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.h b/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.h
index 9f1f51d..9525ceb 100644
--- a/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.h
+++ b/win-odbc64/odbcclient/drvr35/Interface/odbcas_drvr.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.cpp b/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.cpp
index 82a34d4..8228734 100644
--- a/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.cpp
+++ b/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.h b/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.h
index d5ef624..7b044f9 100644
--- a/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.h
+++ b/win-odbc64/odbcclient/drvr35/Interface/odbcs_drvr.h
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp b/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp
index 3004adb..c7d99f4 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h b/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h
index 89aa5db..28a813f 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/StdAfx.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp
index ccadc9b..edeefee 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.def b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.def
index 5907d1c..ed18815 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.def
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.def
@@ -1,7 +1,22 @@
;// @@@ START COPYRIGHT @@@
-;//
-;// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-;//
+;//
+;// Licensed to the Apache Software Foundation (ASF) under one
+;// or more contributor license agreements. See the NOTICE file
+;// distributed with this work for additional information
+;// regarding copyright ownership. The ASF licenses this file
+;// to you under the Apache License, Version 2.0 (the
+;// "License"); you may not use this file except in compliance
+;// with the License. You may obtain a copy of the License at
+;//
+;// 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 @@@
; TCPIPV4.def : Declares the module parameters for the DLL.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h
index 50b28ac..1ed3ade 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp b/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp
index 8d4af3b..c043563 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h b/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h
index 9dbf0aa..97b9c16 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/StdAfx.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp
index 2f4c94e..cae4b5b 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.def
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.def b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.def
index a46cefb..863d1e2 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.def
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.def
@@ -1,7 +1,22 @@
;// @@@ START COPYRIGHT @@@
-;//
-;// (C) Copyright 2003-2014 Hewlett-Packard Development Company, L.P.
-;//
+;//
+;// Licensed to the Apache Software Foundation (ASF) under one
+;// or more contributor license agreements. See the NOTICE file
+;// distributed with this work for additional information
+;// regarding copyright ownership. The ASF licenses this file
+;// to you under the Apache License, Version 2.0 (the
+;// "License"); you may not use this file except in compliance
+;// with the License. You may obtain a copy of the License at
+;//
+;// 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 @@@
; TCPIPV6.def : Declares the module parameters for the DLL.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h
index bab7fbb..82d8a3e 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cconnect.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cconnect.cpp b/win-odbc64/odbcclient/drvr35/cconnect.cpp
index c2bf45b..b8e9b79 100644
--- a/win-odbc64/odbcclient/drvr35/cconnect.cpp
+++ b/win-odbc64/odbcclient/drvr35/cconnect.cpp
@@ -1,19 +1,22 @@
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-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.
-//
+//
+// 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 @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cconnect.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cconnect.h b/win-odbc64/odbcclient/drvr35/cconnect.h
index 180abdf..3f6d111 100644
--- a/win-odbc64/odbcclient/drvr35/cconnect.h
+++ b/win-odbc64/odbcclient/drvr35/cconnect.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cdatasource.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cdatasource.cpp b/win-odbc64/odbcclient/drvr35/cdatasource.cpp
index 560a990..d5590bb 100644
--- a/win-odbc64/odbcclient/drvr35/cdatasource.cpp
+++ b/win-odbc64/odbcclient/drvr35/cdatasource.cpp
@@ -1,19 +1,22 @@
// @@@ START COPYRIGHT @@@
-//
-// (C) Copyright 2003-2014 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.
+//
// @@@ END COPYRIGHT @@@
//
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cdatasource.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cdatasource.h b/win-odbc64/odbcclient/drvr35/cdatasource.h
index 9ab55ce..ca349e1 100644
--- a/win-odbc64/odbcclient/drvr35/cdatasource.h
+++ b/win-odbc64/odbcclient/drvr35/cdatasource.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cdesc.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cdesc.cpp b/win-odbc64/odbcclient/drvr35/cdesc.cpp
index 8423624..2464a28 100644
--- a/win-odbc64/odbcclient/drvr35/cdesc.cpp
+++ b/win-odbc64/odbcclient/drvr35/cdesc.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2015 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cdesc.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cdesc.h b/win-odbc64/odbcclient/drvr35/cdesc.h
index 7867c06..ecd1019 100644
--- a/win-odbc64/odbcclient/drvr35/cdesc.h
+++ b/win-odbc64/odbcclient/drvr35/cdesc.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cdiag.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cdiag.cpp b/win-odbc64/odbcclient/drvr35/cdiag.cpp
index dd9a0c8..38d68d3 100644
--- a/win-odbc64/odbcclient/drvr35/cdiag.cpp
+++ b/win-odbc64/odbcclient/drvr35/cdiag.cpp
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cdiag.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cdiag.h b/win-odbc64/odbcclient/drvr35/cdiag.h
index e2f5ead..e918aad 100644
--- a/win-odbc64/odbcclient/drvr35/cdiag.h
+++ b/win-odbc64/odbcclient/drvr35/cdiag.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cenv.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cenv.cpp b/win-odbc64/odbcclient/drvr35/cenv.cpp
index 0ba6c12..7064b97 100644
--- a/win-odbc64/odbcclient/drvr35/cenv.cpp
+++ b/win-odbc64/odbcclient/drvr35/cenv.cpp
@@ -1,18 +1,21 @@
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 2002-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d3f73dbc/win-odbc64/odbcclient/drvr35/cenv.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cenv.h b/win-odbc64/odbcclient/drvr35/cenv.h
index 23ce483..4af5192 100644
--- a/win-odbc64/odbcclient/drvr35/cenv.h
+++ b/win-odbc64/odbcclient/drvr35/cenv.h
@@ -1,19 +1,22 @@
/**********************************************************************
// @@@ START COPYRIGHT @@@
//
-// (C) Copyright 1998-2014 Hewlett-Packard Development Company, L.P.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
//
// @@@ END COPYRIGHT @@@
********************************************************************/