You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bu...@apache.org on 2015/07/09 07:39:33 UTC

svn commit: r957603 - in /websites/staging/directory/trunk/content: ./ kerby/ kerby/user-guide/

Author: buildbot
Date: Thu Jul  9 05:39:33 2015
New Revision: 957603

Log:
Staging update by buildbot for directory

Added:
    websites/staging/directory/trunk/content/kerby/developers-guide.html
    websites/staging/directory/trunk/content/kerby/user-guide/2-kerberos-library.html
Removed:
    websites/staging/directory/trunk/content/kerby/user-guide/2-apis.html
Modified:
    websites/staging/directory/trunk/content/   (props changed)
    websites/staging/directory/trunk/content/kerby/downloads.html
    websites/staging/directory/trunk/content/kerby/user-guide.html
    websites/staging/directory/trunk/content/kerby/user-guide/1-how-to-begin.html
    websites/staging/directory/trunk/content/kerby/user-guide/2.1-krbclient-apis.html
    websites/staging/directory/trunk/content/kerby/user-guide/2.2-kadmin.html
    websites/staging/directory/trunk/content/kerby/user-guide/2.3-kdcserver.html
    websites/staging/directory/trunk/content/kerby/user-guide/2.4-simplekdcserver.html
    websites/staging/directory/trunk/content/kerby/user-guide/3-tools.html
    websites/staging/directory/trunk/content/kerby/user-guide/3.1-kadmin.html
    websites/staging/directory/trunk/content/kerby/user-guide/3.2-kinit.html
    websites/staging/directory/trunk/content/kerby/user-guide/3.3-klist.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  9 05:39:33 2015
@@ -1 +1 @@
-1689817
+1689989

Added: websites/staging/directory/trunk/content/kerby/developers-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/developers-guide.html (added)
+++ websites/staging/directory/trunk/content/kerby/developers-guide.html Thu Jul  9 05:39:33 2015
@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>Developer&#39;s Guide &mdash; Apache Directory</title>
+		
+	    <link href="./../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../css/turquoise.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../images/api-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../">
+                        
+                        Main
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../studio">
+                        
+                        Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../api">
+                        
+                        LDAP API
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../mavibot">
+                        
+                        Mavibot
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../escimo">
+                        
+                        eSCIMo
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../fortress">
+                        
+                        Fortress
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../kerby">
+                        
+                        <STRONG>Kerby</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Kerby</h5>
+    <ul>
+        <li><a href="./../kerby/">Home</a></li>
+        <li><a href="./../kerby/">History</a></li>
+        <li><a href="./../kerby/news.html">News</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li>Coming soon...</li>
+	 <!--li><a href="./../kerby/downloads.html">Core 1.0.0-M1</a>&nbsp;&nbsp;<IMG src="./../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li!-->
+        <!--li><a href="./../kerby/download-old-versions.html">Older versions</a></li-->
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../kerby/vision.html">Vision</a></li>
+        <li><a href="./../kerby/issues.html">Issues</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../kerby/overview.html">Overview</a></li>
+	 <li><a href="./../kerby/quick-start.html">Quick Start</a></li>
+        <li><a href="./../kerby/user-guide.html">Users Guide</a></li>
+        <!--li><a href="./../kerby/gen-docs/latest/apidocs/">JavaDocs</a></li-->
+        <!--li><a href="./../kerby/gen-docs/latest/xref/">Cross-Reference</a></li-->
+        <!--li><a href="./../kerby/gen-docs/latest/">Generated Reports</a></li-->
+        <!--li><a href="./../kerby/developer-guide.html">Developer Guide</a></li-->
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../sources.html">Sources</a></li>
+        <li><a href="./../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../contribute.html">How to Contribute</a></li>
+        <li><a href="./../team.html">Team</a></li>
+        <li><a href="./../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+
+<style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="developers-guide">Developer's Guide<a class="headerlink" href="#developers-guide" title="Permanent link">&para;</a></h1>
+<p>This is a simple guide to help developers get going.</p>
+<h2 id="source-repository">Source Repository<a class="headerlink" href="#source-repository" title="Permanent link">&para;</a></h2>
+<p>To get the source, you will need to have git installed. Just type the following command to get the latest development version:</p>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">clone</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">git</span><span class="o">-</span><span class="n">wip</span><span class="o">-</span><span class="n">us</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">directory</span><span class="o">-</span><span class="n">kerby</span><span class="p">.</span><span class="n">git</span>
+</pre></div>
+
+
+<h2 id="git-mirror">Git Mirror<a class="headerlink" href="#git-mirror" title="Permanent link">&para;</a></h2>
+<p>The git repository is mirrored to Github: <a href="https://github.com/apache/directory-kerby/">https://github.com/apache/directory-kerby/</a>.</p>
+<h2 id="build">Build<a class="headerlink" href="#build" title="Permanent link">&para;</a></h2>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">package</span>
+</pre></div>
+
+
+<h2 id="setup-intellij">Setup Intellij<a class="headerlink" href="#setup-intellij" title="Permanent link">&para;</a></h2>
+<ol>
+<li>File -&gt; Import Project...</li>
+<li>Choose 'directory-kerby' as root directory</li>
+<li>Import project from external model -&gt; Maven</li>
+<li>Finish</li>
+</ol>
+<h2 id="issue-tracker">Issue Tracker<a class="headerlink" href="#issue-tracker" title="Permanent link">&para;</a></h2>
+<p><a href="https://issues.apache.org/jira/browse/DIRKRB">Jira</a>.</p>
+
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2015, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
+                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>

Modified: websites/staging/directory/trunk/content/kerby/downloads.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/downloads.html (original)
+++ websites/staging/directory/trunk/content/kerby/downloads.html Thu Jul  9 05:39:33 2015
@@ -171,36 +171,36 @@ h2:hover > .headerlink, h3:hover > .head
 <p>The Apache Kerby is also available as a Maven dependency:</p>
 <ul>
 <li>
-<p>Kerby Client API
-    <dependency>
-        <groupId>org.apache.kerby</groupId>
-        <artifactId>kerb-client-api-all</artifactId>
-        <version>${api-version}</version>
-    </dependency></p>
+<p>Kerby Client API</p>
+<p><dependency>
+    <groupId>org.apache.kerby</groupId>
+    <artifactId>kerb-client-api-all</artifactId>
+    <version>${api-version}</version>
+</dependency></p>
 </li>
 <li>
-<p>Kerby Server API
-    <dependency>
-        <groupId>org.apache.kerby</groupId>
-        <artifactId>kerb-server-api-all</artifactId>
-        <version>${api-version}</version>
-    </dependency></p>
+<p>Kerby Server API</p>
+<p><dependency>
+    <groupId>org.apache.kerby</groupId>
+    <artifactId>kerb-server-api-all</artifactId>
+    <version>${api-version}</version>
+</dependency></p>
 </li>
 <li>
-<p>Kerby ASN1
-    <dependency>
-        <groupId>org.apache.kerby</groupId>
-        <artifactId>kerby-asn1</artifactId>
-        <version>${api-version}</version>
-    </dependency></p>
+<p>Kerby ASN1</p>
+<p><dependency>
+    <groupId>org.apache.kerby</groupId>
+    <artifactId>kerby-asn1</artifactId>
+    <version>${api-version}</version>
+</dependency></p>
 </li>
 <li>
-<p>Kerby Simple KDC
-    <dependency>
-        <groupId>org.apache.kerby</groupId>
-        <artifactId>kerb-simplekdc</artifactId>
-        <version>${api-version}</version>
-    </dependency></p>
+<p>Kerby Simple KDC</p>
+<p><dependency>
+    <groupId>org.apache.kerby</groupId>
+    <artifactId>kerb-simplekdc</artifactId>
+    <version>${api-version}</version>
+</dependency></p>
 </li>
 </ul>
 

Modified: websites/staging/directory/trunk/content/kerby/user-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide.html Thu Jul  9 05:39:33 2015
@@ -161,8 +161,7 @@
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h1 id="kerby-users-guide">Kerby User's Guide<a class="headerlink" href="#kerby-users-guide" title="Permanent link">&para;</a></h1>
-<p>This guide is primarily for people new to Kerby. It will guide through the concepts and how to use Kerby.</p>
-<h2 id="about-this-guide">About this guide<a class="headerlink" href="#about-this-guide" title="Permanent link">&para;</a></h2>
+<p>This is a simple guide to help users and developers to go through the concepts. </p>
 <h2 id="table-of-contents">Table of contents<a class="headerlink" href="#table-of-contents" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="user-guide/1-how-to-begin.html">1 - How to begin</a></li>

Modified: websites/staging/directory/trunk/content/kerby/user-guide/1-how-to-begin.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/1-how-to-begin.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/1-how-to-begin.html Thu Jul  9 05:39:33 2015
@@ -181,6 +181,56 @@
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h1 id="1-how-to-begin">1 - How to begin<a class="headerlink" href="#1-how-to-begin" title="Permanent link">&para;</a></h1>
 <p>This chapter helps you to set up a Apache Kerby kdc server, with the minimal configuration options being explained. That should be enough to get a running server.</p>
+<h2 id="how-to-play-with-the-standalone-kdc">How to play with the standalone KDC:<a class="headerlink" href="#how-to-play-with-the-standalone-kdc" title="Permanent link">&para;</a></h2>
+<p>The distribution of Kerby.</p>
+<h3 id="to-run-with-a-standalone-kdc-server-kinit-and-kadmin">To run with a standalone kdc server, kinit and kadmin<a class="headerlink" href="#to-run-with-a-standalone-kdc-server-kinit-and-kadmin" title="Permanent link">&para;</a></h3>
+<ul>
+<li>
+<p>Generate libraries for distribution:</p>
+<p>$ mvn package -Pdist</p>
+</li>
+<li>
+<p>Run kadmin to add principals:</p>
+<p>$ sh kerby-dist/tool-dist/bin/kadmin.sh [server-conf-dir]</p>
+</li>
+</ul>
+<p>In kadmin, you can type "?" for help. For now, the kadmin only supports to add principals to json-backend. (Working in progress).</p>
+<ul>
+<li>
+<p>Start kerby-kdc-server:</p>
+<p>$ sh kerby-dist/kdc-dist/bin/start-kdc.sh –start [server-conf-dir] [work-dir]</p>
+</li>
+<li>
+<p>Run kinit:</p>
+<p>$ sh kerby-dist/tool-dist/bin/kinit.sh [principal-name]</p>
+</li>
+</ul>
+<p>If you don't specify [server-conf-dir] in step 2 or 3, it will be set as /etc/kerby. In [server-conf-dir], there should be kdc.conf, backend.conf. And in /etc/, there should be krb5.conf.</p>
+<p>An example of kdc.conf:</p>
+<div class="codehilite"><pre><span class="k">[kdcdefaults]</span>
+    <span class="na">kdc_host</span> <span class="o">=</span> <span class="s">localhost</span>
+<span class="s">    kdc_tcp_port = 8015</span>
+<span class="s">    kdc_realm = TEST.COM</span>
+</pre></div>
+
+
+<p>An example of json backend backend.conf:</p>
+<div class="codehilite"><pre><span class="n">kdc_identity_backend</span> <span class="p">=</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">kerby</span><span class="p">.</span><span class="n">kerberos</span><span class="p">.</span><span class="n">kdc</span><span class="p">.</span><span class="n">identitybackend</span><span class="p">.</span><span class="n">JsonIdentityBackend</span>
+<span class="n">backend</span><span class="p">.</span><span class="n">json</span><span class="p">.</span><span class="n">file</span> <span class="p">=</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">kerby</span><span class="o">/</span><span class="n">jsonbackend</span>
+</pre></div>
+
+
+<p>An example of zookeeper backend backend.conf:</p>
+<div class="codehilite"><pre><span class="n">kdc_identity_backend</span> <span class="p">=</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">kerby</span><span class="p">.</span><span class="n">kerberos</span><span class="p">.</span><span class="n">kdc</span><span class="p">.</span><span class="n">identitybackend</span><span class="p">.</span><span class="n">ZookeeperIdentityBackend</span>
+<span class="n">data_dir</span> <span class="p">=</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">kerby</span><span class="o">/</span><span class="n">zookeeper</span><span class="o">/</span><span class="n">data</span>
+<span class="n">data_log_dir</span> <span class="p">=</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">kerby</span><span class="o">/</span><span class="n">zookeeper</span><span class="o">/</span><span class="n">datalog</span>
+</pre></div>
+
+
+<p>An example of krb5.conf:</p>
+<div class="codehilite"><pre><span class="k">[libdefaults]</span>
+    <span class="na">kdc_realm</span><span class="o">=</span><span class="s">TEST.COM</span>
+</pre></div>
 
 
     <div class="nav">

Added: websites/staging/directory/trunk/content/kerby/user-guide/2-kerberos-library.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/2-kerberos-library.html (added)
+++ websites/staging/directory/trunk/content/kerby/user-guide/2-kerberos-library.html Thu Jul  9 05:39:33 2015
@@ -0,0 +1,222 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>2 - Kerberos library &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/turquoise.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/api-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Main
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        LDAP API
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../mavibot">
+                        
+                        Mavibot
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../escimo">
+                        
+                        eSCIMo
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../fortress">
+                        
+                        Fortress
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../kerby">
+                        
+                        <STRONG>Kerby</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Kerby</h5>
+    <ul>
+        <li><a href="./../../kerby/">Home</a></li>
+        <li><a href="./../../kerby/">History</a></li>
+        <li><a href="./../../kerby/news.html">News</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li>Coming soon...</li>
+	 <!--li><a href="./../../kerby/downloads.html">Core 1.0.0-M1</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li!-->
+        <!--li><a href="./../../kerby/download-old-versions.html">Older versions</a></li-->
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../kerby/vision.html">Vision</a></li>
+        <li><a href="./../../kerby/issues.html">Issues</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../kerby/overview.html">Overview</a></li>
+	 <li><a href="./../../kerby/quick-start.html">Quick Start</a></li>
+        <li><a href="./../../kerby/user-guide.html">Users Guide</a></li>
+        <!--li><a href="./../../kerby/gen-docs/latest/apidocs/">JavaDocs</a></li-->
+        <!--li><a href="./../../kerby/gen-docs/latest/xref/">Cross-Reference</a></li-->
+        <!--li><a href="./../../kerby/gen-docs/latest/">Generated Reports</a></li-->
+        <!--li><a href="./../../kerby/developer-guide.html">Developer Guide</a></li-->
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="1-how-to-begin.html">1 - How To Begin</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="../user-guide.html">User Guide</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.1-krbclient-apis.html">2.1 - KrbClient APIs</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="2-kerberos-library">2 - Kerberos library<a class="headerlink" href="#2-kerberos-library" title="Permanent link">&para;</a></h1>
+<p>Kerby provides the KrbClient API, Kadmin API, Kerberos Server API and the simplified kdc server APIs.</p>
+<h2 id="table-of-content">Table of content<a class="headerlink" href="#table-of-content" title="Permanent link">&para;</a></h2>
+<ul>
+<li><a href="2.1-krbclient-apis.html">2.1 - KrbClient API</a></li>
+<li><a href="2.2-kadmin.html">2.2 - Kadmin</a></li>
+<li><a href="2.3-kdcserver.html">2.3 - KdcServer</a></li>
+<li><a href="2.4-simplekdcserver.html">2.4 - SimpleKdcServer</a></li>
+</ul>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="1-how-to-begin.html">1 - How To Begin</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="../user-guide.html">User Guide</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.1-krbclient-apis.html">2.1 - KrbClient APIs</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2015, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
+                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>

Modified: websites/staging/directory/trunk/content/kerby/user-guide/2.1-krbclient-apis.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/2.1-krbclient-apis.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/2.1-krbclient-apis.html Thu Jul  9 05:39:33 2015
@@ -151,12 +151,12 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_up">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_next">
@@ -179,7 +179,8 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="kerb-client">kerb-client<a class="headerlink" href="#kerb-client" title="Permanent link">&para;</a></h1>
+<h1 id="21-krbclient-apis">2.1 - KrbClient APIs<a class="headerlink" href="#21-krbclient-apis" title="Permanent link">&para;</a></h1>
+<p>A Krb client API for applications to interact with KDC.</p>
 <h3 id="initiate-a-krbclient">Initiate a KrbClient<a class="headerlink" href="#initiate-a-krbclient" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Initiate a KrbClient with prepared KrbConfig.
@@ -218,12 +219,12 @@ requestServiceTicketWithAccessToken(acce
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_up">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_next">

Modified: websites/staging/directory/trunk/content/kerby/user-guide/2.2-kadmin.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/2.2-kadmin.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/2.2-kadmin.html Thu Jul  9 05:39:33 2015
@@ -156,7 +156,7 @@
         </div>
         <div class="nav_up">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_next">
@@ -183,7 +183,8 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div>
 
 
-<h1 id="kerb-admin">kerb-admin<a class="headerlink" href="#kerb-admin" title="Permanent link">&para;</a></h1>
+<h1 id="22-kadmin">2.2 - Kadmin<a class="headerlink" href="#22-kadmin" title="Permanent link">&para;</a></h1>
+<p>Server side admin facilities.</p>
 <h3 id="initiate-a-kadmin">Initiate a Kadmin<a class="headerlink" href="#initiate-a-kadmin" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Initiate a Kadmin with confDir.
@@ -252,7 +253,7 @@ exportKeyTab(keyTabFile);
         </div>
         <div class="nav_up">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_next">

Modified: websites/staging/directory/trunk/content/kerby/user-guide/2.3-kdcserver.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/2.3-kdcserver.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/2.3-kdcserver.html Thu Jul  9 05:39:33 2015
@@ -156,12 +156,12 @@
         </div>
         <div class="nav_up">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_next">
         
-            <a href="2.3-kdcserver.html">2.4 - SimpleKdcServer</a>
+            <a href="2.4-simplekdcserver.html">2.4 - SimpleKdcServer</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -183,7 +183,8 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div>
 
 
-<h1 id="kerb-server">kerb-server<a class="headerlink" href="#kerb-server" title="Permanent link">&para;</a></h1>
+<h1 id="23-kdcserver">2.3 - KdcServer<a class="headerlink" href="#23-kdcserver" title="Permanent link">&para;</a></h1>
+<p>Kerberos Server API.</p>
 <h3 id="initiate-kdc-server">Initiate kdc server<a class="headerlink" href="#initiate-kdc-server" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Initiate a kdc server with prepared confDir.
@@ -232,7 +233,7 @@ setInnerKdcImpl(innerKdcImpl);
 </ul>
 <h3 id="stop-kdc-server">Stop kdc server<a class="headerlink" href="#stop-kdc-server" title="Permanent link">&para;</a></h3>
 <ul>
-<li>Start kdc server.
+<li>Stop kdc server.
 <pre>
 stop();
 </pre></li>
@@ -247,12 +248,12 @@ stop();
         </div>
         <div class="nav_up">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_next">
         
-            <a href="2.3-kdcserver.html">2.4 - SimpleKdcServer</a>
+            <a href="2.4-simplekdcserver.html">2.4 - SimpleKdcServer</a>
 		
         </div>
         <div class="clearfix"></div>

Modified: websites/staging/directory/trunk/content/kerby/user-guide/2.4-simplekdcserver.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/2.4-simplekdcserver.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/2.4-simplekdcserver.html Thu Jul  9 05:39:33 2015
@@ -156,7 +156,7 @@
         </div>
         <div class="nav_up">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_next">
@@ -183,7 +183,8 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div>
 
 
-<h1 id="kerb-simplekdc">kerb-simplekdc<a class="headerlink" href="#kerb-simplekdc" title="Permanent link">&para;</a></h1>
+<h1 id="24-simplekdcserver">2.4 - SimpleKdcServer<a class="headerlink" href="#24-simplekdcserver" title="Permanent link">&para;</a></h1>
+<p>A simplified Kdc server. It can be imported by other project to work as a kdc server.</p>
 <h3 id="kdc-server">Kdc server<a class="headerlink" href="#kdc-server" title="Permanent link">&para;</a></h3>
 <p></pre>
 <em> Start simple kdc server.
@@ -255,7 +256,7 @@ exportPrincipals(keytabFile);
         </div>
         <div class="nav_up">
         
-            <a href="2-apis.html">2 - APIs</a>
+            <a href="2-kerberos-library.html">2 - Kerberos library</a>
 		
         </div>
         <div class="nav_next">

Modified: websites/staging/directory/trunk/content/kerby/user-guide/3-tools.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/3-tools.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/3-tools.html Thu Jul  9 05:39:33 2015
@@ -151,8 +151,8 @@
     <div class="nav">
         <div class="nav_prev">
         
-			&nbsp;
-        
+            <a href="2.4-simplekdcserver.html">2.4 - SimpleKdcServer</a>
+		
         </div>
         <div class="nav_up">
         
@@ -180,8 +180,7 @@
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h1 id="3-tools">3 - Tools<a class="headerlink" href="#3-tools" title="Permanent link">&para;</a></h1>
-<p>This chapter helps you to set up a server, with the minimal configuration options being explained. That should be enough to get a running server.</p>
-<p>This user guide is <strong>not</strong> intended to be a <strong>LDAP</strong> guide : there are some excellent tutorials or books, we won't try to challenge them !</p>
+<p>Kerby provides tools including both client side and server side.</p>
 <h2 id="table-of-content">Table of content<a class="headerlink" href="#table-of-content" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a href="3.1-kadmin.html">3.1 - kadmin</a></li>
@@ -193,8 +192,8 @@ h2:hover > .headerlink, h3:hover > .head
     <div class="nav">
         <div class="nav_prev">
         
-			&nbsp;
-        
+            <a href="2.4-simplekdcserver.html">2.4 - SimpleKdcServer</a>
+		
         </div>
         <div class="nav_up">
         

Modified: websites/staging/directory/trunk/content/kerby/user-guide/3.1-kadmin.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/3.1-kadmin.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/3.1-kadmin.html Thu Jul  9 05:39:33 2015
@@ -183,9 +183,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div>
 
 
-<h2 id="31-kadmin">3.1 - kadmin<a class="headerlink" href="#31-kadmin" title="Permanent link">&para;</a></h2>
-<h3 id="synopsis">SYNOPSIS<a class="headerlink" href="#synopsis" title="Permanent link">&para;</a></h3>
-<p>kadmin [-O|-N] [-r realm] [-p principal] [-q query] [[-c cache_name]|[-k [-t keytab]]|-n] [-w password] [-s admin_server[:port]]</p>
+<h1 id="31-kadmin">3.1 - kadmin<a class="headerlink" href="#31-kadmin" title="Permanent link">&para;</a></h1>
 <h3 id="description">DESCRIPTION<a class="headerlink" href="#description" title="Permanent link">&para;</a></h3>
 <p>kadmin is command-line interfaces to the Kerberos V5 administration system. kadmin provides for the maintenance of Kerberos principals, password policies, and service key tables (keytabs).</p>
 <h3 id="commands">Commands<a class="headerlink" href="#commands" title="Permanent link">&para;</a></h3>

Modified: websites/staging/directory/trunk/content/kerby/user-guide/3.2-kinit.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/3.2-kinit.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/3.2-kinit.html Thu Jul  9 05:39:33 2015
@@ -183,7 +183,7 @@ h2:hover > .headerlink, h3:hover > .head
 </pre></div>
 
 
-<h2 id="32-kinit">3.2 - kinit<a class="headerlink" href="#32-kinit" title="Permanent link">&para;</a></h2>
+<h1 id="32-kinit">3.2 - kinit<a class="headerlink" href="#32-kinit" title="Permanent link">&para;</a></h1>
 <h3 id="synopsis">SYNOPSIS<a class="headerlink" href="#synopsis" title="Permanent link">&para;</a></h3>
 <p>kinit [-V] [-l lifetime] [-s start_time] [-r renewable_life] [-p | -P] [-f | -F] [-a] [-A] [-C] [-E] [-v] [-R] [-k [-t keytab_file]] [-c cache_name] [-n] [-S service_name] [-I input_ccache] [-T armor_ccache] [-X attribute[=value]] [principal]</p>
 <h3 id="description">DESCRIPTION<a class="headerlink" href="#description" title="Permanent link">&para;</a></h3>

Modified: websites/staging/directory/trunk/content/kerby/user-guide/3.3-klist.html
==============================================================================
--- websites/staging/directory/trunk/content/kerby/user-guide/3.3-klist.html (original)
+++ websites/staging/directory/trunk/content/kerby/user-guide/3.3-klist.html Thu Jul  9 05:39:33 2015
@@ -179,10 +179,10 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h2 id="33-klist">3.3 - klist<a class="headerlink" href="#33-klist" title="Permanent link">&para;</a></h2>
+<h1 id="33-klist">3.3 - klist<a class="headerlink" href="#33-klist" title="Permanent link">&para;</a></h1>
 <h3 id="synopsis">SYNOPSIS<a class="headerlink" href="#synopsis" title="Permanent link">&para;</a></h3>
 <p>klist [-e] [[-c] [-l] [-A] [-f] [-s] [-a [-n]]] [-C] [-k [-t] [-K]] [-V] [cache_name|keytab_name]</p>
-<h4 id="description">DESCRIPTION<a class="headerlink" href="#description" title="Permanent link">&para;</a></h4>
+<h3 id="description">DESCRIPTION<a class="headerlink" href="#description" title="Permanent link">&para;</a></h3>
 <p>klist lists the Kerberos principal and Kerberos tickets held in a credentials cache, or the keys held in a keytab file.</p>