http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/core/sql/regress/newregr/mvs/TPCD/DBGEN_HELP.TXT ---------------------------------------------------------------------- diff --git a/core/sql/regress/newregr/mvs/TPCD/DBGEN_HELP.TXT b/core/sql/regress/newregr/mvs/TPCD/DBGEN_HELP.TXT deleted file mode 100644 index a7f8842..0000000 --- a/core/sql/regress/newregr/mvs/TPCD/DBGEN_HELP.TXT +++ /dev/null @@ -1,83 +0,0 @@ --- @@@ START COPYRIGHT @@@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, --- software distributed under the License is distributed on an --- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --- KIND, either express or implied. See the License for the --- specific language governing permissions and limitations --- under the License. --- --- @@@ END COPYRIGHT @@@ -TPC-D Population Generator (Version 1.2.0 ) -Copyright Transaction Processing Performance Council 1994, 1995, 1996 -USAGE: -dbgen [-{vfFD}] [-O {fhmst}][-T {pcsoPSOL}] - [-s <scale>][-C <procs>][-S <step>] - [-x <partitions>][-y <partno>][-z <limit>] -dbgen [-v] [-O {dhmrt}] [-s <scale>] [-U <updates>] [-r <percent>] - --C <n> -- use <n> processes to generate data - [Under DOS, must be used with -S] --D -- do database load in line --f -- force. Overwrite existing files --F -- generate flat files output --h -- display this message --n <s> -- inline load into database <s> --O d -- generate SQL syntax for deletes --O f -- over-ride default output file names --O h -- output files with headers --O m -- produce columnar output --O r -- generate key ranges for deletes. --O s -- generate seed sets ONLY --O t -- use TIME table and julian dates --r <n> -- updates refresh (n/100)% of the - data set --R <n> -- resume seed rfile generation with step <n> --s <n> -- set Scale Factor (SF) to <n> --S <n> -- build the <n>th step of the data set --T c -- generate cutomers ONLY --T l -- generate nation/region ONLY --T L -- generate lineitem ONLY --T n -- generate nation ONLY --T o -- generate orders/lineitem ONLY --T O -- generate orders ONLY --T p -- generate parts/partsupp ONLY --T P -- generate parts ONLY --T r -- generate region ONLY --T s -- generate suppliers ONLY --T S -- generate partsupp ONLY --U <s> -- generate <s> update sets --v -- enable VERBOSE mode --x <p> -- do hashed pre-partitioning, distributing - flat file records across <p> partitions --y <n> -- actually write hashed flat file records - ONLY for (0-relative) partition number <n> --z <n> -- generate no more than approximately <n> - records, regardless of the scale factor - -NOTE: The -y and -z arguments work ONLY in conjunction - with the -x argument. When generating 'paired' - tables (e.g. Order & Lineitem together), the - <reclimit> value applies to the sum of the rows - generated for the two tables. - -To generate the SF=1 (1GB) database population , use: - dbgen -vfF -s 1 - -To generate the qualification database population (100 MB), use: - - dbgen -vfF -s 0.1 - -To generate updates for a SF=1 (1GB), use: - dbgen -v -O s -s 1 - dbgen -v -U 1 -s 1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/core/sql/regress/seabase/EXPECTED021 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED021 b/core/sql/regress/seabase/EXPECTED021 index 590ab6b..01cb0d5 100644 --- a/core/sql/regress/seabase/EXPECTED021 +++ b/core/sql/regress/seabase/EXPECTED021 @@ -1,7 +1,7 @@ >> >>sh sqlci -i"TEST021(s0)" >> LOG021; -Hewlett-Packard NonStop(TM) SQL/MX Conversational Interface 0.7.0 -(c) Copyright 2003-2010 Hewlett-Packard Development Company, LP. +Apache Trafodion Conversational Interface 2.0.0 +Copyright (c) 2015 Apache Software Foundation >>?section s0 >>initialize trafodion, drop; @@ -15,8 +15,8 @@ End of MXCI Session >> >>sh sqlci -i"TEST021(s1)" >> LOG021; -Hewlett-Packard NonStop(TM) SQL/MX Conversational Interface 0.7.0 -(c) Copyright 2003-2010 Hewlett-Packard Development Company, LP. +Apache Trafodion Conversational Interface 2.0.0 +Copyright (c) 2015 Apache Software Foundation >>?section s1 >>initialize trafodion; @@ -28,8 +28,8 @@ End of MXCI Session >> >>sh sqlci -i"TEST021(s11)" >> LOG021; -Hewlett-Packard NonStop(TM) SQL/MX Conversational Interface 0.7.0 -(c) Copyright 2003-2010 Hewlett-Packard Development Company, LP. +Apache Trafodion Conversational Interface 2.0.0 +Copyright (c) 2015 Apache Software Foundation >>?section s11 >>create table t021 (a int not null); @@ -73,8 +73,8 @@ End of MXCI Session >> >>sh sqlci -i"TEST021(s2)" >> LOG021; -Hewlett-Packard NonStop(TM) SQL/MX Conversational Interface 0.7.0 -(c) Copyright 2003-2010 Hewlett-Packard Development Company, LP. +Apache Trafodion Conversational Interface 2.0.0 +Copyright (c) 2015 Apache Software Foundation >>?section s2 >>set parserflags 131072; @@ -124,8 +124,8 @@ End of MXCI Session >> >>sh sqlci -i"TEST021(s3)" >> LOG021; -Hewlett-Packard NonStop(TM) SQL/MX Conversational Interface 0.7.0 -(c) Copyright 2003-2010 Hewlett-Packard Development Company, LP. +Apache Trafodion Conversational Interface 2.0.0 +Copyright (c) 2015 Apache Software Foundation >>?section s3 >>initialize trafodion, upgrade; Metadata Upgrade: started @@ -174,10 +174,10 @@ End of MXCI Session >> >>sh sqlci -i"TEST021(s4)" >> LOG021; -Hewlett-Packard NonStop(TM) SQL/MX Conversational Interface 0.7.0 -(c) Copyright 2003-2010 Hewlett-Packard Development Company, LP. +Apache Trafodion Conversational Interface 2.0.0 +Copyright (c) 2015 Apache Software Foundation >>?section s4 ->>select * from trafodion."_MD_".indexes; +select * from trafodion."_MD_".indexes; BASE_TABLE_UID KEYTAG IS_UNIQUE KEY_COLCOUNT NONKEY_COLCOUNT IS_EXPLICIT INDEX_UID -------------------- ----------- ----------- ------------ --------------- ----------- -------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/core/sql/regress/tools/regress-filter ---------------------------------------------------------------------- diff --git a/core/sql/regress/tools/regress-filter b/core/sql/regress/tools/regress-filter index a5a8ddc..060260d 100755 --- a/core/sql/regress/tools/regress-filter +++ b/core/sql/regress/tools/regress-filter @@ -254,10 +254,6 @@ s/^\([A-Za-z0-9]\+\.m[df]?\)[ ]\+([A-Za-z]:\\\\.\+\\\\\(.\+\..\+\..\+\))/\1 (\2) /^[A-Za-z0-9]*\.mdf[ ]*([A-Za-z0-9]*\.[A-Za-z0-9]*\.[A-Za-z0-9]*)/s/[ ]*([A-Za-z0-9]*\.[A-Za-z0-9]*/ (#CAT.#SCH/ s/^NonStop SQL\/MX \([A-Za-z\/ +]*\) [0-9][0-9]*\.[0-9][0-9]*$/\1 #n.#n/ /^Copyright (c).*All Rights Reserved. *$/s/[0-9]/#/g -/^Copyright (c).*All Rights Reserved. *$/s/Tandem[^.]*\./#CPQ#TDM#./ -/^Copyright (c).*All Rights Reserved. *$/s/Compaq[^.]*\./#CPQ#TDM#./ -/^(c) Copyright [0-9][0-9][0-9][0-9] Hewlett-Packard Development Company.*$/s/^.*$/Copyright (c) ####-#### #CPQ#TDM#\. All Rights Reserved./ -/^(c) Copyright [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] Hewlett-Packard Development Company.*$/s/^.*$/Copyright (c) ####-#### #CPQ#TDM#\. All Rights Reserved./ /^[Hh]istory file .* Access is denied/d s/^\(MESSAGEFILE [ ]*\).*/\1#f/ /^MESSAGEFILE VRSN[ ]*{/s/{.*/#v/ @@ -296,7 +292,6 @@ s/^\([ ][ ]*[0-9][0-9]*[ ][ ]*[0-9][0-9]*[ ][ ]*CAT.SCH\)[A-Z][0-9A-Z][0-9A-Z]\( s/^--- SQL operation completed with errors./--- SQL operation failed with errors./ # Filter out Microsoft compiler and linker information s/Microsoft (R) .*/Microsoft (R) xxxxxx/g -s/Copyright (C) Microsoft Corp.*/Copyright (C) Microsoft Corp xxxxxx/g # ... NonStop(TM) SQL/MX Compiler 2.0 # ^^^ http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/core/sql/regress/tools/regress-filter-linux ---------------------------------------------------------------------- diff --git a/core/sql/regress/tools/regress-filter-linux b/core/sql/regress/tools/regress-filter-linux index 003d392..f345fd2 100755 --- a/core/sql/regress/tools/regress-filter-linux +++ b/core/sql/regress/tools/regress-filter-linux @@ -320,10 +320,6 @@ s/^\([A-Za-z0-9]\+\.m[df]?\)[ ]\+([A-Za-z]:\\\\.\+\\\\\(.\+\..\+\..\+\))/\1 (\2) /^[A-Za-z0-9]*\.mdf[ ]*([A-Za-z0-9]*\.[A-Za-z0-9]*\.[A-Za-z0-9]*)/s/[ ]*([A-Za-z0-9]*\.[A-Za-z0-9]*/ (#CAT.#SCH/ s/^NonStop SQL\/MX \([A-Za-z\/ +]*\) [0-9][0-9]*\.[0-9][0-9]*$/\1 #n.#n/ /^Copyright (c).*All Rights Reserved. *$/s/[0-9]/#/g -/^Copyright (c).*All Rights Reserved. *$/s/Tandem[^.]*\./#CPQ#TDM#./ -/^Copyright (c).*All Rights Reserved. *$/s/Compaq[^.]*\./#CPQ#TDM#./ -/^(c) Copyright [0-9][0-9][0-9][0-9] Hewlett-Packard Development Company.*$/s/^.*$/Copyright (c) ####-#### #CPQ#TDM#\. All Rights Reserved./ -/^(c) Copyright [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] Hewlett-Packard Development Company.*$/s/^.*$/Copyright (c) ####-#### #CPQ#TDM#\. All Rights Reserved./ s/^Copyright (c) .*/Copyright (c) ######/ /^[Hh]istory file .* Access is denied/d s/^\(MESSAGEFILE [ ]*\).*/\1#f/ @@ -366,7 +362,6 @@ s/^\([ ][ ]*[0-9][0-9]*[ ][ ]*[0-9][0-9]*[ ][ ]*CAT.SCH\)[A-Z][0-9A-Z][0-9A-Z]\( s/^--- SQL operation completed with errors./--- SQL operation failed with errors./ # Filter out Microsoft compiler and linker information s/Microsoft (R) .*/Microsoft (R) xxxxxx/g -s/Copyright (C) Microsoft Corp.*/Copyright (C) Microsoft Corp xxxxxx/g #Added for nist test nist586 s/nist586\.mdf.*/nist586.mdf/g http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/core/sql/regress/udr/EXPECTED100.SB ---------------------------------------------------------------------- diff --git a/core/sql/regress/udr/EXPECTED100.SB b/core/sql/regress/udr/EXPECTED100.SB index f7ac514..8ceca90 100644 --- a/core/sql/regress/udr/EXPECTED100.SB +++ b/core/sql/regress/udr/EXPECTED100.SB @@ -1706,8 +1706,8 @@ OUT2 >> >>obey TEST100(udrtrace); >>log; -Conversational Interface @version@ -(c) Copyright 2014 Hewlett-Packard Development Company, LP. +Apache Trafodion Conversational Interface 2.0.0 +Copyright (c) 2015 Apache Software Foundation >>?section udrtrace2 >>-- >>-- This section will be executed by the mxci fired off while executing http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/core/updateCopyrightCheck.py ---------------------------------------------------------------------- diff --git a/core/updateCopyrightCheck.py b/core/updateCopyrightCheck.py index 6ccdd72..73b531d 100644 --- a/core/updateCopyrightCheck.py +++ b/core/updateCopyrightCheck.py @@ -202,11 +202,12 @@ for line in gitProcess.stdout: if parseResult: # The copyright line of interest looks like: # - # // (x) Copyright 1998-2014 Hewlett-Packard Development Company, L.P. + # // (x) <xxxxxxxxx> 1998-2014 Hewlett-Packard Development Company, L.P. # - # (It is actually (C), not (x); I obfuscated the comment so this + # (It is actually (C), not (x) and Copyright not <xxxxxxxxx>. + # I obfuscated the comment so this # script wouldn't mistakenly report itself as having multiple - # copyrights :-) + # copyrights and to pass copyright checks from Apache :-) # # Of course the comment delimiter will vary with the file language. cmdGrep = ['grep', http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/dcs/LICENSE.txt ---------------------------------------------------------------------- diff --git a/dcs/LICENSE.txt b/dcs/LICENSE.txt deleted file mode 100644 index d645695..0000000 --- a/dcs/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/dcs/NOTICE.txt ---------------------------------------------------------------------- diff --git a/dcs/NOTICE.txt b/dcs/NOTICE.txt deleted file mode 100644 index 48780e0..0000000 --- a/dcs/NOTICE.txt +++ /dev/null @@ -1,7 +0,0 @@ -This product includes software developed by The Apache Software -Foundation (http://www.apache.org/). - -In addition, this product includes software developed by: - -JUnit (http://www.junit.org/) included under the Common Public License v1.0. See -the full text here: http://junit.sourceforge.net/cpl-v10.html \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/dcs/src/main/java/org/trafodion/dcs/util/ByteBufferUtils.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/util/ByteBufferUtils.java b/dcs/src/main/java/org/trafodion/dcs/util/ByteBufferUtils.java index 699463a..49325d3 100644 --- a/dcs/src/main/java/org/trafodion/dcs/util/ByteBufferUtils.java +++ b/dcs/src/main/java/org/trafodion/dcs/util/ByteBufferUtils.java @@ -1,6 +1,4 @@ /* - * Copyright 2015 the original author or authors. - * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/dcs/src/main/java/org/trafodion/dcs/util/SqlUtils.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/util/SqlUtils.java b/dcs/src/main/java/org/trafodion/dcs/util/SqlUtils.java index e90a301..2bb7f80 100644 --- a/dcs/src/main/java/org/trafodion/dcs/util/SqlUtils.java +++ b/dcs/src/main/java/org/trafodion/dcs/util/SqlUtils.java @@ -1,6 +1,4 @@ /* - * Copyright 2015 the original author or authors. - * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/dcs/src/main/resources/dcs-webapps/master/css/stylesheet.css ---------------------------------------------------------------------- diff --git a/dcs/src/main/resources/dcs-webapps/master/css/stylesheet.css b/dcs/src/main/resources/dcs-webapps/master/css/stylesheet.css deleted file mode 100644 index 55ad4a1..0000000 --- a/dcs/src/main/resources/dcs-webapps/master/css/stylesheet.css +++ /dev/null @@ -1,191 +0,0 @@ -@charset "UTF-8"; -/* --- CSS Document by Codify Design Studio - codifydesign.com --- */ - -body { - margin: 0px; - color: #777777; - font-size: 12px; - font-family: Arial; - font-family: Georgia, "Times New Roman", Times, serif; - background-color: #FFFFFF; -} - -h1 { - color: #25476C; - font-size: 24px; - font-weight: normal; - margin: 3px 0px 3px 0px; -} -h2 { - color: #214265; - font-size: 14px; - font-weight: normal; - margin: 0px 0px 15px 0px; -} -h3 { - color: #244669; - margin-top: 12px; - margin-bottom: 0px; -} -p { - margin-top: 0px; - margin-right: 0px; - margin-bottom: 12px; - margin-left: 0px; -} -a { - color: #36C; -} -a:visited { color: black; } -a:hover { color: #5872f4; } - -.container { - width: auto; - margin-left: auto; - margin-right: auto; -} - - -/* BANNER AREA */ -.bannerArea { - width: 100%; - height: 50px; - background-color: #3BAAE3; - background-repeat: repeat-x; - background-position: 50% 50%; -} - -.bannerArea .container { - width: auto; - height:83px; - background-repeat: no-repeat; - padding-right: 10px; - padding-left: 10px; -} - -.bannernav { - padding-top: 20px; - float: right; - color: #112c4c; - font-size: 10px; - font-family: Arial, Helvetica, Verdana, sans-serif; -} - -.bannernav a { color: #ffffff; text-decoration: none; } -.bannernav a:visited { color: #ffffff; } -.bannernav a:hover { - color: #112c4c; - text-decoration: none; - font-family: Arial, Helvetica, Verdana, sans-serif; -} - -.toplogo { - padding-left: 5px; - padding-top: 5px; -} - - -/* TOP NAVIGATION AREA */ -.topnavigationArea { - background-repeat:repeat-x; - background-color: #436d9c; - background-image: url(images/topnav_bkgd.jpg); -} -.topnavigationArea .container { - background-image: url(images/topnav_bkgd.jpg); - background-repeat:repeat-x; - background-color: #436d9c; - width: 980px; -} - -.topnavigationgroup { - margin: 0px; - float: right; - padding-right: 1px; -} -.topnavigationgroup ul { - margin: 0px; -} - -.topnavigationitem { - max-width: 167px; - margin-left: 0px; - padding-left: 10px; - padding-top: 9px; - padding-right: 10px; - padding-bottom: 9px; - border-left-style: solid; - border-left-width: 1px; - border-right-style: none; - border-right-width: 1px; - color: white; - font-size: 14px; - font-weight: bold; - font-family: Arial, Helvetica, Verdana, sans-serif; - float: left; -} - -/* CONTENT AREA */ -.contentArea { - width: 100%; - background-color: #f0eff0; - background-image: url(images/content_bkgd_tile.jpg); - background-repeat: repeat-x; - height: 100%; -} - - -.contentArea .container { - padding-top: 30px; - padding-bottom: 30px; - background-repeat: repeat; - background-color: #f2f2f2; - background-image: url(images/content_bkgd_tile.jpg); - padding-left: 10px; - padding-right: 10px; -} - -.contentleft { - width: auto; - padding-left: 40px; - padding-right: 40px; - float: left; - border-right-style: solid; - border-right-width: 1px; -} - -.contentright { - padding-top: 20px; - float: left; - padding-left: 30px; - - width: 210px; -} - -.imageright { - margin-left: 5px; - float: right; -} - - -/* FOOTER AREA */ -.footerArea { - width: 100%; - background-color: #DEEDF7; - background-repeat: repeat-x; - background-image: url(images/ui-bg_highlight-soft_33_003147_1x100.png); - background-position: 50% 50%; -} - -.footerArea .container { - height: 40px; - background-repeat: repeat-x; -} - -.copyright { - padding-left: 40px; - padding-top: 12px; - color: #FFF; - font-size: 12px; - font-family: Arial, Helvetica, Verdana, sans-serif; -} http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/docs/client_install/source/Trafodion_Client_Installation_Guide.xml ---------------------------------------------------------------------- diff --git a/docs/client_install/source/Trafodion_Client_Installation_Guide.xml b/docs/client_install/source/Trafodion_Client_Installation_Guide.xml index 85ac48b..947d709 100755 --- a/docs/client_install/source/Trafodion_Client_Installation_Guide.xml +++ b/docs/client_install/source/Trafodion_Client_Installation_Guide.xml @@ -24,7 +24,7 @@ --> <!--Arbortext, Inc., 1988-2014, v.4002--> -<!DOCTYPE book PUBLIC "-//Hewlett-Packard ESS//DTD DocBook Extension//EN" +<!DOCTYPE book PUBLIC "-//Apache Software Foundation (ASF)//DTD DocBook Extension//EN" "ess.dtd"> <book> <title>Trafodion Client Installation Guide</title> @@ -35,7 +35,7 @@ <abstract condition="hidden"> <para>Last updated: 04/21/2015</para> </abstract> -<copyright><year>2015</year><holder>Hewlett-Packard Development Company, +<copyright><year>2015</year><holder>Apache Software Foundation (ASF), L.P.</holder></copyright> <legalnotice> <!--WRITER'S NOTE: HP legal notice for open source release--> @@ -2899,7 +2899,7 @@ role="select:quotedtitle page"/></para></listitem> >basicsql.cpp</filename>:</para> <programlisting><![CDATA[// @@@ START COPYRIGHT @@@ // -// (C) Copyright 2010-2015 Hewlett-Packard Development Company, L.P. +// (C) Copyright 2010-2015 Apache Software Foundation (ASF) // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/docs/client_install/source/xml-profile.xml ---------------------------------------------------------------------- diff --git a/docs/client_install/source/xml-profile.xml b/docs/client_install/source/xml-profile.xml index 0e9b317..4a470f7 100755 --- a/docs/client_install/source/xml-profile.xml +++ b/docs/client_install/source/xml-profile.xml @@ -23,7 +23,7 @@ --> <!--Arbortext, Inc., 1988-2014, v.4002--> -<!DOCTYPE xidi:xidi PUBLIC "-//Hewlett-Packard//DTD XIDI Specifications V1.0//EN" +<!DOCTYPE xidi:xidi PUBLIC "-//Apache Software Foundation (ASF)//DTD XIDI Specifications V1.0//EN" "xidi-xidi.dtd"> <xidi:xidi> <!--Profiling Information--> http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/docs/command_interface/source/Trafodion_Command_Interface_Guide.xml ---------------------------------------------------------------------- diff --git a/docs/command_interface/source/Trafodion_Command_Interface_Guide.xml b/docs/command_interface/source/Trafodion_Command_Interface_Guide.xml index bb668ee..9dadb5a 100755 --- a/docs/command_interface/source/Trafodion_Command_Interface_Guide.xml +++ b/docs/command_interface/source/Trafodion_Command_Interface_Guide.xml @@ -24,7 +24,7 @@ --> <!--Arbortext, Inc., 1988-2014, v.4002--> -<!DOCTYPE book PUBLIC "-//Hewlett-Packard ESS//DTD DocBook Extension//EN" +<!DOCTYPE book PUBLIC "-//Apache Software Foundation (ASF)//DTD DocBook Extension//EN" "ess.dtd"> <book> <title>Trafodion Command Interface Guide</title> @@ -35,8 +35,8 @@ <abstract condition="hidden"> <para>Last updated: 5/28/2014</para> </abstract> -<copyright><year>2014</year><holder>Hewlett-Packard Development Company, -L.P.</holder></copyright> +<copyright><year>2015</year><holder> Apache Software Foundation (ASF), +</holder></copyright> <legalnotice> <!--WRITER'S NOTE: HP legal notice for open source release--> <title>Legal Notice</title> @@ -749,8 +749,8 @@ trafci.cmd -h 16.123.456.78:23400 -u user1 âp xxxxxx</programlisting> ./trafci.sh -h 16.123.456.78:23400 -u user1 -p xxxxxx</programlisting> <para>TrafCI launches and prompts you to enter an SQL statement or an interface command:</para> -<programlisting>Welcome to Trafodion Command Interface -Copyright(C) 2013â2014 Hewlett-Packard Development Company, L.P. +<programlisting>Welcome to Apache Trafodion Command Interface +Copyright(C) 2015 Apache Software Foundation (ASF) Connected to Trafodion @@ -775,8 +775,8 @@ of three retries, before it closes the session.</para> you to reenter the host name. For example:</para> <screen><computeroutput>trafci âh dd -Welcome to Trafodion Command Interface -Copyright(C) 2013â2014 Hewlett-Packard Development Company, L.P. +Welcome to Apache Trafodion Command Interface +Copyright(C) 2015 Apache Software Foundation Unknown Host: dd @@ -796,8 +796,8 @@ name and password. After three unsuccessful retries, the session is terminated:</para> <screen><computeroutput>trafci âh 172.16.1.1 âu user1 âp x -Welcome to Trafodion Command Interface -Copyright(C) 2013â2014 Hewlett-Packard Development Company, L.P. +Welcome to Apache Trafodion Command Interface +Copyright(C) 2015 Apache Software Foundation *** ERROR[8837] CLI Authentication : User: user1 : invalid username or password [2014-03-12 16:23:44] @@ -1048,7 +1048,7 @@ Password: --- SQL operation complete. -C:\Program Files (x86)\Hewlett-Packard\Trafodion Command Interface\bin>_</programlisting> +C:\Program Files (x86)\Apache Software Foundation\Apache Trafodion Command Interface\bin>_</programlisting> </section> <section> <title>Example of Running an Interface Command With âq or âsql</title> @@ -1133,8 +1133,8 @@ did not specify <literal>âh</literal>, <literal>âu</literal>, and <literal >âp</literal><phrase condition="hidden">, and <literal>âdsn</literal ></phrase> on the command line), and runs the commands in the script file:</para> -<programlisting>Welcome to Trafodion Command Interface -Copyright(C) 2013â2014 Hewlett-Packard Development Company, L.P. +<programlisting>Welcome to Apache Trafodion Command Interface +Copyright(C) 2015 Apache Software Foundation Host Name/IP Address: 16.123.456.78:23400 User Name: user1 @@ -1204,8 +1204,8 @@ they are ignored.</para> <!--WRITER'S NOTE: Updated based on the current behavior (2/4/2014):--> <programlisting>./trafci.sh âversion -Welcome to Trafodion Command Interface -Copyright(C) 2013â2014 Hewlett-Packard Development Company, L.P. +Welcome to Apache Trafodion Command Interface +Copyright(C) 2015 Apache Software Foundation Trafodion JDBC Type 4 Driver : Traf_JDBC_Type4_Build_40646 Trafodion Command Interface : TrafCI_Build_40646</programlisting> @@ -2790,7 +2790,7 @@ at a command prompt. For example:</para> </itemizedlist> <section id="i1005875"> <title>Example of a Perl Program (sample.pl)</title> -<programlisting>use lib 'C:\\Program Files (x86)\\Hewlett-Packard\\Trafodion Command Interface\\lib\\perl'; +<programlisting>use lib 'C:\\Program Files (x86)\\Apache Software Foundation\\Apache Trafodion Command Interface\\lib\\perl'; use Session; # create a new session @@ -2815,7 +2815,7 @@ $sess->disconnect(); <programlisting>import os import sys ## Modify this path -sys.path.append("C:\\Program Files (x86)\\Hewlett-Packard\\Trafodion Command Interface\\lib\\python") +sys.path.append("C:\\Program Files (x86)\\Apache Software Foundation\\Apache Trafodion Command Interface\\lib\\python") import Session # create a new session @@ -3353,7 +3353,7 @@ names, TrafCI uses the current catalog and schema.</para></listitem> <listitem><para>is the directory of the JAR file on the client workstation. If you omit the directory, TrafCI searches for the JAR file in the same location as the TrafCI Windows launch file, <filename>trafci.cmd</filename ->, in <filename class="directory">C:\Program Files (x86)\Hewlett-Packard\Trafodion +>, in <filename class="directory">C:\Program Files (x86)\Apache Software Foundation\Apache Trafodion Command Interface\bin</filename>.</para></listitem> </varlistentry> <varlistentry><term><replaceable>jar-file-name</replaceable></term> @@ -4732,7 +4732,7 @@ the folder. </para> Volume in drive C is E-Client Volume Serial Number is DC4F-5B3B -Directory of c:\Program Files (x86)\Hewlett-Packard\Trafodion Command Interface\bin +Directory of c:\Program Files (x86)\Apache Software Foundation\Apache Trafodion Command Interface\bin 05/11/2014 01:17 PM <DIR> 05/11/2014 01:17 PM <DIR> @@ -4974,7 +4974,7 @@ names, TrafCI uses the current catalog and schema.</para></listitem> <listitem><para>is the directory of the JAR file on the client workstation. If you omit the directory, TrafCI searches for the JAR file in the same location as the TrafCI Windows launch file, <filename>trafci.cmd</filename ->, in <filename class="directory">C:\Program Files (x86)\Hewlett-Packard\Trafodion +>, in <filename class="directory">C:\Program Files (x86)\Apache Software Foundation\Apache Trafodion Command Interface\bin</filename>.</para></listitem> </varlistentry> <varlistentry><term><replaceable>jar-file-name</replaceable></term> @@ -9825,9 +9825,9 @@ SQL> > parameter, the VERSION command displays only TrafCI and the Trafodion JDBC Type 4 Driver versions.</para> <!--WRITER'S NOTE: Updated output based on the current behavior (5/28/2014).--> -<programlisting>C:\Program Files (x86)\Hewlett-Packard\Trafodion Command Interface\bin>trafci -noconnect -Welcome to Trafodion Command Interface -Copyright(C) 2013â2014 Hewlett-Packard Development Company, L.P. +<programlisting>C:\Program Files (x86)\Apache Software Foundation\Apache Trafodion Command Interface\bin>trafci -noconnect +Welcome to Apache Trafodion Command Interface +Copyright(C) 2015 Apache Software Foundation Not connected. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a085965/docs/command_interface/source/xml-profile.xml ---------------------------------------------------------------------- diff --git a/docs/command_interface/source/xml-profile.xml b/docs/command_interface/source/xml-profile.xml index 0e9b317..4a470f7 100755 --- a/docs/command_interface/source/xml-profile.xml +++ b/docs/command_interface/source/xml-profile.xml @@ -23,7 +23,7 @@ --> <!--Arbortext, Inc., 1988-2014, v.4002--> -<!DOCTYPE xidi:xidi PUBLIC "-//Hewlett-Packard//DTD XIDI Specifications V1.0//EN" +<!DOCTYPE xidi:xidi PUBLIC "-//Apache Software Foundation (ASF)//DTD XIDI Specifications V1.0//EN" "xidi-xidi.dtd"> <xidi:xidi> <!--Profiling Information-->
