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:24 UTC
[15/18] incubator-trafodion git commit: copyright changes in dcs and
rest and removing HP references in asciidocs
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;