shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r1562965 [5/6] - in /shiro/site: publish/ publish/2010/03/18/ publish/2010/06/01/ publish/2010/09/14/ publish/2010/09/20/ publish/2010/09/24/ publish/2010/11/03/ publish/2011/01/06/ publish/2011/01/13/ publish/2011/02/10/ publish/2011/02/28...
Date Thu, 30 Jan 2014 21:13:53 GMT
Modified: shiro/site/publish/tutorial.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/tutorial.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/tutorial.html (original)
+++ shiro/site/publish/tutorial.html Thu Jan 30 21:13:51 2014
@@ -51,36 +51,41 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
 
             <h1><a name="Tutorial-ApacheShiroTutorial"></a>Apache Shiro Tutorial</h1>
 
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+	
+	<h3><a href="10-minute-tutorial.html">10-Minute Shiro Tutorial</a></h3>
+  <p>Try Apache Shiro for yourself in under 10 minutes. </br><span style="font-size:11"><a href="10-minute-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+</div>
+</td>
+</tr>
+</table>
+
 <h2><a name="Tutorial-YourFirstApacheShiroApplication"></a>Your First Apache Shiro Application</h2>
 
 <p>If you're new to Apache Shiro, this short tutorial will show you how to set up an initial and very simple application secured by Apache Shiro.  We'll discuss Shiro's core concepts along the way to help familiarize you with Shiro's design and API.</p>
@@ -88,7 +93,6 @@
 <p>If you don't want to actually edit files as you follow this tutorial, you can obtain a nearly identical sample application and reference it as you go.  Choose a location:</p>
 <ul><li>In Apache Shiro's Subversion repository: <a class="external-link" href="https://svn.apache.org/repos/asf/shiro/trunk/samples/quickstart/">https://svn.apache.org/repos/asf/shiro/trunk/samples/quickstart/</a></li><li>In Apache Shiro's source distribution's <tt>samples/quickstart</tt> directory.  The source distribution is available from the <a href="download.html" title="Download">Download</a> page.</li></ul>
 
-
 <h3><a name="Tutorial-Setup"></a>Setup</h3>
 
 <p>In this simple example, we'll create a very simple command-line application that will run and quickly exit, just so you can get a feel for Shiro's API.</p>
@@ -573,6 +577,7 @@ currentUser.logout(); <span class="code-
 
 <p>To answer that question requires a little deeper understanding of Shiro's architecture and supporting configuration mechanisms.  We'll cover Shiro's <a href="architecture.html" title="Architecture">Architecture</a> next.</p>
 
+
         </div>
 
     </div><!--END WRAPPER-->
@@ -583,7 +588,7 @@ currentUser.logout(); <span class="code-
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -591,4 +596,4 @@ currentUser.logout(); <span class="code-
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/version-2-brainstorming.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/version-2-brainstorming.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/version-2-brainstorming.html (original)
+++ shiro/site/publish/version-2-brainstorming.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -289,7 +273,7 @@ package base: <tt>org.apache.shiro.servl
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -297,4 +281,4 @@ package base: <tt>org.apache.shiro.servl
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/web-features.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/web-features.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/web-features.html (original)
+++ shiro/site/publish/web-features.html Thu Jan 30 21:13:51 2014
@@ -23,8 +23,8 @@
     <meta name="y_key" content="e47896cd6bae4920">
 
     <title>
-                    Apache Shiro | Java Security Framework
-        </title>
+                                    Apache Shiro for Web Applications | Apache Shiro
+                </title>
 
 
     <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico">
@@ -51,69 +51,45 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
 
-            <h1><a name="WebFeatures-ApacheShiroWebFeatures"></a>Apache Shiro Web Features</h1>
+            <h1>Apache Shiro for Web Applications</h1><p>Although Apache Shiro is designed to be used to secure <em>any</em> JVM-based application, it is most commonly used to secure a web application. It greatly simplifies how you secure web applications base on simple URL pattern matching and filter chain definitions. In addition to Shiro&rsquo;s API, Shiro&rsquo;s web support includes a rich JSP tag library to control page output.</p><h2>Features</h2>
+<table align="right" width="275" style="margin-left: 15px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
 
-<div class="addthis_toolbox addthis_default_style">
-<a class="addthis_button_compact" href="http://www.addthis.com/bookmark.php?v=250&amp;pubid=ra-4d66ef016022c3bd">Share</a>
-<span class="addthis_separator">|</span>
-<a class="addthis_button_preferred_1"></a>
-<a class="addthis_button_preferred_2"></a>
-<a class="addthis_button_preferred_3"></a>
-<a class="addthis_button_preferred_4"></a>
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="web.html">Web Support Docs</a></h3>
+  <p>Detailed support for integrating Shiro into web applications. </br><span style="font-size:11"><a href="web.html">Read More &gt;&gt;</a></span></p>
+	
 </div>
-<script type="text/javascript">var addthis_config = {"data_track_clickback":true};</script>
-<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4d66ef016022c3bd"></script>
-
-<p><br clear="none" class="atl-forced-newline">
-Shiro is designed to greatly simplifies how you secure web applications base on simple URL pattern matching and filter chain definitions. In addition to Shiro's API, Shiro's web support includes a rich JSP tag library to control page output.  </p>
-
-<p>Below is a highlight of the Shiro web features.</p>
-
-<h2><a name="WebFeatures-Features"></a>Features</h2>
-<ul><li><b>Simple ShiroFilter web.xml definition</b> - you can enable Shiro for a web application with one simple filter definition in web.xml.</li></ul>
-
-
-<ul><li><b>Protects all URLs</b> - Shiro can protect any type of web request that comes into your system.  For example, dynamically generated pages, REST request, etc.</li></ul>
-
-
-<ul><li><b>Innovative Filtering (URL-specific chains)</b> - Defining URL specific filter chains is much easier and more intuitive than using web.xml because, in Shiro, you can explicitly specify which filters you want to execute for each path and in what order.  And with Shiro you can have path-specific configuration for each filter in that chain.</li></ul>
-
-
-<ul><li><b>JSP Tag support</b> - The JSP tags allow you to easily control page output based on the current user's state and access rights.</li></ul>
-
-
-<ul><li><b>Transparent HttpSession support</b> - If you are using Shiro's native sessions, we have implemented HTTP Session API and the Servlet 2.5 API so you don't have to change any of your existing web code to use Shiro.</li></ul>
-
-<h2><a name="WebFeatures-GetStartedin10MinuteswithShiro"></a>Get Started in 10 Minutes with Shiro</h2>
-<p>Try out Shiro for yourself with our <a href="10-minute-tutorial.html" title="10 Minute Tutorial">10 Minute Tutorial</a>.  And if you have any questions about Shiro, please check out our <a href="forums.html" title="Forums">community forum</a> or <a href="mailing-lists.html" title="Mailing Lists">user mailing list</a> for answers from the community.</p>
+</td>
+</tr>
+</table>
+<ul>
+  <li><p><strong>Simple ShiroFilter web.xml definition</strong><br/>You can enable Shiro for a web application with one simple filter definition in web.xml.</p></li>
+  <li><p><strong>Protects all URLs</strong><br/>Shiro can protect any type of web request that comes into your system. For example, dynamically generated pages, REST request, etc.</p></li>
+  <li><p><strong>Innovative Filtering (URL-specific chains)</strong><br/>Defining URL specific filter chains is much easier and more intuitive than using web.xml because, in Shiro, you can explicitly specify which filters you want to execute for each path and in what order. And with Shiro you can have path-specific configuration for each filter in that chain.</p></li>
+</ul>
+<ul>
+  <li><p><strong>JSP Tag support</strong><br/>The JSP tags allow you to easily control page output based on the current user&rsquo;s state and access rights.</p></li>
+  <li><p><strong>Transparent HttpSession support</strong><br/>If you are using Shiro&rsquo;s native sessions, we have implemented HTTP Session API and the Servlet 2.5 API so you don&rsquo;t have to change any of your existing web code to use Shiro.</p></li>
+</ul>
 
         </div>
 
@@ -125,7 +101,7 @@ Shiro is designed to greatly simplifies 
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -133,4 +109,4 @@ Shiro is designed to greatly simplifies 
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/web.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/web.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/web.html (original)
+++ shiro/site/publish/web.html Thu Jan 30 21:13:51 2014
@@ -51,35 +51,49 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
 
             <h1><a name="Web-ApacheShiroWebSupport"></a>Apache Shiro Web Support</h1>
+
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="web-features.html">Web Apps with Shiro</a></h3>
+  <p>Learn more about integrating Shiro into web applications. </br><span style="font-size:11"><a href="web-features.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="/session-management-features.html">Session Management</a></h3>
+  <p>Shiro enables sessions for any application environment. Learn more! </br><span style="font-size:11"><a href="/session-management-features.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="//permissions.html">Permissions</a></h3>
+  <p>Learn more about Shiro's powerful and intuitive permission syntax. </br><span style="font-size:11"><a href="/permissions.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="java-authentication-guide.html">Java Authentication Guide</a></h3>
+  <p>Learn how Authentication in Java is performed in Shiro. </br><span style="font-size:11"><a href="java-authentication-guide.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
+  <p>Learn how Shiro handles access control in Java. </br><span style="font-size:11"><a href="java-authorization-guide.html">Read More &gt;&gt;</a></span></p>	
+
+</div>
+</td>
+</tr>
+</table>
 <div class="toc">
 <ul><li><a href="#Web-Configuration">Configuration</a></li><ul><li><a href="#Web-%7B%7Bweb.xml%7D%7D"> <tt>web.xml</tt></a></li><ul><li><a href="#Web-Shiro1.2andlater">Shiro 1.2 and later</a></li><ul><li><a href="#Web-Custom%7B%7BWebEnvironment%7D%7DClass">Custom <tt>WebEnvironment</tt> Class</a></li><li><a href="#Web-CustomConfigurationLocations">Custom Configuration Locations</a></li></ul><li><a href="#Web-Shiro1.1andearlier">Shiro 1.1 and earlier</a></li><ul><li><a href="#Web-CustomPath">Custom Path</a></li><li><a href="#Web-InlineConfig">Inline Config</a></li></ul></ul><li><a href="#Web-WebINIconfiguration">Web INI configuration</a></li><ul><li><a href="#Web-%7B%7B%5Curls%5C%7D%7D"> <tt>[urls]</tt></a></li><ul><li><a href="#Web-URLPathExpressions">URL Path Expressions</a></li><li><a href="#Web-FilterChainDefinitions">Filter Chain Definitions</a></li><ul><li><a href="#Web-AvailableFilters">Available Filters</a></li></ul></ul></ul></ul><li><a href="#Web-DefaultFilters">Default Fil
 ters</a></li><li><a href="#Web-EnablingandDisablingFilters">Enabling and Disabling Filters</a></li><ul><li><a href="#Web-GeneralEnabling%2FDisabling">General Enabling/Disabling</a></li><li><a href="#Web-RequestspecificEnabling%2FDisabling">Request-specific Enabling/Disabling</a></li><li><a href="#Web-PathspecificEnabling%2FDisabling">Path-specific Enabling/Disabling</a></li></ul><li><a href="#Web-SessionManagement">Session Management</a></li><ul><li><a href="#Web-ServletContainerSessions">Servlet Container Sessions</a></li><ul><li><a href="#Web-ServletContainerSessionTimeout">Servlet Container Session Timeout</a></li></ul><li><a href="#Web-NativeSessions">Native Sessions</a></li><ul><li><a href="#Web-%7B%7BDefaultWebSessionManager%7D%7D"> <tt>DefaultWebSessionManager</tt></a></li><ul><li><a href="#Web-NativeSessionTimeout">Native Session Timeout</a></li><li><a href="#Web-SessionCookie">Session Cookie</a></li><ul><li><a href="#Web-SessionCookieConfiguration">Session Cookie Configurat
 ion</a></li><li><a href="#Web-DisablingtheSessionCookie">Disabling the Session Cookie</a></li></ul></ul></ul></ul><li><a href="#Web-RememberMeServices">Remember Me Services</a></li><ul><li><a href="#Web-ProgrammaticSupport">Programmatic Support</a></li><li><a href="#Web-FormbasedLogin">Form-based Login</a></li><li><a href="#Web-Cookieconfiguration">Cookie configuration</a></li><li><a href="#Web-Custom%7B%7BRememberMeManager%7D%7D">Custom <tt>RememberMeManager</tt></a></li></ul><li><a href="#Web-JSP%2FGSPTagLibrary">JSP / GSP Tag Library</a></li><ul><li><a href="#Web-TagLibraryConfiguration">Tag Library Configuration</a></li><li><a href="#Web-The%7B%7Bguest%7D%7Dtag">The <tt>guest</tt> tag</a></li><li><a href="#Web-The%7B%7Buser%7D%7Dtag">The <tt>user</tt> tag</a></li><li><a href="#Web-The%7B%7Bauthenticated%7D%7Dtag">The <tt>authenticated</tt> tag</a></li><li><a href="#Web-The%7B%7BnotAuthenticated%7D%7Dtag">The <tt>notAuthenticated</tt> tag</a></li><li><a href="#Web-The%7B%7Bprinci
 pal%7D%7Dtag">The <tt>principal</tt> tag</a></li><ul><li><a href="#Web-Typedprincipal">Typed principal</a></li><li><a href="#Web-Principalproperty">Principal property</a></li></ul><li><a href="#Web-The%7B%7BhasRole%7D%7Dtag">The <tt>hasRole</tt> tag</a></li><li><a href="#Web-The%7B%7BlacksRole%7D%7Dtag">The <tt>lacksRole</tt> tag</a></li><li><a href="#Web-The%7B%7BhasAnyRole%7D%7Dtag">The <tt>hasAnyRole</tt> tag</a></li><li><a href="#Web-The%7B%7BhasPermission%7D%7Dtag">The <tt>hasPermission</tt> tag</a></li><li><a href="#Web-The%7B%7BlacksPermission%7D%7Dtag">The <tt>lacksPermission</tt> tag</a></li></ul><li><a href="#Web-Lendahandwithdocumentation">Lend a hand with documentation</a></li></ul></div>
 
@@ -900,6 +914,7 @@ Hello, <span class="code-tag">&lt;%= Sec
 
 <p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
 
+
         </div>
 
     </div><!--END WRAPPER-->
@@ -910,7 +925,7 @@ Hello, <span class="code-tag">&lt;%= Sec
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -918,4 +933,4 @@ Hello, <span class="code-tag">&lt;%= Sec
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/webapp-tutorial.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/webapp-tutorial.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/webapp-tutorial.html (original)
+++ shiro/site/publish/webapp-tutorial.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -443,7 +427,7 @@ You may edit the user!
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -451,4 +435,4 @@ You may edit the user!
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/what-is-shiro.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/what-is-shiro.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/what-is-shiro.html (original)
+++ shiro/site/publish/what-is-shiro.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -133,7 +117,7 @@ All of this could happen without requiri
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -141,4 +125,4 @@ All of this could happen without requiri
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/wiki-todos.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/wiki-todos.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/wiki-todos.html (original)
+++ shiro/site/publish/wiki-todos.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -101,7 +85,7 @@ Cryptography Guide</p>
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -109,4 +93,4 @@ Cryptography Guide</p>
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/trunk/assets/css/style.css
URL: http://svn.apache.org/viewvc/shiro/site/trunk/assets/css/style.css?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/assets/css/style.css (original)
+++ shiro/site/trunk/assets/css/style.css Thu Jan 30 21:13:51 2014
@@ -24,8 +24,8 @@
 
 a:link {color:#3254a0; text-decoration:none;}
 a:visited {color:#3254a0; text-decoration:none;}
-a:hover {color:#3254a0; text-decoration:underline;}
-a:active {color:#3254a0; text-decoration:none;}
+a:hover {color: #4068c3; text-decoration:underline;}
+a:active {color: #4377d7; text-decoration:none;}
 
 body {
 	background:url(../images/back.jpg);
@@ -89,56 +89,22 @@ dl, menu, ol, ul, li {
 	margin:10px 0 0 0;
 }
 
-#navigation {
-	float:right;
-	position:relative;
-	width:600px;
-	margin:4px 10px 0 0;
-	padding:0 0 0 0;
+ul.navigation {
+    float: right;
+    margin: 4px 10px 0 0;
+    padding: 25px 0 0 0;
 }
-
-.navigation-button {
-	background:url(../images/nav-buttons.png) 0px 0px no-repeat;
-	width:127px;
-	height:35px;
-	margin:0 11px 0 11px;
-	float:left;
-	text-align:center;
-	color:#3254a0;
-	text-shadow: 1px 1px 0px #fff;
-	filter: dropshadow(color=#fff, offx=1, offy=1);
-	padding:17px 0 0 0;
-	font-size:16px;
-}
-
-.navigation-button:hover {
-	background:url(../images/nav-buttons.png) 0px -52px no-repeat;
-	color:#FFF;
-	text-shadow:none;
-}
-
-.navigation-button:active {
-	background:url(../images/nav-buttons.png) 0px -52px no-repeat;
-	color:#FFF;
-	text-shadow:none;
-}
-
-#secondary-navigation {
-	float:right;
-	margin:-1.1em 13px 0 0;
-	padding:0;
-}
-
-#secondary-navigation li {
-	float:left;
-	font-size:12px;
-	color:#3254a0;
-	padding:0 16px 0 16px;
-	border-left:#3254a0 solid 1px;
+ul.navigation ul {
+    margin: 0;
 }
-
-#secondary-navigation li:first-child {
-	border:none;
+ul.navigation li {
+    list-style-type: none;
+    float: left;
+    padding: 0 0 0 27px;
+}
+ul.navigation a {
+    font-size: 1.1em;
+    font-weight: bold;
 }
 
 #content {

Added: shiro/site/trunk/authentication-features.md
URL: http://svn.apache.org/viewvc/shiro/site/trunk/authentication-features.md?rev=1562965&view=auto
==============================================================================
--- shiro/site/trunk/authentication-features.md (added)
+++ shiro/site/trunk/authentication-features.md Thu Jan 30 21:13:51 2014
@@ -0,0 +1,47 @@
+title: AuthenticationFeatures-ApacheShiroAuthenticationFeatures
+
+#Apache Shiro Authentication Features
+
+Authentication is the process of identity verification-- you are trying to verify a user is who they say they are.  To do so, a user needs to provide some sort of proof of identity that your system understands and trusts. 
+
+The Shiro framework is designed to make authentication as clean and intuitive as possible while providing a rich set of features.  Below is a highlight of the Shiro authentication features.
+
+## Features
+
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="java-authentication-guide.html">Java Authentication Guide</a></h3>
+  <p>Learn how Authentication in Java is performed in Shiro. </br><span style="font-size:11"><a href="java-authentication-guide.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="authentication.html">Authentication Docs</a></h3>
+  <p>Full documentation on Shiro's Authentication functionality. </br><span style="font-size:11"><a href="authentication.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+</div>
+</td>
+</tr>
+</table>
+
+
+*   **Subject Based** - Almost everything you do in Shiro is based on the currently executing user, called a Subject.  And you can easily retrieve the Subject anywhere in your code.  This makes it easier for you to understand and work with Shiro in your applications.
+
+*   **Single Method call** - The authentication process is a single method call.  Needing only one method call keeps the API simple and your application code clean, saving you time and effort.
+
+*   **Rich Exception Hierarchy** - Shiro offers a rich exception hierarchy to offered detailed explanations for why a login failed.  The hierarchy can help you more easily diagnose code bugs or customer services issues related to authentication.  In addition, the richness can help you create more complex authentication functionality if needed.
+
+*   **'Remember Me' built in** - Standard in the Shiro API is the ability to remember your users if they return to your application.  You can offer a better user experience to your them with minimal development effort.
+
+*   **Pluggable data sources** - Shiro uses pluggable data access objects (DAOs), called Realms, to connect to security data sources like LDAP and Active Directory.  To help you avoid building and maintaining integrations yourself, Shiro provides out-of-the-box realms for popular data sources like LDAP, Active Directory, Kerberos, and JDBC.  If needed, you can also create your own realms to support specific functionality not included in the basic realms.
+
+*   **Login with one or more realms** - Using Shiro, you can easily authenticate a user against one or more realms and return one unified view of their identity.  In addition, you can customize the authentication process with Shiro's notion of an authentication strategy. The strategies can be setup in configuration files so changes don't require source code modifications-- reducing complexity and maintenance effort.
+

Added: shiro/site/trunk/authorization-features.md
URL: http://svn.apache.org/viewvc/shiro/site/trunk/authorization-features.md?rev=1562965&view=auto
==============================================================================
--- shiro/site/trunk/authorization-features.md (added)
+++ shiro/site/trunk/authorization-features.md Thu Jan 30 21:13:51 2014
@@ -0,0 +1,47 @@
+title: Apache Shiro Authorization Features
+
+# Apache Shiro Authorization Features
+
+Authorization, also called access control, is the process of determining access rights to resources in an application.  In other words, determining "who has access to what."  Authorization is used to answer security questions like, "is the user allowed to edit accounts", "is this user allowed to view this web page", "does this user have access to this button?"  These are all decisions determining what a user has access to and therefore all represent authorization checks.
+
+Authorization is a critical element of any application but it can quickly become very complex.  Shiro's goal is to eliminate much of the complexity around authorization so that you can more easily build secure software. Below is a highlight of the Shiro authorization features. 
+
+## Features
+
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+ 
+  <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
+  <p>Learn how Shiro handles access control in Java. </br><span style="font-size:11"><a href="java-authorization-guide.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="authorization.html">Authorization Docs</a></h3>
+  <p>Full documentation on Apache Shiro's Authorization functionality. </br><span style="font-size:11"><a href="authorization.html">Read More &gt;&gt;</a></span></p>
+  
+	<h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+
+	<h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+</div>
+</td>
+</tr>
+</table>
+
+*   **Subject-based** - Almost everything you do in Shiro is based on the currently executing user, called a Subject.  And you can easily access the subject retrieve the Subject and checks its roles, permissions, or other relevant attributes anywhere in your code.  This makes it easier for you to understand and work with Shiro in your applications.
+
+*   **Checks based on roles or permissions** - Since the complexity of authorization differs greatly between applications, Shiro is designed to be flexible, supporting both role-based security and permission-based security based on your projects needs.
+
+*   **Powerful and intuitive permission syntax** - As an option, Shiro provides an out-of-the-box permission syntax, called Wildcard Permissions, that help you model the fine grained access policies your application may have. By using Shiro's Wildcard Permissions you get an easy-to-process and human readable syntax.  Moreoever, you don't have to go through the time-consuming effort and complexity of creating your own method for representing your access policies.
+
+*   **Multiple enforcement options** &#8211; Authorization checks in Shiro can be done through in-code checks, JDK 1.5 annotations, AOP, and JSP/GSP Taglibs.  Shiro's goal is to give you the choice to use the option you think are best based on your preferences and project needs.
+
+*   **Strong caching support** - Any of the modern open-source and/or enterprise caching products can be plugged in to Shiro to provide a fast and efficient user-experience. For authorization, caching is crucial for performance in larger environments or with more complex policies using back-end security data sources.
+
+*   **Pluggable data sources** - Shiro uses pluggable data access objects, referred to as Realms, to connect to security data sources where you keep your access control information, like a LDAP or a relational database.  To help you avoid building and maintaining integrations yourself, Shiro provides out-of-the-box realms for popular data sources like LDAP, Active Directory, Kerboros, and JDBC.  If needed, you can also create your own realms to support specific functionality not included in the basic realms.
+
+*   **Supports any data model** - Shiro can support any data model for access control-- it doesn't force a model on you. Your realm implementation ultimately decides how your permissions and roles are grouped together and whether to return a "yes" or a "no" answer to Shiro.  This feature allows you to architect your application in the manner you chose and Shiro will bend to support you.
\ No newline at end of file

Modified: shiro/site/trunk/cas.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/cas.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/cas.html (original)
+++ shiro/site/trunk/cas.html Thu Jan 30 21:13:51 2014
@@ -1,5 +1,21 @@
 <h1><a name="CAS-IntegratingApacheShirowithCASSSOserver"></a>Integrating Apache Shiro with CAS SSO server</h1>
 
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+	
+	<h2>Related Content</h2>
+  <h3><a href="web-features.html">Web Apps with Shiro</a></h3>
+  <p>Learn more about integrating Shiro into web applications. </br><span style="font-size:11"><a href="web-features.html">Read More &gt;&gt;</a></span></p>
+	
+</div>
+</td>
+</tr>
+</table>
+
+
 <p>The <em>shiro-cas</em> module is made to protect a web application with a <a class="external-link" href="http://www.jasig.org/cas" rel="nofollow">Jasig CAS</a> SSO server. It enables a Shiro-enabled application to be a CAS client.</p>
 
 <h2><a name="CAS-BasicunderstandingoftheCASprotocol"></a>Basic understanding of the CAS protocol</h2>
@@ -158,4 +174,4 @@ roles.loginUrl = https:<span class="code
 
 <h2><a name="CAS-History"></a>History</h2>
 
-<p><em>Version 1.2.0</em>&#160;: first release of the <em>shiro-cas</em> module.</p>
\ No newline at end of file
+<p><em>Version 1.2.0</em>&#160;: first release of the <em>shiro-cas</em> module.</p>

Added: shiro/site/trunk/community.md
URL: http://svn.apache.org/viewvc/shiro/site/trunk/community.md?rev=1562965&view=auto
==============================================================================
--- shiro/site/trunk/community.md (added)
+++ shiro/site/trunk/community.md Thu Jan 30 21:13:51 2014
@@ -0,0 +1,31 @@
+title: Apache Shiro Community
+
+#Welcome to the Apache Shiro Community!
+
+We have a great user and developer community and hope that you become an active participant.
+
+Our community is here to help you learn about Shiro, figure out how to do what you need, identify and fix any bugs, and improve Shiro so that it continues to be a powerful and useful software project.
+
+*   **[Community Forums](forums.html)** - Need help? For users that prefer to use forums over mailing lists, we use Nabble
+
+*   **[Mailing Lists](mailing-lists.html)** - Need help, but hate forums? Lists for Users, Developers and Committers!
+
+*   **[Articles](articles.html)** - Read up on the latest discussions, guides, and how-tos created by members of our community
+
+*   **[News](news.html)** - Stay up to date on the latest Shiro news
+
+*   **[Events](events.html)** - Check out the next Shiro events and see if there's something near you to attend
+
+##Contribute and Commit!
+
+Apache Shiro is a non-profit project and relies on your help and contributions in order to evolve and improve.
+
+At the Shiro project we make it easy for anyone to join our great community and lend a hand. We welcome any help you can offer inlcuding help with documentation, identifying bugs, providing answers on the user mailing list, and providing helpful code improvements.
+
+*   **[How to Contribute](how-to-contribute.html)** - Join our community and help make Apache Shiro even better
+
+*   **[Developer Resources](developer-resources.html)** - Helpful information for anyone providing project help as a committer or contributor
+
+*   **[Issue Tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20SHIRO%20AND%20status%20%3D%20Open%20ORDER%20BY%20priority%20DESC)** - Once you're ready to contribute, this is a good place to see what needs to get done
+
+*   **[Donate to ASF](http://www.apache.org/foundation/sponsorship.html)** - Shiro is a project under the Apache Software Foundation, a non-profit that relies on donations and community support
\ No newline at end of file

Modified: shiro/site/trunk/config.scms.groovy
URL: http://svn.apache.org/viewvc/shiro/site/trunk/config.scms.groovy?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/config.scms.groovy (original)
+++ shiro/site/trunk/config.scms.groovy Thu Jan 30 21:13:51 2014
@@ -2,6 +2,12 @@ scms {
 
     excludes = ['templates/**', '**/.svn', '**/.git', '**/.gitignore', '**/*.iml', '**/*.ipr', '**/*.iws']
 
+    //global defaults:
+    //model {
+    //    //the above template uses the year for a copyright notice:
+    //    year = Calendar.getInstance.get(Calendar.YEAR)
+    //}
+
     patterns {
 
         'static/**/*.html' {

Modified: shiro/site/trunk/cryptography.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/cryptography.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/cryptography.html (original)
+++ shiro/site/trunk/cryptography.html Thu Jan 30 21:13:51 2014
@@ -1,7 +1,7 @@
-<p>TODO</p>
+<p>TO DO. In the mean time, you can read more about <a href="cryptography-features.html" title="Apache Shiro Cryptography Features">Shiro's Crypography Features</a>.</p>
 
 <h2><a name="Cryptography-Lendahandwithdocumentation"></a>Lend a hand with documentation </h2>
 
 <p>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider corrected, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro. </p>
 
-<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
\ No newline at end of file
+<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>

Modified: shiro/site/trunk/download.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/download.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/download.html (original)
+++ shiro/site/trunk/download.html Thu Jan 30 21:13:51 2014
@@ -1,5 +1,32 @@
 <h1><a name="Download-DownloadApacheShiro"></a>Download Apache Shiro</h1>
 
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+	
+	<h3><a href="10-minute-tutorial.html">10-Minute Shiro Tutorial</a></h3>
+  <p>Try Apache Shiro for yourself in under 10 minutes. </br><span style="font-size:11"><a href="10-minute-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="java-authentication-guide.html">Java Authentication Guide</a></h3>
+  <p>Learn how Authentication in Java is performed in Shiro. </br><span style="font-size:11"><a href="java-authentication-guide.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
+  <p>Learn how Shiro handles access control in Java. </br><span style="font-size:11"><a href="java-authorization-guide.html">Read More &gt;&gt;</a></span></p>	
+
+</div>
+</td>
+</tr>
+</table>
+
 <p>Apache Shiro 1.2.2 is the current stable release (Java 1.5+ JVM).</p>
 
 <p>To download Shiro please follow the instructions below.</p>
@@ -806,4 +833,4 @@ customizeMacroTable('TBL1365578679388', 
 svn checkout http:<span class="code-comment">//svn.apache.org/repos/asf/shiro/tags/shiro-root-1.1.0</span>
 </pre>
     </div>
-</div>
\ No newline at end of file
+</div>

Added: shiro/site/trunk/features.md
URL: http://svn.apache.org/viewvc/shiro/site/trunk/features.md?rev=1562965&view=auto
==============================================================================
--- shiro/site/trunk/features.md (added)
+++ shiro/site/trunk/features.md Thu Jan 30 21:13:51 2014
@@ -0,0 +1,33 @@
+title: Features-ApacheShiroFeaturesOverview
+
+#Apache Shiro Features Overview
+
+Apache Shiro aims to be the most comprehensive, but also the easiest to use Java security framework available.   Here are some of the frameworks finer points:
+
+*   The easiest to understand Java Security API anywhere.  Class and Interface names are intuitive and _make sense_.  Anything is pluggable but good defaults exist for everything.
+
+*   Support [authentication](authentication-features.html) ('logins') across one or more pluggable data sources (LDAP, JDBC, ActiveDirectory, etc).
+
+*   Perform [authorization](authorization-features.html) ('access control') based on roles or fine-grained [permissions](permissions.html), also using pluggable data sources.
+
+*   First-class [caching](caching.html) support for enhanced application performance.
+
+*   Built-in POJO-based Enterprise [Session Management](session-management-features.html).  Use in both web and non-web environments or in any environment where Single Sign On (SSO) or clustered or distributed sessions are desired.
+
+*   _Heterogeneous_ client session access.  You are no longer forced to use only the <tt>httpSession</tt> or Stateful Session Beans, which often unnecessarily tie applications to specific environments.  Flash applets, C# applications, Java Web Start, and Web Applications, etc. can now all share session state regardless of deployment environment.
+
+*   Simple Single Sign-On (SSO) support piggybacking the above Enterprise Session Management.  If sessions are federated across multiple applications, the user's authentication state can be shared too.  Log in once to any application and the others all recognize that log-in.
+
+*   Secure data with the easiest possible [Cryptogrpahy](cryptography-features.html) APIs available, giving you power and simplicity beyond what Java provides by default for ciphers and hashes.
+
+*   An incredibly robust yet _low-configuration_ web framework that can secure any url or resource, automatically handle logins and logouts, perform Remember Me services, and more.
+
+*   Extremely low number of required dependencies.  Standalone configuration requires only <tt>slf4j-api.jar</tt> and one of slf4j's binding .jars.  Web configuration additionally requires <tt>commons-beanutils-core.jar</tt>.  Feature-based dependencies (Ehcache caching, Quartz-based Session validation, Spring dependency injection, etc.) can be added when needed.
+
+## Want more information on what Shiro can do?  
+
+Check out the specific features for each of Shiro's major components: [Authentication](authentication-features.html), [Authorization](authorization-features.html), [Session Management](session-management-features.html), and [Cryptogrpahy](cryptography-features.html).
+
+##Get Started in 10 Minutes with Shiro
+
+Try out Shiro for yourself with our [10 Minute Tutorial](10-minute-tutorial.html).  And if you have any questions about Shiro, please check out our [community forum](forums.html) or [user mailing list](mailing-lists.html) for answers from the community.
\ No newline at end of file

Added: shiro/site/trunk/get-started.md
URL: http://svn.apache.org/viewvc/shiro/site/trunk/get-started.md?rev=1562965&view=auto
==============================================================================
--- shiro/site/trunk/get-started.md (added)
+++ shiro/site/trunk/get-started.md Thu Jan 30 21:13:51 2014
@@ -0,0 +1,28 @@
+title: Get Started with Apache Shiro
+
+# Get Started with Apache Shiro
+
+Apache Shiro focuses on ease-of-use, so you can rely on secure, stable authentication, authorization, cryptography, and session management. With Shiro’s easy-to-understand API, you can quickly and easily secure any application. Get started!
+
+Here are some links related help you get started with Shiro:
+
+* **[Introduction to the Apache Shiro Java Security Framework](introduction.html)**
+Apache Shiro's first and foremost goal is to be easy to use and understand. Security can be very complex at times, even painful, but it doesn't have to be.
+
+* **[Terminology](terminology.html)**
+Security can be really confusing because of the terminology used. We'll make life easier by clarifying some core concepts, so you understand how they're reflected in the Shiro API.
+
+* **[10-Minute Tutorial](10-minute-tutorial.html)**
+Learn all the ins and outs of the Shiro Framework in under 10 minutes. This quick and simple tutorial shows how a developer uses Shiro in their application. 
+
+* **[Your First Shiro Application](tutorial.html)**
+If you're new to Apache Shiro, this short tutorial will show you how to set up a very simple application secured by Apache Shiro. We'll discuss Shiro's core concepts along the way to help familiarize you with Shiro's design and API.
+
+* **[Architecture](architecture.html)**
+By modeling what is already intuitive for software developers, Apache Shiro remains intuitive and easy to use in practically any application.
+
+* **[Introductory Articles... and Beyond!](articles.html)**
+Articles and Guides written by and for members of the Apache Shiro community.
+
+* **[Apache Shiro Project Background](what-is-shiro.html)**
+Apache Shiro, like most useful tools, was created out of necessity. Learn more about the project history and mission statement.
\ No newline at end of file

Modified: shiro/site/trunk/index.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/index.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/index.html (original)
+++ shiro/site/trunk/index.html Thu Jan 30 21:13:51 2014
@@ -52,11 +52,11 @@
         </div>
     </a>
 
-    <a href="reference.html">
+    <a href="integration.html">
         <div class="service-tabs integrations">
             <h2>Integrations</h2>
 
-            <p>API&#8217;s giving you power and simplicty beyond what Java p[rovides by default...</p>
+            <p>API&#8217;s giving you power and simplicty beyond what Java provides by default...</p>
             <span class="more">Read More &gt;&gt;&gt;</span>
         </div>
     </a>
@@ -86,18 +86,20 @@
 
     <a href="download.html"><div class="download"></div></a>
 
-    <h2>News</h2>
+    <h2>Popular Guides</h2>
 
-    <h3><a href="2013/05/30/apache-shiro-122-released.html">Apache Shiro 1.2.2 Released!</a></h3>
-
-    <p>The Shiro team is pleased to announce the release of Apache Shiro version 1.2.2.</p>
-    <a href="2013/05/30/apache-shiro-122-released.html"><span class="more">Read More &gt;&gt;&gt;</span></a>
-
-    <h3><a href="2012/03/13/whats-new-in-apache-shiro-12.html">What&#8217;s New in Apache Shiro
-        1.2?</a></h3>
-
-    <p>Here's an article covering some of the main features and enhancements in Apache Shiro 1.2:</p>
-    <a href="2012/03/13/whats-new-in-apache-shiro-12.html"><span class="more">Read More &gt;&gt;&gt;</span></a>
+    <h3><a href="java-authentication-guide.html">Java Authentication Guide</a></h3>
+    <p>Learn how Shiro securely verifies identities.</p>
+    <a href="java-authentication-guide.html"><span class="more">Read More &gt;&gt;&gt;</span></a>
+
+    <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
+    <p>Learn how Shiro handles permissions, roles and users.</p>
+    <a href="java-authorization-guide.html"><span class="more">Read More &gt;&gt;&gt;</span></a>
+		
+    <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+    <p>Step-by-step tutorial for securing a web application with Apache Shiro.</p>
+    <a href="webapp-tutorial.html"><span class="more">Read More &gt;&gt;&gt;</span></a>
+		
 
     <h2>Communities Using Shiro</h2>
 

Added: shiro/site/trunk/integration.md
URL: http://svn.apache.org/viewvc/shiro/site/trunk/integration.md?rev=1562965&view=auto
==============================================================================
--- shiro/site/trunk/integration.md (added)
+++ shiro/site/trunk/integration.md Thu Jan 30 21:13:51 2014
@@ -0,0 +1,43 @@
+title: Apache Shiro Integrations
+
+#Apache Shiro Integrations
+
+Shiro has been downloaded over one million times and is in production at thousands of companies. One reason: it integrates well with other technologies and frameworks. 
+
+
+## Officially Supported Integrations
+These integrations are supported by the Apache Shiro Development team. Want to help make them great? [Contribute](how-to-contribute.html) back to the project!
+
+* **[Spring Application Framework](spring.html)** Integrate Shiro into standalone or web-based Spring applications.
+
+* **[Guice Dependency Injection Framework](guice.html)** For Guice-based applications using standard Guice conventions and mechanisms.
+
+* **[CAS SSO server](cas.html)** Protect your WebApp with a Jasig CAS SSO server. 
+
+
+##Open Source Community Integrations
+
+* **[Stormpath User Management](http://www.stormpath.com/blog/user-management-java-web-apps-stormpath-and-apache-shiro)** from [Stormpath](http://www.stormpath.com/)
+Pairing Apache Shiro with Stormpath gives you a full application security and user management system, with little to no coding.
+
+* **[Grails](http://grails.org/plugins/shiro)** from [Pivotal](http://grails.org/) and [@pledbrook](https://twitter.com/@pledbrook)
+Very up-to-date Grails/Shiro Integration, including Grails 2.0 and Shiro 1.2. Adds easy authentication and access control to Grails applications. 
+
+* **[Oauth](https://github.com/FeedTheCoffers/shiro-oauth)** from [@JimmiDyson](https://twitter.com/@JimmiDyson)
+Source code for an OAuth module for Apache Shiro based on Scribe
+
+* **[Google App Engine](https://github.com/cilogi/gaeshiro)** from [@cilogi](https://twitter.com/@cilogi)
+Demo of one way to integrate Shiro with App Engine and Google Guice, plus front-end user registration and password management.
+
+* **[Play!](https://github.com/wsargent/play-shiro)** from [@will_sargent](https://twitter.com/@will_sargent)
+A very simple integration between Apache Shiro and Play 2.0. If you want to play with Play, this project could use an update handling statelessness since the Shiro 1.2 release. 
+
+* **[55Wicket](https://github.com/55minutes/fiftyfive-wicket)** from [55 Minutes](http://www.55minutes.com/)
+A nifty set of tools and libraries for enhancing productivity with the Apache Wicket Java web framework, including Shiro Integration.
+
+* **[Lift](https://github.com/timperrett/lift-shiro)** from [@timperrett](https://twitter.com/@timperrett)
+Integration between Shiro and the Lift Web framework. Uses Lift’s sitemap Locs instead of Shiro’s built in web.xml resource filters to control access to URLs. 
+
+
+##Got An Integration?
+Have an integration you want listed? Use Subversion (SVN) to pull down a copy of this page, and participate in Shiro development! [Learn more about contributing to Apache Shiro](how-to-contribute.html).
\ No newline at end of file

Modified: shiro/site/trunk/java-authentication-guide.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/java-authentication-guide.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/java-authentication-guide.html (original)
+++ shiro/site/trunk/java-authentication-guide.html Thu Jan 30 21:13:51 2014
@@ -1,25 +1,36 @@
 <h1><a name="JavaAuthenticationGuide-JavaAuthenticationGuidewithApacheShiro"></a>Java Authentication Guide with Apache Shiro</h1>
 
-
-<div class="addthis_toolbox addthis_default_style">
-<a class="addthis_button_compact" href="http://www.addthis.com/bookmark.php?v=250&amp;pubid=ra-4d66ef016022c3bd">Share</a>
-<span class="addthis_separator">|</span>
-<a class="addthis_button_preferred_1"></a>
-<a class="addthis_button_preferred_2"></a>
-<a class="addthis_button_preferred_3"></a>
-<a class="addthis_button_preferred_4"></a>
-</div>
-<script type="text/javascript">var addthis_config = {"data_track_clickback":true};</script>
-<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4d66ef016022c3bd"></script>
-
-
 <p><br clear="none" class="atl-forced-newline">
 Authentication is the process of identity verification-- you are trying to prove a user is who they say they are. To do so, a user needs to provide some sort of proof of identity that your system understands and trust.</p>
 
-<p>The goal of this guide is to walk you through how Authentication in Java is preformed in Shiro. If you haven't already please take moment and go through Shiro's <a href="10-minute-tutorial.html" title="10 Minute Tutorial">10 Minute Tutorial</a> so that you get a basic understanding of how to work with Shiro.</p>
+<p>The goal of this guide is to walk you through how Authentication in Java is performed in Shiro. If you haven't already please take moment and go through Shiro's <a href="10-minute-tutorial.html" title="10 Minute Tutorial">10 Minute Tutorial</a> so that you get a basic understanding of how to work with Shiro.</p>
 
 <h2><a name="JavaAuthenticationGuide-Terminologyyou%27llneed"></a>Terminology you'll need</h2>
 
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="authentication-features.html">Authentication Features</a></h3>
+  <p>Quick overview of easy, subject-based authentication in Shiro. </br><span style="font-size:11"><a href="authentication-features.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="authentication.html">Authentication Docs</a></h3>
+  <p>Full documentation on Apache Shiro's Authentication functionality. </br><span style="font-size:11"><a href="authentication.html">Read More &gt;&gt;</a></span></p>
+	
+	<h3><a href="10-minute-tutorial.html">10-Minute Shiro Tutorial</a></h3>
+  <p>Try Apache Shiro for yourself in under 10 minutes. </br><span style="font-size:11"><a href="10-minute-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+	<h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+
+</div>
+</td>
+</tr>
+</table>
+
 <ul><li><b>Subject</b> - Security specific user 'view' of an application user.  It can be a human being, a third-party process, a server connecting to you application application, or even a cron job.  Basically, it is anything or anyone communicating with your application.</li></ul>
 
 
@@ -154,4 +165,4 @@ currentUser.logout(); <span class="code-
 
 <p>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider corrected, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro. </p>
 
-<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
\ No newline at end of file
+<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>

Modified: shiro/site/trunk/java-authorization-guide.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/java-authorization-guide.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/java-authorization-guide.html (original)
+++ shiro/site/trunk/java-authorization-guide.html Thu Jan 30 21:13:51 2014
@@ -1,18 +1,5 @@
 <h1><a name="JavaAuthorizationGuide-JavaAuthorizationGuidewithApacheShiro"></a>Java Authorization Guide with Apache Shiro</h1>
 
-
-<div class="addthis_toolbox addthis_default_style">
-<a class="addthis_button_compact" href="http://www.addthis.com/bookmark.php?v=250&amp;pubid=ra-4d66ef016022c3bd">Share</a>
-<span class="addthis_separator">|</span>
-<a class="addthis_button_preferred_1"></a>
-<a class="addthis_button_preferred_2"></a>
-<a class="addthis_button_preferred_3"></a>
-<a class="addthis_button_preferred_4"></a>
-</div>
-<script type="text/javascript">var addthis_config = {"data_track_clickback":true};</script>
-<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4d66ef016022c3bd"></script>
-
-
 <p><br clear="none" class="atl-forced-newline">
 Authorization, or access control, is the function of specifying access rights to resources.  In other words, <em>who</em> has access to <em>what</em>.</p>
 
@@ -22,6 +9,34 @@ Authorization, or access control, is the
 <p>Authorization has three core elements that we reference quite a bit in Shiro-- permissions, roles, and users.  </p>
 
 <h3><a name="JavaAuthorizationGuide-PermissionsDefined"></a>Permissions Defined</h3>
+
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="authorization-features.html">Authorization Features</a></h3>
+  <p>Quick overview of permissions, roles, and users in Shiro. </br><span style="font-size:11"><a href="authorization-features.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="authorization.html">Authorization Docs</a></h3>
+  <p>Full documentation on Apache Shiro's Authorization functionality. </br><span style="font-size:11"><a href="authorization.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="10-minute-tutorial.html">10-Minute Shiro Tutorial</a></h3>
+  <p>Try Apache Shiro for yourself in under 10 minutes. </br><span style="font-size:11"><a href="10-minute-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+</div>
+</td>
+</tr>
+</table>
+
 <p>Permissions are the most atomic level of a security policy and they are statements of functionality. Permissions represent what can be done in your application.  A well formed permission describes a resource types and what actions are possible when you interact with those resources.    Can you <em>open</em> a <em>door</em>?  Can you <em>read</em> a <em>file</em>? Can you <em>delete</em> a <em>customer record</em>? Can you <em>push</em> a <em>button</em>? </p>
 
 <p>Common actions for data-related resources are create, read, update, and delete, commonly referred to as CRUD.</p>
@@ -216,4 +231,4 @@ If (currentUser.isPermitted(printPermiss
 
 <p>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider corrected, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro. </p>
 
-<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
\ No newline at end of file
+<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>

Modified: shiro/site/trunk/permissions.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/permissions.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/permissions.html (original)
+++ shiro/site/trunk/permissions.html Thu Jan 30 21:13:51 2014
@@ -1,5 +1,29 @@
 <h1><a name="Permissions-UnderstandingPermissionsinApacheShiro"></a>Understanding Permissions in Apache Shiro</h1>
 
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
+  <p>Learn how Shiro handles access control in Java. </br><span style="font-size:11"><a href="java-authorization-guide.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+	
+	<h3><a href="10-minute-tutorial.html">10-Minute Shiro Tutorial</a></h3>
+  <p>Try Apache Shiro for yourself in under 10 minutes. </br><span style="font-size:11"><a href="10-minute-tutorial.html">Read More &gt;&gt;</a></span></p>
+  
+</div>
+</td>
+</tr>
+</table>
+
 <p>Shiro defines a Permission as a statement that defines an explicit behavior or action.  It is a statement of raw functionality in an application and nothing more.  Permissions are the lowest-level constructs in security polices, and they explicitly define only "what" the application can do.</p>
 
 <p>They do <em>not</em> at all describe "who" is able to perform the action(s).</p>
@@ -299,4 +323,4 @@ printer:print
 
 <p>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider corrected, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro. </p>
 
-<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
\ No newline at end of file
+<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>

Modified: shiro/site/trunk/securitymanager.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/securitymanager.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/securitymanager.html (original)
+++ shiro/site/trunk/securitymanager.html Thu Jan 30 21:13:51 2014
@@ -8,9 +8,16 @@
 
 <p>As stated previously, the application's <tt>SecurityManager</tt> performs security operations and manages state for <em>all</em> application users.  In Shiro's default <tt>SecurityManager</tt> implementations, this includes:</p>
 
-<ul><li>Authentication</li><li>Authorization</li><li>Session Management</li><li>Cache Management</li><li><a href="realm.html" title="Realm">Realm</a> coordination</li><li>Event propagation</li><li>"Remember Me" Services</li><li>Subject creation</li><li>Logout<br clear="none">
-and more.</li></ul>
-
+<ul>
+	<li>Authentication</li>
+	<li>Authorization</li>
+	<li>Session Management</li>
+	<li>Cache Management</li>
+	<li><a href="realm.html" title="Realm">Realm</a> coordination</li>
+	<li>Event propagation</li>
+	<li>"Remember Me" Services</li>
+	<li>Subject creation</li>
+	<li>Logout<br clear="none">and more.</li></ul>
 
 <p>But this is a lot of functionality to try to manage in a single component.  And, making these things flexible and customizable would be very difficult if everything were lumped into a single implementation class.  </p>
 
@@ -22,7 +29,13 @@ and more.</li></ul>
 
 <p>The nested components that the <tt>SecurityManager</tt> coordinates and delegates to are:</p>
 
-<ul><li><a href="authenticator.html" title="Authenticator">Authenticator</a> (<tt>org.apache.shiro.authc.Authenticator</tt>)</li><li><a href="authorizer.html" title="Authorizer">Authorizer</a> (<tt>org.apache.shiro.authz.Authorizer</tt>)</li><li><a href="sessionmanager.html" title="SessionManager">SessionManager</a> (<tt>org.apache.shiro.session.mgt.SessionManager</tt>)</li><li><a href="cachemanager.html" title="CacheManager">CacheManager</a> (<tt>org.apache.shiro.cache.CacheManager</tt>)</li><li><a class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=SHIRO&amp;title=RememberMeManager&amp;linkCreation=true&amp;fromPageId=9373660">RememberMeManager</a> (<tt>org.apache.shiro.mgt.RememberMeManager</tt>)</li><li><a class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=SHIRO&amp;title=SubjectFactory&amp;linkCreation=true&amp;fromPageId=9373660">SubjectFactory</a> (<tt>org.apache.shiro.mgt.SubjectFactory</tt>
 )</li></ul>
+<ul>
+	<li>Authenticator (<tt>org.apache.shiro.authc.Authenticator</tt>)</li>
+	<li>Authorizer (<tt>org.apache.shiro.authz.Authorizer</tt>)</li>
+	<li>SessionManager (<tt>org.apache.shiro.session.mgt.SessionManager</tt>)</li>
+	<li><a href="cachemanager.html" title="CacheManager">CacheManager</a> (<tt>org.apache.shiro.cache.CacheManager</tt>)</li>
+	<li>RememberMeManager  (<tt>org.apache.shiro.mgt.RememberMeManager</tt>)</li>
+	<li>SubjectFactory(<tt>org.apache.shiro.mgt.SubjectFactory</tt>)</li></ul>
 
 
 <p>The <tt>SecurityManager</tt> implementations and are also JavaBeans compatible, which allows you (or a configuration mechanism) to easily customize the pluggable components via standard JavaBeans accessor/mutator methods (get*/set*).  This means the Shiro's architectural modularity can translate into very easy configuration for custom behavior.</p>

Modified: shiro/site/trunk/session-management.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/session-management.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/session-management.html (original)
+++ shiro/site/trunk/session-management.html Thu Jan 30 21:13:51 2014
@@ -1,4 +1,32 @@
 <h1><a name="SessionManagement-SessionManagement"></a>Session Management</h1>
+
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+	
+	<h3><a href="10-minute-tutorial.html">10-Minute Shiro Tutorial</a></h3>
+  <p>Try Apache Shiro for yourself in under 10 minutes. </br><span style="font-size:11"><a href="10-minute-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="java-authentication-guide.html">Java Authentication Guide</a></h3>
+  <p>Learn how Authentication in Java is performed in Shiro. </br><span style="font-size:11"><a href="java-authentication-guide.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
+  <p>Learn how Shiro handles access control in Java. </br><span style="font-size:11"><a href="java-authorization-guide.html">Read More &gt;&gt;</a></span></p>	
+
+</div>
+</td>
+</tr>
+</table>
+
 <div class="toc">
 <ul><li><a href="#SessionManagement-UsingSessions">Using Sessions</a></li><li><a href="#SessionManagement-TheSessionManager">The SessionManager</a></li><ul><li><a href="#SessionManagement-SessionTimeout">Session Timeout</a></li><ul><li><a href="#SessionManagement-PerSessionTimeout">Per-Session Timeout</a></li></ul><li><a href="#SessionManagement-SessionListeners">Session Listeners</a></li><li><a href="#SessionManagement-SessionStorage">Session Storage</a></li><ul><li><a href="#SessionManagement-EHCacheSessionDAO">EHCache SessionDAO</a></li><ul><li><a href="#SessionManagement-EHCacheSessionCacheConfiguration">EHCache Session Cache Configuration</a></li><li><a href="#SessionManagement-EHCacheSessionCacheName">EHCache Session Cache Name</a></li></ul><li><a href="#SessionManagement-CustomSessionIDs">Custom Session IDs</a></li></ul><li><a href="#SessionManagement-SessionValidation%26Scheduling">Session Validation &amp; Scheduling</a></li><ul><li><a href="#SessionManagement-DefaultSession
 ValidationScheduler">Default SessionValidationScheduler</a></li><li><a href="#SessionManagement-CustomSessionValidationScheduler">Custom SessionValidationScheduler</a></li><li><a href="#SessionManagement-DisablingSessionValidation">Disabling Session Validation</a></li><li><a href="#SessionManagement-InvalidSessionDeletion">Invalid Session Deletion</a></li></ul></ul><li><a href="#SessionManagement-SessionClustering">Session Clustering</a></li><ul><li><a href="#SessionManagement-%7B%7BEnterpriseCacheSessionDAO%7D%7D"> <tt>EnterpriseCacheSessionDAO</tt></a></li><li><a href="#SessionManagement-EhcacheTerracotta">Ehcache + Terracotta</a></li><li><a href="#SessionManagement-Zookeeper">Zookeeper</a></li></ul><li><a href="#SessionManagement-SessionsandSubjectState">Sessions and Subject State</a></li><ul><li><a href="#SessionManagement-StatefulApplications%28Sessionsallowed%29">Stateful Applications (Sessions allowed)</a></li><li><a href="#SessionManagement-StatelessApplications%28Sessionles
 s%29">Stateless Applications (Sessionless)</a></li><ul><li><a href="#SessionManagement-DisablingSubjectStateSessionStorage">Disabling Subject State Session Storage</a></li></ul><li><a href="#SessionManagement-AHybridApproach">A Hybrid Approach</a></li><ul><li><a href="#SessionManagement-SessionStorageEvaluator">SessionStorageEvaluator</a></li><ul><li><a href="#SessionManagement-SubjectInspection">Subject Inspection</a></li></ul><li><a href="#SessionManagement-Configuration">Configuration</a></li></ul><li><a href="#SessionManagement-WebApplications">Web Applications</a></li></ul></ul></div>
 

Modified: shiro/site/trunk/spring.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/spring.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/spring.html (original)
+++ shiro/site/trunk/spring.html Thu Jan 30 21:13:51 2014
@@ -1,4 +1,21 @@
-<h1><a name="Spring-IntegratingApacheShirointoSpringbasedApplications"></a>Integrating Apache Shiro into Spring based Applications</h1>
+<h1><a name="Spring-IntegratingApacheShirointoSpringbasedApplications"></a>Integrating Apache Shiro into Spring-based Applications</h1>
+
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+	
+  <h3><a href="web.html">Web Apps with Shiro</a></h3>
+  <p>Detailed support for integrating Shiro into web applications. </br><span style="font-size:11"><a href="web.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+
+</div>
+</td>
+</tr>
+</table>
 
 <p>This page covers the ways to integrate Shiro into <a class="external-link" href="http://www.springframework.org" rel="nofollow">Spring</a>-based applications.</p>
 
@@ -205,4 +222,4 @@ all of its configuration properties in w
 
 <p>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider corrected, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro. </p>
 
-<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
\ No newline at end of file
+<p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>

Modified: shiro/site/trunk/support.md
URL: http://svn.apache.org/viewvc/shiro/site/trunk/support.md?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/trunk/support.md (original)
+++ shiro/site/trunk/support.md Thu Jan 30 21:13:51 2014
@@ -1,6 +1,6 @@
 title: Apache Shiro Community Support
 
-# a name="Support-ApacheShiroCommunitySupport">Apache Shiro Community Support
+#Apache Shiro Community Support"
 
 The Shiro project offers support through its community of users, contributors, and project committers.
 
@@ -8,9 +8,4 @@ We encourage everyone to participate and
 
 * [Mailing Lists](mailing-lists.html "Mailing Lists")
 * [Forums](forums.html "Forums")
-
-<a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li><li><a href="forums.html" title="Forums">Forums</a></li><li><a href="issues.html" title="Issues">Issue &amp; Bug Tracking</a></li></ul>
-
-
-<h2><a name="Support-CommericalSupport"></a>Commerical Support</h2>
-<p><b><a href="commercial-support.html" title="Commercial Support">Commercial support and consulting</a></b> for Apache Shiro is offered by outside organizations who are actively involved with the project.</p>
\ No newline at end of file
+* [Issues and Bug Tracking](issues.html)
\ No newline at end of file



Mime
View raw message