http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HtmlQuoting.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HtmlQuoting.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HtmlQuoting.html
index 8ac38e4..907098f 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HtmlQuoting.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HtmlQuoting.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">
@@ -163,6 +164,169 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
               byte[]&nbsp;buffer,
               int&nbsp;off,
               int&nbsp;len)</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>HtmlQuoting (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="HtmlQuoting (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/HtmlQuoting.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/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/http/HttpServer.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/HtmlQuoting.html" 
target="_top">框架</a></li>
+<li><a href="HtmlQuoting.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>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</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="ç±» HtmlQuoting" class="title">ç±» HtmlQuoting</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.http.HtmlQuoting</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="strong">HtmlQuoting</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">This class is responsible for quoting HTML characters.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HtmlQuoting.html#HtmlQuoting()">HtmlQuoting</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== 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">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">方法和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HtmlQuoting.html#main(java.lang.String[])">main</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HtmlQuoting.html#needsQuoting(byte[],%20int,%20int)">needsQuoting</a></strong>(byte[]&nbsp;data,
+            int&nbsp;off,
+            int&nbsp;len)</code>
+<div class="block">Does the given string need to be quoted?</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HtmlQuoting.html#needsQuoting(java.lang.String)">needsQuoting</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;str)</code>
+<div class="block">Does the given string need to be quoted?</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HtmlQuoting.html#quoteHtmlChars(java.io.OutputStream,%20byte[],%20int,%20int)">quoteHtmlChars</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html?is-external=true";
 title="java.io中的类或接口">OutputStream</a>&nbsp;output,
+              byte[]&nbsp;buffer,
+              int&nbsp;off,
+              int&nbsp;len)</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">Quote all of the active HTML characters in the given string 
as they
  are added to the buffer.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.html
index 84e914c..6bcf007 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.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">
@@ -286,3 +287,289 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <p class="legalCopy"><small>Copyright &#169; 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:27 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HttpServer.DummyServletFilter.RequestChecker (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="HttpServer.DummyServletFilter.RequestChecker 
(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/HttpServer.DummyServletFilter.RequestChecker.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/http/HttpServer.DummyServletFilter.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.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/HttpServer.DummyServletFilter.RequestChecker.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.DummyServletFilter.RequestChecker.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>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a 
href="#methods_inherited_from_class_javax.servlet.http.HttpServletRequestWrapper">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</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.http</div>
+<h2 title="ç±» HttpServer.DummyServletFilter.RequestChecker" class="title">ç±» 
HttpServer.DummyServletFilter.RequestChecker</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>javax.servlet.ServletRequestWrapper</li>
+<li>
+<ul class="inheritance">
+<li>javax.servlet.http.HttpServletRequestWrapper</li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.http.HttpServer.DummyServletFilter.RequestChecker</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd>javax.servlet.http.HttpServletRequest, javax.servlet.ServletRequest</dd>
+</dl>
+<dl>
+<dt>封闭类:</dt>
+<dd><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.html" 
title="org.trafodion.dcs.http中的类">HttpServer.DummyServletFilter</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span 
class="strong">HttpServer.DummyServletFilter.RequestChecker</span>
+extends javax.servlet.http.HttpServletRequestWrapper</pre>
+</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>
+<ul class="blockList">
+<li class="blockList"><a 
name="fields_inherited_from_class_javax.servlet.http.HttpServletRequest">
+<!--   -->
+</a>
+<h3>从接口继承的字段&nbsp;javax.servlet.http.HttpServletRequest</h3>
+<code>BASIC_AUTH, CLIENT_CERT_AUTH, DIGEST_AUTH, FORM_AUTH</code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.html#HttpServer.DummyServletFilter.RequestChecker(javax.servlet.http.HttpServletRequest)">HttpServer.DummyServletFilter.RequestChecker</a></strong>(javax.servlet.http.HttpServletRequest&nbsp;rawRequest)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>方法概要</h3>
+<ul class="blockList">
+<li class="blockList"><a 
name="methods_inherited_from_class_javax.servlet.http.HttpServletRequestWrapper">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;javax.servlet.http.HttpServletRequestWrapper</h3>
+<code>getAuthType, getContextPath, getCookies, getDateHeader, getHeader, 
getHeaderNames, getHeaders, getIntHeader, getMethod, getPathInfo, 
getPathTranslated, getQueryString, getRemoteUser, getRequestedSessionId, 
getRequestURI, getRequestURL, getServletPath, getSession, getSession, 
getUserPrincipal, isRequestedSessionIdFromCookie, isRequestedSessionIdFromUrl, 
isRequestedSessionIdFromURL, isRequestedSessionIdValid, isUserInRole</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a 
name="methods_inherited_from_class_javax.servlet.ServletRequestWrapper">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;javax.servlet.ServletRequestWrapper</h3>
+<code>getAttribute, getAttributeNames, getCharacterEncoding, getContentLength, 
getContentType, getInputStream, getLocalAddr, getLocale, getLocales, 
getLocalName, getLocalPort, getParameter, getParameterMap, getParameterNames, 
getParameterValues, getProtocol, getReader, getRealPath, getRemoteAddr, 
getRemoteHost, getRemotePort, getRequest, getRequestDispatcher, getScheme, 
getServerName, getServerPort, isSecure, removeAttribute, setAttribute, 
setCharacterEncoding, setRequest</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></h3>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()"
 title="java.lang中的类或接口">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)"
 title="java.lang中的类或接口">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()"
 title="java.lang中的类或接口">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()"
 title="java.lang中的类或接口">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()"
 title="java.lang中的类或接口">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()"
 title="java.lang中的类或接口">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()"
 title="java.lang中的类或接口">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)"
 title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a 
name="methods_inherited_from_class_javax.servlet.ServletRequest">
+<!--   -->
+</a>
+<h3>从接口继承的方法&nbsp;javax.servlet.ServletRequest</h3>
+<code>getAttribute, getAttributeNames, getCharacterEncoding, getContentLength, 
getContentType, getInputStream, getLocalAddr, getLocale, getLocales, 
getLocalName, getLocalPort, getParameter, getParameterMap, getParameterNames, 
getParameterValues, getProtocol, getReader, getRealPath, getRemoteAddr, 
getRemoteHost, getRemotePort, getRequestDispatcher, getScheme, getServerName, 
getServerPort, isSecure, removeAttribute, setAttribute, 
setCharacterEncoding</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!--   -->
+</a>
+<h3>构造器详细资料</h3>
+<a 
name="HttpServer.DummyServletFilter.RequestChecker(javax.servlet.http.HttpServletRequest)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HttpServer.DummyServletFilter.RequestChecker</h4>
+<pre>public&nbsp;HttpServer.DummyServletFilter.RequestChecker(javax.servlet.http.HttpServletRequest&nbsp;rawRequest)</pre>
+</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/HttpServer.DummyServletFilter.RequestChecker.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/http/HttpServer.DummyServletFilter.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.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/HttpServer.DummyServletFilter.RequestChecker.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.DummyServletFilter.RequestChecker.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>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a 
href="#methods_inherited_from_class_javax.servlet.http.HttpServletRequestWrapper">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</li>
+<li>方法</li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 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/HttpServer.DummyServletFilter.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.html
index 478a2db..c717150 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.DummyServletFilter.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">
@@ -336,3 +337,339 @@ implements javax.servlet.Filter</pre>
 <p class="legalCopy"><small>Copyright &#169; 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:27 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HttpServer.DummyServletFilter (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="HttpServer.DummyServletFilter (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/HttpServer.DummyServletFilter.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/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.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/HttpServer.DummyServletFilter.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.DummyServletFilter.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>概要:&nbsp;</li>
+<li><a href="#nested_class_summary">嵌套</a>&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</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="ç±» HttpServer.DummyServletFilter" class="title">ç±» 
HttpServer.DummyServletFilter</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.http.HttpServer.DummyServletFilter</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd>javax.servlet.Filter</dd>
+</dl>
+<dl>
+<dt>封闭类:</dt>
+<dd><a href="../../../../org/trafodion/dcs/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类">HttpServer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span 
class="strong">HttpServer.DummyServletFilter</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a>
+implements javax.servlet.Filter</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested_class_summary">
+<!--   -->
+</a>
+<h3>嵌套类概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="嵌套类概要表, 列表嵌套类和解释">
+<caption><span>嵌套类</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">类和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.html"
 
title="org.trafodion.dcs.http中的类">HttpServer.DummyServletFilter.RequestChecker</a></strong></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.html#HttpServer.DummyServletFilter()">HttpServer.DummyServletFilter</a></strong>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== 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">&nbsp;</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/HttpServer.DummyServletFilter.html#destroy()">destroy</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.html#doFilter(javax.servlet.ServletRequest,%20javax.servlet.ServletResponse,%20javax.servlet.FilterChain)">doFilter</a></strong>(javax.servlet.ServletRequest&nbsp;request,
+        javax.servlet.ServletResponse&nbsp;response,
+        javax.servlet.FilterChain&nbsp;chain)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.html#init(javax.servlet.FilterConfig)">init</a></strong>(javax.servlet.FilterConfig&nbsp;config)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
+<!--   -->
+</a>
+<h3>从类继承的方法&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a></h3>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone()"
 title="java.lang中的类或接口">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)"
 title="java.lang中的类或接口">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize()"
 title="java.lang中的类或接口">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass()"
 title="java.lang中的类或接口">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()"
 title="java.lang中的类或接口">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify()"
 title="java.lang中的类或接口">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external
 =true#notifyAll()" title="java.lang中的类或接口">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString()"
 title="java.lang中的类或接口">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait()"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long)"
 title="java.lang中的类或接口">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)"
 title="java.lang中的类或接口">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_detail">
+<!--   -->
+</a>
+<h3>构造器详细资料</h3>
+<a name="HttpServer.DummyServletFilter()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HttpServer.DummyServletFilter</h4>
+<pre>public&nbsp;HttpServer.DummyServletFilter()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>方法详细资料</h3>
+<a name="init(javax.servlet.FilterConfig)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>init</h4>
+<pre>public&nbsp;void&nbsp;init(javax.servlet.FilterConfig&nbsp;config)
+          throws javax.servlet.ServletException</pre>
+<dl>
+<dt><strong>指定者:</strong></dt>
+<dd><code>init</code>&nbsp;在接口中&nbsp;<code>javax.servlet.Filter</code></dd>
+<dt><span class="strong">抛出:</span></dt>
+<dd><code>javax.servlet.ServletException</code></dd></dl>
+</li>
+</ul>
+<a name="destroy()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>destroy</h4>
+<pre>public&nbsp;void&nbsp;destroy()</pre>
+<dl>
+<dt><strong>指定者:</strong></dt>
+<dd><code>destroy</code>&nbsp;在接口中&nbsp;<code>javax.servlet.Filter</code></dd>
+</dl>
+</li>
+</ul>
+<a name="doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, 
javax.servlet.FilterChain)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>doFilter</h4>
+<pre>public&nbsp;void&nbsp;doFilter(javax.servlet.ServletRequest&nbsp;request,
+            javax.servlet.ServletResponse&nbsp;response,
+            javax.servlet.FilterChain&nbsp;chain)
+              throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="java.io中的类或接口">IOException</a>,
+                     javax.servlet.ServletException</pre>
+<dl>
+<dt><strong>指定者:</strong></dt>
+<dd><code>doFilter</code>&nbsp;在接口中&nbsp;<code>javax.servlet.Filter</code></dd>
+<dt><span class="strong">抛出:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="java.io中的类或接口">IOException</a></code></dd>
+<dd><code>javax.servlet.ServletException</code></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/HttpServer.DummyServletFilter.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/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.RequestChecker.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/HttpServer.DummyServletFilter.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.DummyServletFilter.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>概要:&nbsp;</li>
+<li><a href="#nested_class_summary">嵌套</a>&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</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 &#169; 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/HttpServer.QuotingInputFilter.RequestQuoter.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html
index 5b5b1b0..952fb89 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.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">
@@ -194,6 +195,200 @@ extends javax.servlet.http.HttpServletRequestWrapper</pre>
 <tr class="altColor">
 <td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuffer.html?is-external=true";
 title="class or interface in java.lang">StringBuffer</a></code></td>
 <td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html#getRequestURL()">getRequestURL</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:27 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HttpServer.QuotingInputFilter.RequestQuoter (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="HttpServer.QuotingInputFilter.RequestQuoter 
(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/HttpServer.QuotingInputFilter.RequestQuoter.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/http/HttpServer.QuotingInputFilter.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a href="../../../../org/trafodion/dcs/http/HttpServer.StackServlet.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/HttpServer.QuotingInputFilter.RequestQuoter.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.QuotingInputFilter.RequestQuoter.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>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</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="ç±» HttpServer.QuotingInputFilter.RequestQuoter" class="title">ç±» 
HttpServer.QuotingInputFilter.RequestQuoter</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>javax.servlet.ServletRequestWrapper</li>
+<li>
+<ul class="inheritance">
+<li>javax.servlet.http.HttpServletRequestWrapper</li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.http.HttpServer.QuotingInputFilter.RequestQuoter</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd>javax.servlet.http.HttpServletRequest, javax.servlet.ServletRequest</dd>
+</dl>
+<dl>
+<dt>封闭类:</dt>
+<dd><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.html" 
title="org.trafodion.dcs.http中的类">HttpServer.QuotingInputFilter</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span 
class="strong">HttpServer.QuotingInputFilter.RequestQuoter</span>
+extends javax.servlet.http.HttpServletRequestWrapper</pre>
+</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>
+<ul class="blockList">
+<li class="blockList"><a 
name="fields_inherited_from_class_javax.servlet.http.HttpServletRequest">
+<!--   -->
+</a>
+<h3>从接口继承的字段&nbsp;javax.servlet.http.HttpServletRequest</h3>
+<code>BASIC_AUTH, CLIENT_CERT_AUTH, DIGEST_AUTH, FORM_AUTH</code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor_summary">
+<!--   -->
+</a>
+<h3>构造器概要</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" 
summary="构造器概要表, 列表构造器和解释">
+<caption><span>构造器</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">构造器和说明</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html#HttpServer.QuotingInputFilter.RequestQuoter(javax.servlet.http.HttpServletRequest)">HttpServer.QuotingInputFilter.RequestQuoter</a></strong>(javax.servlet.http.HttpServletRequest&nbsp;rawRequest)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== 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">&nbsp;</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/http/HttpServer.QuotingInputFilter.RequestQuoter.html#getParameter(java.lang.String)">getParameter</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;name)</code>
+<div class="block">Unquote the name and quote the value.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true";
 title="java.util中的类或接口">Map</a>&lt;<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>[]&gt;</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html#getParameterMap()">getParameterMap</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Enumeration.html?is-external=true";
 title="java.util中的类或接口">Enumeration</a>&lt;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&gt;</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html#getParameterNames()">getParameterNames</a></strong>()</code>
+<div class="block">Return the set of parameter names, quoting each name.</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/http/HttpServer.QuotingInputFilter.RequestQuoter.html#getParameterValues(java.lang.String)">getParameterValues</a></strong>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="java.lang中的类或接口">String</a>&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/StringBuffer.html?is-external=true";
 title="java.lang中的类或接口">StringBuffer</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.html#getRequestURL()">getRequestURL</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">Quote the url so that users specifying the HOST HTTP header
  can't inject attacks.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.html
index 41882ef..86cd945 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.QuotingInputFilter.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">
@@ -112,6 +113,118 @@
 <pre>public static class <span 
class="strong">HttpServer.QuotingInputFilter</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>
 implements javax.servlet.Filter</pre>
+=======
+<!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:27 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HttpServer.QuotingInputFilter (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="HttpServer.QuotingInputFilter (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/HttpServer.QuotingInputFilter.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/http/HttpServer.DummyServletFilter.RequestChecker.html"
 title="org.trafodion.dcs.http中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a 
href="../../../../org/trafodion/dcs/http/HttpServer.QuotingInputFilter.RequestQuoter.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/HttpServer.QuotingInputFilter.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.QuotingInputFilter.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>概要:&nbsp;</li>
+<li><a href="#nested_class_summary">嵌套</a>&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</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="ç±» HttpServer.QuotingInputFilter" class="title">ç±» 
HttpServer.QuotingInputFilter</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.http.HttpServer.QuotingInputFilter</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd>javax.servlet.Filter</dd>
+</dl>
+<dl>
+<dt>封闭类:</dt>
+<dd><a href="../../../../org/trafodion/dcs/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类">HttpServer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span 
class="strong">HttpServer.QuotingInputFilter</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a>
+implements javax.servlet.Filter</pre>
+>>>>>>> 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">A Servlet input filter that quotes all HTML active 
characters in the
  parameter names and values. The goal is to quote the characters to make
  all of the servlets resistant to cross-site scripting attacks.</div>

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.StackServlet.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.StackServlet.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.StackServlet.html
index 51013a2..e1f8870 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.StackServlet.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.StackServlet.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">
@@ -121,6 +122,127 @@
 <br>
 <pre>public static class <span class="strong">HttpServer.StackServlet</span>
 extends javax.servlet.http.HttpServlet</pre>
+=======
+<!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:27 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HttpServer.StackServlet (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="HttpServer.StackServlet (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/HttpServer.StackServlet.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/http/HttpServer.QuotingInputFilter.RequestQuoter.html"
 title="org.trafodion.dcs.http中的类"><span 
class="strong">上一个类</span></a></li>
+<li>下一个类</li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/trafodion/dcs/http/HttpServer.StackServlet.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.StackServlet.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>概要:&nbsp;</li>
+<li>嵌套&nbsp;|&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li>字段&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</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="ç±» HttpServer.StackServlet" class="title">ç±» 
HttpServer.StackServlet</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>javax.servlet.GenericServlet</li>
+<li>
+<ul class="inheritance">
+<li>javax.servlet.http.HttpServlet</li>
+<li>
+<ul class="inheritance">
+<li>org.trafodion.dcs.http.HttpServer.StackServlet</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true";
 title="java.io中的类或接口">Serializable</a>, javax.servlet.Servlet, 
javax.servlet.ServletConfig</dd>
+</dl>
+<dl>
+<dt>封闭类:</dt>
+<dd><a href="../../../../org/trafodion/dcs/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类">HttpServer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="strong">HttpServer.StackServlet</span>
+extends javax.servlet.http.HttpServlet</pre>
+>>>>>>> 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">A very simple servlet to serve up a text representation of 
the current
  stack traces. It both returns the stacks to the caller and logs them.
  Currently the stack traces are done sequentially rather than exactly the

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.html 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.html
index 791b84b..85245b9 100644
--- a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.html
+++ b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/HttpServer.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">
@@ -112,6 +113,118 @@
 <pre>public class <span class="strong">HttpServer</span>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>
 implements <a href="../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="interface in org.trafodion.dcs.http">FilterContainer</a></pre>
+=======
+<!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:27 CST 2018 
-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HttpServer (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="HttpServer (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/HttpServer.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/http/HtmlQuoting.html" 
title="org.trafodion.dcs.http中的类"><span 
class="strong">上一个类</span></a></li>
+<li><a 
href="../../../../org/trafodion/dcs/http/HttpServer.DummyServletFilter.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/HttpServer.html" 
target="_top">框架</a></li>
+<li><a href="HttpServer.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>概要:&nbsp;</li>
+<li><a href="#nested_class_summary">嵌套</a>&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">字段</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_summary">构造器</a>&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">方法</a></li>
+</ul>
+<ul class="subNavList">
+<li>详细资料:&nbsp;</li>
+<li><a href="#field_detail">字段</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor_detail">构造器</a>&nbsp;|&nbsp;</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="ç±» HttpServer" class="title">ç±» HttpServer</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.http.HttpServer</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>所有已实现的接口:</dt>
+<dd><a href="../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a></dd>
+</dl>
+<dl>
+<dt>直接已知子类:</dt>
+<dd><a href="../../../../org/trafodion/dcs/util/InfoServer.html" 
title="org.trafodion.dcs.util中的类">InfoServer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="strong">HttpServer</span>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="java.lang中的类或接口">Object</a>
+implements <a href="../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a></pre>
+>>>>>>> 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">Create a Jetty embedded server to answer http requests. The 
primary goal
  is to serve up status information for the server.
  There are three contexts:

http://git-wip-us.apache.org/repos/asf/trafodion-site/blob/c7b10bad/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/FilterContainer.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/FilterContainer.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/FilterContainer.html
index c7abc99..6a7c046 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/FilterContainer.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/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">
@@ -185,3 +186,188 @@
 <p class="legalCopy"><small>Copyright &#169; 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.http.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="\u63A5\u53E3 
org.trafodion.dcs.http.FilterContainer\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/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">类</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/http/class-use/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>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="接口 org.trafodion.dcs.http.FilterContainer 的使用" 
class="title">接口 org.trafodion.dcs.http.FilterContainer<br>的使用</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表程序包和解释">
+<caption><span>使用<a 
href="../../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a>的程序包
</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">程序包</th>
+<th class="colLast" scope="col">说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a 
href="#org.trafodion.dcs.http">org.trafodion.dcs.http</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="#org.trafodion.dcs.util">org.trafodion.dcs.util</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.trafodion.dcs.http">
+<!--   -->
+</a>
+<h3><a 
href="../../../../../org/trafodion/dcs/http/package-summary.html">org.trafodion.dcs.http</a>中<a
 href="../../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span>实现<a 
href="../../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a>的<a 
href="../../../../../org/trafodion/dcs/http/package-summary.html">org.trafodion.dcs.http</a>中的类</span><span
 class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">类和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../../org/trafodion/dcs/http/HttpServer.html" 
title="org.trafodion.dcs.http中的类">HttpServer</a></strong></code>
+<div class="block">Create a Jetty embedded server to answer http 
requests.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="org.trafodion.dcs.util">
+<!--   -->
+</a>
+<h3><a 
href="../../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</a>中<a
 href="../../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a>的使用</h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="使用表, 
列表类和解释">
+<caption><span>实现<a 
href="../../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">FilterContainer</a>的<a 
href="../../../../../org/trafodion/dcs/util/package-summary.html">org.trafodion.dcs.util</a>中的类</span><span
 class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">限定符和类型</th>
+<th class="colLast" scope="col">类和说明</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><strong><a 
href="../../../../../org/trafodion/dcs/util/InfoServer.html" 
title="org.trafodion.dcs.util中的类">InfoServer</a></strong></code>
+<div class="block">Create a Jetty embedded server to answer http 
requests.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</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><a href="../package-summary.html">程序包</a></li>
+<li><a href="../../../../../org/trafodion/dcs/http/FilterContainer.html" 
title="org.trafodion.dcs.http中的接口">类</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/http/class-use/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>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 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/class-use/HtmlQuoting.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/HtmlQuoting.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/HtmlQuoting.html
index ae89a30..c46a740 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/HtmlQuoting.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/HtmlQuoting.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 &#169; 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.http.HtmlQuoting的使用 (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.http.HtmlQuoting\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/http/HtmlQuoting.html" 
title="org.trafodion.dcs.http中的类">类</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/http/class-use/HtmlQuoting.html"
 target="_top">框架</a></li>
+<li><a href="HtmlQuoting.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.http.HtmlQuoting 的使用" class="title">类 
org.trafodion.dcs.http.HtmlQuoting<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.http.HtmlQuoting的用法</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/http/HtmlQuoting.html" 
title="org.trafodion.dcs.http中的类">类</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/http/class-use/HtmlQuoting.html"
 target="_top">框架</a></li>
+<li><a href="HtmlQuoting.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 &#169; 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/class-use/HttpServer.DummyServletFilter.RequestChecker.html
----------------------------------------------------------------------
diff --git 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/HttpServer.DummyServletFilter.RequestChecker.html
 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/HttpServer.DummyServletFilter.RequestChecker.html
index 29bcaa6..cc25161 100644
--- 
a/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/HttpServer.DummyServletFilter.RequestChecker.html
+++ 
b/docs/2.3.0/dcs_reference/apidocs/org/trafodion/dcs/http/class-use/HttpServer.DummyServletFilter.RequestChecker.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 &#169; 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.http.HttpServer.DummyServletFilter.RequestChecker的使用 
(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.http.HttpServer.DummyServletFilter.RequestChecker\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/http/HttpServer.DummyServletFilter.RequestChecker.html"
 title="org.trafodion.dcs.http中的类">类</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/http/class-use/HttpServer.DummyServletFilter.RequestChecker.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.DummyServletFilter.RequestChecker.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.http.HttpServer.DummyServletFilter.RequestChecker 的使用" 
class="title">ç±» 
org.trafodion.dcs.http.HttpServer.DummyServletFilter.RequestChecker<br>的使用</h2>
+</div>
+<div 
class="classUseContainer">没有org.trafodion.dcs.http.HttpServer.DummyServletFilter.RequestChecker的用法</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/http/HttpServer.DummyServletFilter.RequestChecker.html"
 title="org.trafodion.dcs.http中的类">类</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/http/class-use/HttpServer.DummyServletFilter.RequestChecker.html"
 target="_top">框架</a></li>
+<li><a href="HttpServer.DummyServletFilter.RequestChecker.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 &#169; 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*

Reply via email to