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:15 UTC
[06/18] incubator-trafodion git commit: copuright header changes set 2
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;