You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/07/06 03:59:23 UTC
[45/51] [abbrv] [partial] trafodion-site git commit: Publish Website
Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from
Hive to Trafodion* in *Trafodion SQL Reference Manual*
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/deprecated-list.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/deprecated-list.html b/docs/2.3.0/dcs_reference/apidocs/deprecated-list.html
index 0e72ce8..aa9d86f 100644
--- a/docs/2.3.0/dcs_reference/apidocs/deprecated-list.html
+++ b/docs/2.3.0/dcs_reference/apidocs/deprecated-list.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
@@ -143,3 +144,146 @@
<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
</body>
</html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>已过时的列表 (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="\u5DF2\u8FC7\u65F6\u7684\u5217\u8868 (Trafodion Database Connectivity Services 2.3.0 API)";
+ }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!-- -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="overview-summary.html">概览</a></li>
+<li>程序包</li>
+<li>类</li>
+<li>使用</li>
+<li><a href="overview-tree.html">树</a></li>
+<li class="navBarCell1Rev">已过时</li>
+<li><a href="index-all.html">索引</a></li>
+<li><a href="help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">框架</a></li>
+<li><a href="deprecated-list.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="已过时的 API" class="title">已过时的 API</h1>
+<h2 title="目录">目录</h2>
+<ul>
+<li><a href="#method">已过时的方法</a></li>
+</ul>
+</div>
+<div class="contentContainer"><a name="method">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="已过时的方法表, 列表已过时的方法和解释">
+<caption><span>已过时的方法</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colOne" scope="col">方法和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="org/trafodion/dcs/http/HttpServer.html#addInternalServlet(java.lang.String,%20java.lang.String,%20java.lang.Class)">org.trafodion.dcs.http.HttpServer.addInternalServlet(String, String, Class<? extends HttpServlet>)</a>
+<div class="block"><i>this is a temporary method</i></div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!-- -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="overview-summary.html">概览</a></li>
+<li>程序包</li>
+<li>类</li>
+<li>使用</li>
+<li><a href="overview-tree.html">树</a></li>
+<li class="navBarCell1Rev">已过时</li>
+<li><a href="index-all.html">索引</a></li>
+<li><a href="help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">框架</a></li>
+<li><a href="deprecated-list.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/help-doc.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/help-doc.html b/docs/2.3.0/dcs_reference/apidocs/help-doc.html
index cb306e3..1c78c81 100644
--- a/docs/2.3.0/dcs_reference/apidocs/help-doc.html
+++ b/docs/2.3.0/dcs_reference/apidocs/help-doc.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
@@ -224,3 +225,227 @@
<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
</body>
</html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>API 帮助 (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="API \u5E2E\u52A9 (Trafodion Database Connectivity Services 2.3.0 API)";
+ }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!-- -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="overview-summary.html">概览</a></li>
+<li>程序包</li>
+<li>类</li>
+<li>使用</li>
+<li><a href="overview-tree.html">树</a></li>
+<li><a href="deprecated-list.html">已过时</a></li>
+<li><a href="index-all.html">索引</a></li>
+<li class="navBarCell1Rev">帮助</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">框架</a></li>
+<li><a href="help-doc.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">此 API 文档的组织方式</h1>
+<div class="subTitle">此 API (应用程序编程接口) 文档包含对应于导航栏中的项目的页面, 如下所述。</div>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2>概览</h2>
+<p><a href="overview-summary.html">概览</a> 页面是此 API 文档的首页, 提供了所有程序包的列表及其概要。此页面也可能包含这些程序包的总体说明。</p>
+</li>
+<li class="blockList">
+<h2>程序包</h2>
+<p>每个程序包都有一个页面, 其中包含它的类和接口的列表及其概要。此页面可以包含六个类别:</p>
+<ul>
+<li>接口 (斜体)</li>
+<li>类</li>
+<li>枚举</li>
+<li>异常错误</li>
+<li>错误</li>
+<li>注释类型</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>类/接口</h2>
+<p>每个类, 接口, 嵌套类和嵌套接口都有各自的页面。其中每个页面都由三部分 (类/接口说明, 概要表, 以及详细的成员说明) 组成:</p>
+<ul>
+<li>类继承图</li>
+<li>直接子类</li>
+<li>所有已知子接口</li>
+<li>所有已知实现类</li>
+<li>类/接口声明</li>
+<li>类/接口说明</li>
+</ul>
+<ul>
+<li>嵌套类概要</li>
+<li>字段概要</li>
+<li>构造器概要</li>
+<li>方法概要</li>
+</ul>
+<ul>
+<li>字段详细资料</li>
+<li>构造器详细资料</li>
+<li>方法详细资料</li>
+</ul>
+<p>每个概要条目都包含该项目的详细说明的第一句。概要条目按字母顺序排列, 而详细说明则按其在源代码中出现的顺序排列。这样保持了程序员所建立的逻辑分组。</p>
+</li>
+<li class="blockList">
+<h2>注释类型</h2>
+<p>每个注释类型都有各自的页面, 其中包含以下部分:</p>
+<ul>
+<li>注释类型声明</li>
+<li>注释类型说明</li>
+<li>必需元素概要</li>
+<li>可选元素概要</li>
+<li>元素详细资料</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>枚举</h2>
+<p>每个枚举都有各自的页面, 其中包含以下部分:</p>
+<ul>
+<li>枚举声明</li>
+<li>枚举说明</li>
+<li>枚举常量概要</li>
+<li>枚举常量详细资料</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>使用</h2>
+<p>每个已文档化的程序包, 类和接口都有各自的“使用”页面。此页面介绍了使用给定类或程序包的任何部分的程序包, 类, 方法, 构造器和字段。对于给定的类或接口 A, 其“使用”页面包含 A 的子类, 声明为 A 的字段, 返回 A 的方法, 以及带有类型为 A 的参数的方法和构造器。访问此页面的方法是: 首先转至程序包, 类或接口, 然后单击导航栏中的 "使用" 链接。</p>
+</li>
+<li class="blockList">
+<h2>树 (类分层结构)</h2>
+<p>对于所有程序包, 有一个 <a href="overview-tree.html">类分层结构</a> 页面, 以及每个程序包的分层结构。每个分层结构页面都包含类的列表和接口的列表。从 <code>java.lang.Object</code> 开始, 按继承结构对类进行排列。接口不从 <code>java.lang.Object</code> 继承。</p>
+<ul>
+<li>查看“概览”页面时, 单击 "树" 将显示所有程序包的分层结构。</li>
+<li>查看特定程序包, 类或接口页面时, 单击 "树" 将仅显示该程序包的分层结构。</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>已过时的 API</h2>
+<p><a href="deprecated-list.html">已过时的 API</a> 页面列出了所有已过时的 API。一般由于进行了改进并且通常提供了替代的 API, 所以建议不要使用已过时的 API。在将来的实现过程中, 可能会删除已过时的 API。</p>
+</li>
+<li class="blockList">
+<h2>索引</h2>
+<p><a href="index-all.html">索引</a> 包含按字母顺序排列的所有类, 接口, 构造器, 方法和字段的列表。</p>
+</li>
+<li class="blockList">
+<h2>上一个/下一个</h2>
+<p>这些链接使您可以转至下一个或上一个类, 接口, 程序包或相关页面。</p>
+</li>
+<li class="blockList">
+<h2>框架/无框架</h2>
+<p>这些链接用于显示和隐藏 HTML 框架。所有页面均具有有框架和无框架两种显示方式。</p>
+</li>
+<li class="blockList">
+<h2>所有类</h2>
+<p><a href="allclasses-noframe.html">所有类</a>链接显示所有类和接口 (除了非静态嵌套类型)。</p>
+</li>
+<li class="blockList">
+<h2>序列化表格</h2>
+<p>每个可序列化或可外部化的类都有其序列化字段和方法的说明。此信息对重新实现者有用, 而对使用 API 的开发者则没有什么用处。尽管导航栏中没有链接, 但您可以通过下列方式获取此信息: 转至任何序列化类, 然后单击类说明的 "另请参阅" 部分中的 "序列化表格"。</p>
+</li>
+<li class="blockList">
+<h2>常量字段值</h2>
+<p><a href="constant-values.html">常量字段值</a>页面列出了静态最终字段及其值。</p>
+</li>
+</ul>
+<em>此帮助文件适用于使用标准 doclet 生成的 API 文档。</em></div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!-- -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="overview-summary.html">概览</a></li>
+<li>程序包</li>
+<li>类</li>
+<li>使用</li>
+<li><a href="overview-tree.html">树</a></li>
+<li><a href="deprecated-list.html">已过时</a></li>
+<li><a href="index-all.html">索引</a></li>
+<li class="navBarCell1Rev">帮助</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">框架</a></li>
+<li><a href="help-doc.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/index-all.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/index-all.html b/docs/2.3.0/dcs_reference/apidocs/index-all.html
index 19ee52e..0577b72 100644
--- a/docs/2.3.0/dcs_reference/apidocs/index-all.html
+++ b/docs/2.3.0/dcs_reference/apidocs/index-all.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
@@ -116,6 +117,122 @@
</dd>
<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addInternalServlet(java.lang.String,%20java.lang.String,%20java.lang.Class,%20boolean,%20boolean)">addInternalServlet(String, String, Class<? extends HttpServlet>, boolean, boolean)</a></span> - Method in class org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="class in org.trafodion.dcs.http">HttpServer</a></dt>
<dd>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>索引 (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="\u7D22\u5F15 (Trafodion Database Connectivity Services 2.3.0 API)";
+ }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!-- -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="./overview-summary.html">概览</a></li>
+<li>程序包</li>
+<li>类</li>
+<li>使用</li>
+<li><a href="./overview-tree.html">树</a></li>
+<li><a href="./deprecated-list.html">已过时</a></li>
+<li class="navBarCell1Rev">索引</li>
+<li><a href="./help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="./index.html?index-all.html" target="_top">框架</a></li>
+<li><a href="index-all.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="./allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="#_A_">A</a> <a href="#_B_">B</a> <a href="#_C_">C</a> <a href="#_D_">D</a> <a href="#_E_">E</a> <a href="#_F_">F</a> <a href="#_G_">G</a> <a href="#_H_">H</a> <a href="#_I_">I</a> <a href="#_J_">J</a> <a href="#_L_">L</a> <a href="#_M_">M</a> <a href="#_N_">N</a> <a href="#_O_">O</a> <a href="#_P_">P</a> <a href="#_Q_">Q</a> <a href="#_R_">R</a> <a href="#_S_">S</a> <a href="#_T_">T</a> <a href="#_U_">U</a> <a href="#_V_">V</a> <a href="#_W_">W</a> <a href="#_Y_">Y</a> <a href="#_Z_">Z</a> <a name="_A_">
+<!-- -->
+</a>
+<h2 class="title">A</h2>
+<dl>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addContext(org.mortbay.jetty.servlet.Context,%20boolean)">addContext(Context, boolean)</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd> </dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addContext(java.lang.String,%20java.lang.String,%20boolean)">addContext(String, String, boolean)</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd>
+<div class="block">Add a context</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addDefaultApps(org.mortbay.jetty.handler.ContextHandlerCollection,%20java.lang.String)">addDefaultApps(ContextHandlerCollection, String)</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd>
+<div class="block">Add default apps.</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addDefaultServlets()">addDefaultServlets()</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd>
+<div class="block">Add default servlets.</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.html#addDescriptor(int,%20org.trafodion.dcs.servermt.serverDriverInputOutput.Descriptor2)">addDescriptor(int, Descriptor2)</a></span> - 类 中的方法org.trafodion.dcs.servermt.serverDriverInputOutput.<a href="./org/trafodion/dcs/servermt/serverDriverInputOutput/Descriptor2List.html" title="org.trafodion.dcs.servermt.serverDriverInputOutput中的类">Descriptor2List</a></dt>
+<dd> </dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/FilterContainer.html#addFilter(java.lang.String,%20java.lang.String,%20java.util.Map)">addFilter(String, String, Map<String, String>)</a></span> - 接口 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/FilterContainer.html" title="org.trafodion.dcs.http中的接口">FilterContainer</a></dt>
+<dd>
+<div class="block">Add a filter to the container.</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addFilter(java.lang.String,%20java.lang.String,%20java.util.Map)">addFilter(String, String, Map<String, String>)</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd>
+<div class="block">Add a filter to the container.</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addFilterPathMapping(java.lang.String,%20org.mortbay.jetty.servlet.Context)">addFilterPathMapping(String, Context)</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd>
+<div class="block">Add the path spec to the filter path mapping.</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/FilterContainer.html#addGlobalFilter(java.lang.String,%20java.lang.String,%20java.util.Map)">addGlobalFilter(String, String, Map<String, String>)</a></span> - 接口 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/FilterContainer.html" title="org.trafodion.dcs.http中的接口">FilterContainer</a></dt>
+<dd>
+<div class="block">Add a global filter to the container.</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addGlobalFilter(java.lang.String,%20java.lang.String,%20java.util.Map)">addGlobalFilter(String, String, Map<String, String>)</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd>
+<div class="block">Add a global filter to the container.</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addInternalServlet(java.lang.String,%20java.lang.String,%20java.lang.Class)">addInternalServlet(String, String, Class<? extends HttpServlet>)</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd>
+<div class="block"><span class="strong">已过时。</span>
+<div class="block"><i>this is a temporary method</i></div>
+</div>
+</dd>
+<dt><span class="strong"><a href="./org/trafodion/dcs/http/HttpServer.html#addInternalServlet(java.lang.String,%20java.lang.String,%20java.lang.Class,%20boolean,%20boolean)">addInternalServlet(String, String, Class<? extends HttpServlet>, boolean, boolean)</a></span> - 类 中的方法org.trafodion.dcs.http.<a href="./org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a></dt>
+<dd>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
<div class="block">Add an internal servlet in the server, specifying whether or not to
protect with Kerberos authentication.</div>
</dd>
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/index.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/index.html b/docs/2.3.0/dcs_reference/apidocs/index.html
index bd55e2d..84d3535 100644
--- a/docs/2.3.0/dcs_reference/apidocs/index.html
+++ b/docs/2.3.0/dcs_reference/apidocs/index.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
<!-- NewPage -->
<html lang="en">
@@ -74,3 +75,80 @@
</noframes>
</frameset>
</html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Trafodion Database Connectivity Services 2.3.0 API</title>
+<script type="text/javascript">
+ targetPage = "" + window.location.search;
+ if (targetPage != "" && targetPage != "undefined")
+ targetPage = targetPage.substring(1);
+ if (targetPage.indexOf(":") != -1 || (targetPage != "" && !validURL(targetPage)))
+ targetPage = "undefined";
+ function validURL(url) {
+ try {
+ url = decodeURIComponent(url);
+ }
+ catch (error) {
+ return false;
+ }
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_' ||
+ ch.charCodeAt(0) > 127) {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
+ function loadFrames() {
+ if (targetPage != "" && targetPage != "undefined")
+ top.classFrame.location = top.targetPage;
+ }
+</script>
+</head>
+<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
+<frameset rows="30%,70%" title="Left frames" onload="top.loadFrames()">
+<frame src="overview-frame.html" name="packageListFrame" title="所有程序包">
+<frame src="allclasses-frame.html" name="packageFrame" title="所有类和接口 (除了非静态嵌套类型)">
+</frameset>
+<frame src="overview-summary.html" name="classFrame" title="程序包, 类和接口说明" scrolling="yes">
+<noframes>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<h2>框架预警</h2>
+<p>请使用框架功能查看此文档。如果看到此消息, 则表明您使用的是不支持框架的 Web 客户机。链接到<a href="overview-summary.html">非框架版本</a>。</p>
+</noframes>
+</frameset>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/Constants.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/Constants.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/Constants.html
index 6d9d2ba..7eca8ad 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/Constants.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/Constants.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
@@ -293,6 +294,299 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<tr class="altColor">
<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_SERVER_CHECK_TCPIPPORT_ATTEMPTS">DCS_SERVER_CHECK_TCPIPPORT_ATTEMPTS</a></strong></code>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:26 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Constants (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Constants (Trafodion Database Connectivity Services 2.3.0 API)";
+ }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!-- -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/Constants.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../index-all.html">索引</a></li>
+<li><a href="../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个类</li>
+<li><a href="../../../org/trafodion/dcs/VersionAnnotation.html" title="org.trafodion.dcs中的注释"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/trafodion/dcs/Constants.html" target="_top">框架</a></li>
+<li><a href="Constants.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要: </li>
+<li>嵌套 | </li>
+<li><a href="#field_summary">字段</a> | </li>
+<li>构造器 | </li>
+<li><a href="#methods_inherited_from_class_java.lang.Object">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料: </li>
+<li><a href="#field_detail">字段</a> | </li>
+<li>构造器 | </li>
+<li>方法</li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs</div>
+<h2 title="类 Constants" class="title">类 Constants</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.Constants</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="strong">Constants</span>
+extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="java.lang中的类或接口">Object</a></pre>
+<div class="block">Constants holds a bunch of dcs-related constants</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_summary">
+<!-- -->
+</a>
+<h3>字段概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="字段概要表, 列表字段和解释">
+<caption><span>字段</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">字段和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#CLIENT_PORT_STR">CLIENT_PORT_STR</a></strong></code>
+<div class="block">The ZK client port key in the ZK properties map.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#CPU_WINDOW">CPU_WINDOW</a></strong></code>
+<div class="block">window for calculating cpu busy</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#CQD_ESTIMATE_HBASE_ROW_COUNT_OFF">CQD_ESTIMATE_HBASE_ROW_COUNT_OFF</a></strong></code>
+<div class="block">CQD to turn table stats off</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_CLOUD_COMMAND">DCS_CLOUD_COMMAND</a></strong></code>
+<div class="block">DCS cloud command</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_DNS_INTERFACE">DCS_DNS_INTERFACE</a></strong></code>
+<div class="block">Configuration key for DCS DNS interface</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_AUTHORIZATION">DCS_MASTER_AUTHORIZATION</a></strong></code>
+<div class="block">DcsMaster authorization feature</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_AUTHORIZATION_IS_ENABLED">DCS_MASTER_AUTHORIZATION_IS_ENABLED</a></strong></code>
+<div class="block">DcsMaster authorization is enabled</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_AUTHORIZATION_IS_NOT_ENABLED">DCS_MASTER_AUTHORIZATION_IS_NOT_ENABLED</a></strong></code>
+<div class="block">DcsMaster authorization is not enabled</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_FLOATING_IP">DCS_MASTER_FLOATING_IP</a></strong></code>
+<div class="block">DcsMaster Floating IP feature</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_FLOATING_IP_COMMAND">DCS_MASTER_FLOATING_IP_COMMAND</a></strong></code>
+<div class="block">DcsMaster floating IP command</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_FLOATING_IP_EXTERNAL_INTERFACE">DCS_MASTER_FLOATING_IP_EXTERNAL_INTERFACE</a></strong></code>
+<div class="block">DcsMaster Floating IP external interface</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_FLOATING_IP_EXTERNAL_IP_ADDRESS">DCS_MASTER_FLOATING_IP_EXTERNAL_IP_ADDRESS</a></strong></code>
+<div class="block">DcsMaster Floating IP external IP address</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_FLOATING_IP_IS_ENABLED">DCS_MASTER_FLOATING_IP_IS_ENABLED</a></strong></code>
+<div class="block">DcsMaster Floating IP is enabled</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_FLOATING_IP_IS_NOT_ENABLED">DCS_MASTER_FLOATING_IP_IS_NOT_ENABLED</a></strong></code>
+<div class="block">DcsMaster Floating IP is not enabled</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_INFO_BIND_ADDRESS">DCS_MASTER_INFO_BIND_ADDRESS</a></strong></code>
+<div class="block">Configuration key for DCS master info bind address</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_INFO_PORT">DCS_MASTER_INFO_PORT</a></strong></code>
+<div class="block">Configuration key for DCS master info port</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_LISTENER_REQUEST_TIMEOUT">DCS_MASTER_LISTENER_REQUEST_TIMEOUT</a></strong></code>
+<div class="block">Configuration key for Listener request timeout</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_LISTENER_SELECTOR_TIMEOUT">DCS_MASTER_LISTENER_SELECTOR_TIMEOUT</a></strong></code>
+<div class="block">Configuration key for Listener selector timeout</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_PORT">DCS_MASTER_PORT</a></strong></code>
+<div class="block">Configuration key for DCS master port</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_PORT_RANGE">DCS_MASTER_PORT_RANGE</a></strong></code>
+<div class="block">Configuration key for DCS master port range</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_SERVER_RESTART_HANDLER_ATTEMPTS">DCS_MASTER_SERVER_RESTART_HANDLER_ATTEMPTS</a></strong></code>
+<div class="block">Configuration key for DCS server restart handler attempts</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_SERVER_RESTART_HANDLER_RETRY_INTERVAL_MILLIS">DCS_MASTER_SERVER_RESTART_HANDLER_RETRY_INTERVAL_MILLIS</a></strong></code>
+<div class="block">Configuration key for DCS server restart handler retry interval millis</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_TRAFODION_LOGS">DCS_MASTER_TRAFODION_LOGS</a></strong></code>
+<div class="block">DcsMaster Trafodion log feature</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_TRAFODION_LOGS_IS_ENABLED">DCS_MASTER_TRAFODION_LOGS_IS_ENABLED</a></strong></code>
+<div class="block">DcsMaster Trafodion logs is enabled</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_TRAFODION_LOGS_IS_NOT_ENABLED">DCS_MASTER_TRAFODION_LOGS_IS_NOT_ENABLED</a></strong></code>
+<div class="block">DcsMaster Trafodion logs is not enabled</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_TRAFODION_QUERY_TOOLS">DCS_MASTER_TRAFODION_QUERY_TOOLS</a></strong></code>
+<div class="block">DcsMaster Trafodion query tools feature</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_TRAFODION_QUERY_TOOLS_IS_ENABLED">DCS_MASTER_TRAFODION_QUERY_TOOLS_IS_ENABLED</a></strong></code>
+<div class="block">DcsMaster Trafodion query tools is enabled</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_MASTER_TRAFODION_QUERY_TOOLS_IS_NOT_ENABLED">DCS_MASTER_TRAFODION_QUERY_TOOLS_IS_NOT_ENABLED</a></strong></code>
+<div class="block">DcsMaster Trafodion query tools is not enabled</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/Constants.html#DCS_SERVER_CHECK_TCPIPPORT_ATTEMPTS">DCS_SERVER_CHECK_TCPIPPORT_ATTEMPTS</a></strong></code>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
<div class="block">Configuration key for server Listener number attempts BINDING assigned
port</div>
</td>
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/VersionAnnotation.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/VersionAnnotation.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/VersionAnnotation.html
index 1090d75..0c72d9f 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/VersionAnnotation.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/VersionAnnotation.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
@@ -274,3 +275,277 @@ public @interface <span class="strong">VersionAnnotation</span></pre>
<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
</body>
</html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:26 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>VersionAnnotation (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="VersionAnnotation (Trafodion Database Connectivity Services 2.3.0 API)";
+ }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!-- -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/VersionAnnotation.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../index-all.html">索引</a></li>
+<li><a href="../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../org/trafodion/dcs/Constants.html" title="org.trafodion.dcs中的类"><span class="strong">上一个类</span></a></li>
+<li>下一个类</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/trafodion/dcs/VersionAnnotation.html" target="_top">框架</a></li>
+<li><a href="VersionAnnotation.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要: </li>
+<li><a href="#annotation_type_required_element_summary">必需</a> | </li>
+<li>可选</li>
+</ul>
+<ul class="subNavList">
+<li>详细资料: </li>
+<li><a href="#annotation_type_element_detail">元素</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs</div>
+<h2 title="注释类型 VersionAnnotation" class="title">注释类型 VersionAnnotation</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true" title="java.lang.annotation中的类或接口">@Retention</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value()" title="java.lang.annotation中的类或接口">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="java.lang.annotation中的类或接口">RUNTIME</a>)
+<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true" title="java.lang.annotation中的类或接口">@Target</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value()" title="java.lang.annotation中的类或接口">value</a>=<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#PACKAGE" title="java.lang.annotation中的类或接口">PACKAGE</a>)
+public @interface <span class="strong">VersionAnnotation</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation_type_required_element_summary">
+<!-- -->
+</a>
+<h3>必需元素概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="必需元素概要表, 列表必需的元素和解释">
+<caption><span>所需元素</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">必需的元素和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/VersionAnnotation.html#date()">date</a></strong></code>
+<div class="block">Get the date when Hadoop was compiled.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/VersionAnnotation.html#revision()">revision</a></strong></code>
+<div class="block">Get the revision.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/VersionAnnotation.html#url()">url</a></strong></code>
+<div class="block">Get the url for the repository.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/VersionAnnotation.html#user()">user</a></strong></code>
+<div class="block">Get the username that compiled Hadoop.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../org/trafodion/dcs/VersionAnnotation.html#version()">version</a></strong></code>
+<div class="block">Get the Hadoop version</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation_type_element_detail">
+<!-- -->
+</a>
+<h3>元素详细资料</h3>
+<a name="version()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>version</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> version</pre>
+<div class="block">Get the Hadoop version</div>
+<dl><dt><span class="strong">返回:</span></dt><dd>the version string "0.6.3-dev"</dd></dl>
+</li>
+</ul>
+<a name="user()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>user</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> user</pre>
+<div class="block">Get the username that compiled Hadoop.</div>
+</li>
+</ul>
+<a name="date()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>date</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> date</pre>
+<div class="block">Get the date when Hadoop was compiled.</div>
+<dl><dt><span class="strong">返回:</span></dt><dd>the date in unix 'date' format</dd></dl>
+</li>
+</ul>
+<a name="url()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>url</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> url</pre>
+<div class="block">Get the url for the repository.</div>
+</li>
+</ul>
+<a name="revision()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>revision</h4>
+<pre>public abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> revision</pre>
+<div class="block">Get the revision.</div>
+<dl><dt><span class="strong">返回:</span></dt><dd>the revision number as a string (eg. "451451")</dd></dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!-- -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/VersionAnnotation.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../index-all.html">索引</a></li>
+<li><a href="../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../org/trafodion/dcs/Constants.html" title="org.trafodion.dcs中的类"><span class="strong">上一个类</span></a></li>
+<li>下一个类</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?org/trafodion/dcs/VersionAnnotation.html" target="_top">框架</a></li>
+<li><a href="VersionAnnotation.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要: </li>
+<li><a href="#annotation_type_required_element_summary">必需</a> | </li>
+<li>可选</li>
+</ul>
+<ul class="subNavList">
+<li>详细资料: </li>
+<li><a href="#annotation_type_element_detail">元素</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/Constants.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/Constants.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/Constants.html
index 573c29d..e8fda5c 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/Constants.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/Constants.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
@@ -119,3 +120,122 @@
<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
</body>
</html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.Constants的使用 (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="\u7C7B org.trafodion.dcs.Constants\u7684\u4F7F\u7528 (Trafodion Database Connectivity Services 2.3.0 API)";
+ }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!-- -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../org/trafodion/dcs/Constants.html" title="org.trafodion.dcs中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/class-use/Constants.html" target="_top">框架</a></li>
+<li><a href="Constants.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.Constants 的使用" class="title">类 org.trafodion.dcs.Constants<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.Constants的用法</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!-- -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../org/trafodion/dcs/Constants.html" title="org.trafodion.dcs中的类">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/class-use/Constants.html" target="_top">框架</a></li>
+<li><a href="Constants.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/VersionAnnotation.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/VersionAnnotation.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/VersionAnnotation.html
index b2ab0c7..e0d5e92 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/VersionAnnotation.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/class-use/VersionAnnotation.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
@@ -119,3 +120,122 @@
<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
</body>
</html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:29 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>类 org.trafodion.dcs.VersionAnnotation的使用 (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="\u7C7B org.trafodion.dcs.VersionAnnotation\u7684\u4F7F\u7528 (Trafodion Database Connectivity Services 2.3.0 API)";
+ }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!-- -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../org/trafodion/dcs/VersionAnnotation.html" title="org.trafodion.dcs中的注释">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/class-use/VersionAnnotation.html" target="_top">框架</a></li>
+<li><a href="VersionAnnotation.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="类 org.trafodion.dcs.VersionAnnotation 的使用" class="title">类 org.trafodion.dcs.VersionAnnotation<br>的使用</h2>
+</div>
+<div class="classUseContainer">没有org.trafodion.dcs.VersionAnnotation的用法</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!-- -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../org/trafodion/dcs/VersionAnnotation.html" title="org.trafodion.dcs中的注释">类</a></li>
+<li class="navBarCell1Rev">使用</li>
+<li><a href="../package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个</li>
+<li>下一个</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/class-use/VersionAnnotation.html" target="_top">框架</a></li>
+<li><a href="VersionAnnotation.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*
http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/FilterContainer.html
----------------------------------------------------------------------
diff --git a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/FilterContainer.html b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/FilterContainer.html
index 5a10995..7a4acc9 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/FilterContainer.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/FilterContainer.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
@@ -244,3 +245,247 @@
<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
</body>
</html>
+=======
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="zh">
+<head>
+<!-- Generated by javadoc (version 1.7.0_80) on Fri Jul 06 10:34:26 CST 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>FilterContainer (Trafodion Database Connectivity Services 2.3.0 API)</title>
+<meta name="date" content="2018-07-06">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="FilterContainer (Trafodion Database Connectivity Services 2.3.0 API)";
+ }
+//-->
+</script>
+<noscript>
+<div>您的浏览器已禁用 JavaScript。</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!-- -->
+</a><a href="#skip-navbar_top" title="跳过导航链接"></a><a name="navbar_top_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/FilterContainer.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个类</li>
+<li><a href="../../../../org/trafodion/dcs/http/HtmlQuoting.html" title="org.trafodion.dcs.http中的类"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/http/FilterContainer.html" target="_top">框架</a></li>
+<li><a href="FilterContainer.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要: </li>
+<li>嵌套 | </li>
+<li>字段 | </li>
+<li>构造器 | </li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料: </li>
+<li>字段 | </li>
+<li>构造器 | </li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.trafodion.dcs.http</div>
+<h2 title="接口 FilterContainer" class="title">接口 FilterContainer</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已知实现类:</dt>
+<dd><a href="../../../../org/trafodion/dcs/http/HttpServer.html" title="org.trafodion.dcs.http中的类">HttpServer</a>, <a href="../../../../org/trafodion/dcs/util/InfoServer.html" title="org.trafodion.dcs.util中的类">InfoServer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="strong">FilterContainer</span></pre>
+<div class="block">A container class for javax.servlet.Filter.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!-- -->
+</a>
+<h3>方法概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="方法概要表, 列表方法和解释">
+<caption><span>方法</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/trafodion/dcs/http/FilterContainer.html#addFilter(java.lang.String,%20java.lang.String,%20java.util.Map)">addFilter</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> name,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> classname,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="java.util中的类或接口">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>> parameters)</code>
+<div class="block">Add a filter to the container.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/trafodion/dcs/http/FilterContainer.html#addGlobalFilter(java.lang.String,%20java.lang.String,%20java.util.Map)">addGlobalFilter</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> name,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> classname,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="java.util中的类或接口">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>> parameters)</code>
+<div class="block">Add a global filter to the container.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!-- -->
+</a>
+<h3>方法详细资料</h3>
+<a name="addFilter(java.lang.String, java.lang.String, java.util.Map)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addFilter</h4>
+<pre>void addFilter(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> name,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> classname,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="java.util中的类或接口">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>> parameters)</pre>
+<div class="block">Add a filter to the container.</div>
+<dl><dt><span class="strong">参数:</span></dt><dd><code>name</code> - Filter name</dd><dd><code>classname</code> - Filter class name</dd><dd><code>parameters</code> - a map from parameter names to initial values</dd></dl>
+</li>
+</ul>
+<a name="addGlobalFilter(java.lang.String, java.lang.String, java.util.Map)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>addGlobalFilter</h4>
+<pre>void addGlobalFilter(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> name,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a> classname,
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="java.util中的类或接口">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="java.lang中的类或接口">String</a>> parameters)</pre>
+<div class="block">Add a global filter to the container.</div>
+<dl><dt><span class="strong">参数:</span></dt><dd><code>name</code> - filter name</dd><dd><code>classname</code> - filter class name</dd><dd><code>parameters</code> - a map from parameter names to initial values</dd></dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!-- -->
+</a><a href="#skip-navbar_bottom" title="跳过导航链接"></a><a name="navbar_bottom_firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="导航">
+<li><a href="../../../../overview-summary.html">概览</a></li>
+<li><a href="package-summary.html">程序包</a></li>
+<li class="navBarCell1Rev">类</li>
+<li><a href="class-use/FilterContainer.html">使用</a></li>
+<li><a href="package-tree.html">树</a></li>
+<li><a href="../../../../deprecated-list.html">已过时</a></li>
+<li><a href="../../../../index-all.html">索引</a></li>
+<li><a href="../../../../help-doc.html">帮助</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>上一个类</li>
+<li><a href="../../../../org/trafodion/dcs/http/HtmlQuoting.html" title="org.trafodion.dcs.http中的类"><span class="strong">下一个类</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/trafodion/dcs/http/FilterContainer.html" target="_top">框架</a></li>
+<li><a href="FilterContainer.html" target="_top">无框架</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">所有类</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>概要: </li>
+<li>嵌套 | </li>
+<li>字段 | </li>
+<li>构造器 | </li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料: </li>
+<li>字段 | </li>
+<li>构造器 | </li>
+<li><a href="#method_detail">方法</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2018. All rights reserved.</small></p>
+</body>
+</html>
+>>>>>>> Publish Website Updates PR 1629 [TRAFODION-3130] Add Descriptions for *Data Type Mapping from Hive to Trafodion* in *Trafodion SQL Reference Manual*