shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdem...@apache.org
Subject [3/4] shiro-site git commit: Fixed a whole bunch of dead links and corrected redirects
Date Fri, 21 Oct 2016 20:07:00 GMT
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/how-to-contribute.html
----------------------------------------------------------------------
diff --git a/how-to-contribute.html b/how-to-contribute.html
index b08a0cd..b8cc271 100644
--- a/how-to-contribute.html
+++ b/how-to-contribute.html
@@ -6,7 +6,7 @@
 <p><a name="HowtoContribute-introductions"></a></p>
 <h2><a name="HowtoContribute-Introduction"></a>Introduction</h2>
 
-<p>The Shiro Project is an <a class="external-link" href="http://www.opensource.org" rel="nofollow">Open Source</a> volunteer project released under a <a href="license.html" title="License">very liberal license</a>. This means there are many ways to contribute to the project - either with direct participation (coding, documenting, answering questions, proposing ideas, reporting bugs, suggesting bug-fixes, etc..) or by resource donations (staff time, conference presentations, publicity, software) and even general hardware/money <a class="external-link" href="http://www.apache.org/foundation/thanks.html">donations</a> via the <a class="external-link" href="http://www.apache.org">Apache Software Foundation</a>.</p>
+<p>The Shiro Project is an <a class="external-link" href="https://opensource.org/" rel="nofollow">Open Source</a> volunteer project released under a <a href="license.html" title="License">very liberal license</a>. This means there are many ways to contribute to the project - either with direct participation (coding, documenting, answering questions, proposing ideas, reporting bugs, suggesting bug-fixes, etc..) or by resource donations (staff time, conference presentations, publicity, software) and even general hardware/money <a class="external-link" href="http://www.apache.org/foundation/thanks.html">donations</a> via the <a class="external-link" href="http://www.apache.org">Apache Software Foundation</a>.</p>
 
 <p>To begin with, we suggest you to subscribe to the <a href="mailing-lists.html" title="Mailing Lists">Shiro mailing lists</a> (follow the link for information on how to subscribe and to access the mail list archives). Listen-in for a while, to hear how others make contributions.</p>
 
@@ -133,4 +133,4 @@ git format-patch master --stdout > ~/patch-name.patch
 <p>This is a collection of tips for contributing to the project in a manner that is productive for all parties.</p>
 
 <ul><li>See general ASF <a class="external-link" href="http://www.apache.org/dev/contrib-email-tips.html">Tips for email contributors</a></li><li>There is no such thing as a dumb question.  Always check the <a href="mailing-lists.html" title="Mailing Lists">archives</a> to see if someone else asked it first and maybe already received an answer.</li><li>Every contribution is worthwhile. Even if the code isn't perfect.  Even if the documentation has typos.  Even if you got it wrong the first time around. Any contribution is a start of something special.  Through your continued effort and the help of the community, your contribution will evolve and get ever closer to "perfect".</li><li>Use sensible and concise email subject headings. Search engines, and humans trying to browse a voluminous list, will respond favourably to a descriptive title.</li><li>Start new threads with new Subject for new topics, rather than reusing the previous Subject line.</li><li>Keep each topic focused. If som
 e new topic arises then start a new discussion. This leaves the original topic to continue uncluttered.<br clear="none">
-Whenever you decide to start a new topic, then start with a fresh new email message window. Do not use the "Reply to" button, because threaded mail-readers get confused (they utilise the In-reply-to header). If so, then your new topic will get lost in the previous thread and go unanswered.</li><li>Prepend your email subject line with a marker when that is appropriate, e.g. [Proposal], [RT] (Random Thought which quickly blossom into research topics <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif" height="20" width="20" alt="" border="0">, [STATUS] (development status of a certain facility).</li><li>Remember that most people are participating in development on a volunteer basis and in their "spare time". These enthusiasts will attempt to respond to issues. It may take a little while to get your answers.</li><li>Research your topic thoroughly before beginning to discuss a new development issue. Search and browse through the
  email archives - your issue may have been discussed before. Do not just perceive a problem and then rush out with a question - instead, delve.</li><li>Try to at least offer a partial solution and not just a problem statement.</li><li>Take the time to clearly explain your issue and write a concise email message. Less confusion facilitates fast and complete resolution.</li><li>Do not bother to send an email reply that simply says "thanks". When the issue is resolved, that is the finish - end of thread. Reduce clutter.</li><li>You would usually do any development work against the master branch in Git.</li><li>When sending a patch, you usually do not need to worry about which Git branch it should be applied to. The maintainers of the repository will decide.</li><li>Keep all project-related discussion on the mailing list. It is much better to utilise the wider audience, rather than to break off into private discussion groups. You never know who else will have the answer to your issues, 
 and anyway other people are interested in the outcome.</li><li>Become familiar with the mailing lists. As you browse and search, you will see the way other people do things. Follow the leading examples.</li></ul>
+Whenever you decide to start a new topic, then start with a fresh new email message window. Do not use the "Reply to" button, because threaded mail-readers get confused (they utilise the In-reply-to header). If so, then your new topic will get lost in the previous thread and go unanswered.</li><li>Prepend your email subject line with a marker when that is appropriate, e.g. [Proposal], [RT] (Random Thought which quickly blossom into research topics <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.png" height="20" width="20" alt="" border="0">, [STATUS] (development status of a certain facility).</li><li>Remember that most people are participating in development on a volunteer basis and in their "spare time". These enthusiasts will attempt to respond to issues. It may take a little while to get your answers.</li><li>Research your topic thoroughly before beginning to discuss a new development issue. Search and browse through the
  email archives - your issue may have been discussed before. Do not just perceive a problem and then rush out with a question - instead, delve.</li><li>Try to at least offer a partial solution and not just a problem statement.</li><li>Take the time to clearly explain your issue and write a concise email message. Less confusion facilitates fast and complete resolution.</li><li>Do not bother to send an email reply that simply says "thanks". When the issue is resolved, that is the finish - end of thread. Reduce clutter.</li><li>You would usually do any development work against the master branch in Git.</li><li>When sending a patch, you usually do not need to worry about which Git branch it should be applied to. The maintainers of the repository will decide.</li><li>Keep all project-related discussion on the mailing list. It is much better to utilise the wider audience, rather than to break off into private discussion groups. You never know who else will have the answer to your issues, 
 and anyway other people are interested in the outcome.</li><li>Become familiar with the mailing lists. As you browse and search, you will see the way other people do things. Follow the leading examples.</li></ul>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 71d4eac..6c0b73f 100644
--- a/index.html
+++ b/index.html
@@ -72,7 +72,7 @@
             <td colspan="1" rowspan="1">
                 <h1>Getting Started</h1>
                 <ul>
-                    <li><a href="http://www.infoq.com/articles/apache-shiro">What is Apache Shiro?</a></li>
+                    <li><a href="https://www.infoq.com/articles/apache-shiro">What is Apache Shiro?</a></li>
                     <li><a href="10-minute-tutorial.html">10 Minute Tutorial</a></li>
                     <li><a href="articles.html">More articles...</a></li>
                 </ul>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/integration.md
----------------------------------------------------------------------
diff --git a/integration.md b/integration.md
index 9e4c303..c34a57b 100644
--- a/integration.md
+++ b/integration.md
@@ -17,10 +17,10 @@ These integrations are supported by the Apache Shiro Development team. Want to h
 
 ## 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/)
+* **[Stormpath User Management](https://stormpath.com/blog/user-management-java-web-apps-stormpath-and-apache-shiro)** from [Stormpath](https://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)
+* **[Grails](https://grails.org/plugins/shiro)** from [Pivotal](https://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. 
 
 * **[Apache Isis](http://isis.apache.org)** from [Apache](http://apache.org/) 
@@ -35,7 +35,7 @@ Demo of one way to integrate Shiro with App Engine and Google Guice, plus front-
 * **[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/)
+* **[55Wicket](https://github.com/55minutes/fiftyfive-wicket)** from [55 Minutes](http://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)

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/java-authentication-guide.html.vtl
----------------------------------------------------------------------
diff --git a/java-authentication-guide.html.vtl b/java-authentication-guide.html.vtl
index d34137c..9be7231 100644
--- a/java-authentication-guide.html.vtl
+++ b/java-authentication-guide.html.vtl
@@ -75,7 +75,7 @@ UsernamePasswordToken token =
 
 <p>We use this token to bundle the username and password we acquired in someway in our Java application.  Maybe they were submitted via a user web form, an HTTP header, or a command line. In Shiro, it does not matter how you acquire them-- it is protocol agnostic.</p>
 
-<p>In this example, we have decided that we want the application to remember users when they return.  So once the token is created, we use Shiro's built-in "Remember-me" feature by setting it to true on the token.  This is done using the token's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/UsernamePasswordToken.html\#setRememberMe(boolean)">setRememberMe()</a></tt> method</p>
+<p>In this example, we have decided that we want the application to remember users when they return.  So once the token is created, we use Shiro's built-in "Remember-me" feature by setting it to true on the token.  This is done using the token's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/UsernamePasswordToken.html#[[#]]#setRememberMe(boolean)">setRememberMe()</a></tt> method</p>
 
 <h3><a name="JavaAuthenticationGuide-Step2Submittheprincipalsandcredentialstoanauthenticationsystem."></a>Step 2 - Submit the principals and credentials to an authentication system.</h3>
 <p>So we&#8217;ve collected the information in a token and set it to remember returning users. The next step is in the Authentication process is to submit the token to an authentication system. Your authentication system is represented in Shiro by security-specific DAOs, that are referred to as <a class="external-link" href="static/current/apidocs/">Realms</a>.  For more information on realms please check out the <a class="external-link" href="realm.html">Shiro Realm Guide</a>.</p>
@@ -96,9 +96,9 @@ UsernamePasswordToken token =
 
 <p>First, we need to acquire the currently executing user, referred to as the subject.   A subject is just a security specific view of the user----it can be a human, a process, cron job, doesn&\#8217;t matter. In Shiro, there is always a subject instance available to the currently executing thread.  The concept of a subject is core to Shiro and most of the framework is centered around working with subjects. In this example, we will name this instance of subject currentUser.</p>
 
-<p>To acquire the subject, we use the <a class="external-link" href="static/current/apidocs/org/apache/shiro/SecurityUtils.html">SecurityUtils</a> class which is also a core pat of Shiro's API.  It will acquire the currently executing user via the <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/SecurityUtils.html\#getSubject()">getsubject()</a></tt> method call.  And we get back a subject instance that is representing who the current user is who is interacting with the system.  At this point in the example, the subject currentUser is anonymous.  There is no identity associated with them.</p>
+<p>To acquire the subject, we use the <a class="external-link" href="static/current/apidocs/org/apache/shiro/SecurityUtils.html">SecurityUtils</a> class which is also a core pat of Shiro's API.  It will acquire the currently executing user via the <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/SecurityUtils.html#[[#]]#getSubject()">getsubject()</a></tt> method call.  And we get back a subject instance that is representing who the current user is who is interacting with the system.  At this point in the example, the subject currentUser is anonymous.  There is no identity associated with them.</p>
 
-<p>Now with the user representation in hand, we authenticate them by just calling the <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#login(org.apache.shiro.authc.AuthenticationToken))">login()</a></tt> method and submit the token we just constructed a second ago.</p>
+<p>Now with the user representation in hand, we authenticate them by just calling the <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#login(org.apache.shiro.authc.AuthenticationToken))">login()</a></tt> method and submit the token we just constructed a second ago.</p>
 
 <h3><a name="JavaAuthenticationGuide-Step3Allowaccess%2Cretryauthentication%2Corblockaccess"></a>Step 3 - Allow access, retry authentication, or block access</h3>
 <p>Again really, really easy, single method call.  If the <tt>login()</tt> method call is successful, then the user is logged in and associated with a user account or identity.  From here, the user can go about using your application and retain their identity through their session or longer since we have set the "Remember Me" in our example.</p>
@@ -129,7 +129,7 @@ UsernamePasswordToken token =
 
 <p>As shown in the example above, Shiro supports the notion of "remember me" in adition to the normal login process. &#160;</p>
 
-<p>In Shiro, the Subject object supports two methods : <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isRemembered()">isRemembered()</a></tt> and <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isAuthenticated()">isAuthenticated()</a></tt>.</p>
+<p>In Shiro, the Subject object supports two methods : <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isRemembered()">isRemembered()</a></tt> and <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isAuthenticated()">isAuthenticated()</a></tt>.</p>
 
 <p>A "remembered" subject has an identity (it is not anonymous) and their identifying attributes,referred to as principals, are remembered from a successful authentication during a previous session.</p>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/java-authorization-guide.html.vtl
----------------------------------------------------------------------
diff --git a/java-authorization-guide.html.vtl b/java-authorization-guide.html.vtl
index 13cb3b6..da00351 100644
--- a/java-authorization-guide.html.vtl
+++ b/java-authorization-guide.html.vtl
@@ -85,7 +85,7 @@ Authorization, or access control, is the function of specifying access rights to
 <h4><a name="JavaAuthorizationGuide-RoleCheck"></a>Role Check</h4>
 <p>This is an example of how you do a role check programmatically in your application.  We want to check if a user has the <em>administrator</em> role and if they do, then we'll show a special button, otherwise we won't show it.</p>
 
-<p>First we get access to the current user, the <a href="subject.html" title="Subject">Subject</a>. Then we pass the <em>adminstrator</em> to the Subject's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#hasRole(java.lang.String)">.hasRole()</a></tt> method.  It will return <tt>TRUE</tt> or <tt>FALSE</tt>.  </p>
+<p>First we get access to the current user, the <a href="subject.html" title="Subject">Subject</a>. Then we pass the <em>adminstrator</em> to the Subject's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#hasRole(java.lang.String)">.hasRole()</a></tt> method.  It will return <tt>TRUE</tt> or <tt>FALSE</tt>.  </p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
@@ -110,7 +110,7 @@ Authorization, or access control, is the function of specifying access rights to
 <h4><a name="JavaAuthorizationGuide-PermissionCheck"></a>Permission Check</h4>
 <p>This is an example of how you do security checks by permission. We want to check if a user has permission to print to laserjet3000n and if they do, then we'll show a print button, otherwise we won't show it. This is an example of an instance level permission or instance level authorization.</p>
 
-<p>Again, first you get access to the current user, the <a href="subject.html" title="Subject">Subject</a>.  Then you construct a <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authz/Permission.html">Permission</a></tt> object or an instance that represents an action on a resource. In this case, the instance is named <tt>printerPermission</tt>, the resource is <em>laserjet3000n</em>, and the action is <em>print</em>.   Then we pass <tt>printerPermission</tt> to the Subject's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isPermitted(java.util.List)">.isPermitted()</a></tt> method.  It will return true or false.  </p>
+<p>Again, first you get access to the current user, the <a href="subject.html" title="Subject">Subject</a>.  Then you construct a <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authz/Permission.html">Permission</a></tt> object or an instance that represents an action on a resource. In this case, the instance is named <tt>printerPermission</tt>, the resource is <em>laserjet3000n</em>, and the action is <em>print</em>.   Then we pass <tt>printerPermission</tt> to the Subject's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isPermitted(java.util.List)">.isPermitted()</a></tt> method.  It will return true or false.  </p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/mailing-lists.html
----------------------------------------------------------------------
diff --git a/mailing-lists.html b/mailing-lists.html
index e68f511..751d45b 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -1,7 +1,43 @@
 <h1><a name="MailingLists-ApacheShiroMailingLists"></a>Apache Shiro Mailing Lists</h1>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> List Name </th><th colspan="1" rowspan="1" class="confluenceTh"> List Address </th><th colspan="1" rowspan="1" class="confluenceTh"> Subscribe </th><th colspan="1" rowspan="1" class="confluenceTh"> Unsubscribe </th><th colspan="1" rowspan="1" class="confluenceTh"> ASF Archive </th><th colspan="1" rowspan="1" class="confluenceTh"> MarkMail Archive </th><th colspan="1" rowspan="1" class="confluenceTh"> Nabble (Online Forums) </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Shiro User List </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="mailto:user@shiro.apache.org" rel="nofollow">user@shiro.apache.org</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="mailto:user-subscribe@shiro.apache.org" rel="nofollow">Subscribe</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="
 mailto:user-unsubscribe@shiro.apache.org" rel="nofollow">Unsubscribe</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="http://mail-archives.apache.org/mod_mbox/shiro-user/">ASF Archive</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0">  </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">Nabble Forum and Archive</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Shiro Developer List </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="mailto:dev@shiro.apache.org" rel="nofollow">dev@shiro.apache.org</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="mailto:dev-subscribe@shiro.apache.org" rel="nofollow">Subscri
 be</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="mailto:dev-unsubscribe@shiro.apache.org" rel="nofollow">Unsubscribe</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="http://mail-archives.apache.org/mod_mbox/shiro-dev/">ASF Archive</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0">  </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="http://shiro-developer.582600.n2.nabble.com/" rel="nofollow">Nabble Forum and Archive</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Shiro SCM List </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="mailto:commits@shiro.apache.org" rel="nofollow">commits@shiro.apache.org</a> </td><td colspan="1" rowspan="1" class="confluenc
 eTd"> <a class="external-link" href="mailto:commits-subscribe@shiro.apache.org" rel="nofollow">Subscribe</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="mailto:commits-unsubscribe@shiro.apache.org" rel="nofollow">Unsubscribe</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a class="external-link" href="http://mail-archives.apache.org/mod_mbox/shiro-commits/">ASF Archive</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/error.gif" height="16" width="16" alt="" border="0"> </td></tr></tbody></table>
+    <table class="confluenceTable">
+        <tbody>
+        <tr>
+            <th colspan="1" rowspan="1" class="confluenceTh"> List Name</th>
+            <th colspan="1" rowspan="1" class="confluenceTh"> List Address</th>
+            <th colspan="1" rowspan="1" class="confluenceTh"> Subscribe</th>
+            <th colspan="1" rowspan="1" class="confluenceTh"> Unsubscribe</th>
+            <th colspan="1" rowspan="1" class="confluenceTh"> ASF Archive</th>
+            <th colspan="1" rowspan="1" class="confluenceTh"> Nabble (Online Forums)</th>
+        </tr>
+        <tr>
+            <td colspan="1" rowspan="1" class="confluenceTd"> Shiro User List</td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:user@shiro.apache.org" rel="nofollow">user@shiro.apache.org</a>
+            </td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:user-subscribe@shiro.apache.org" rel="nofollow">Subscribe</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:user-unsubscribe@shiro.apache.org" rel="nofollow">Unsubscribe</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="http://mail-archives.apache.org/mod_mbox/shiro-user/">ASF Archive</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">Nabble Forum and Archive</a></td>
+        </tr>
+        <tr>
+            <td colspan="1" rowspan="1" class="confluenceTd"> Shiro Developer List</td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:dev@shiro.apache.org" rel="nofollow">dev@shiro.apache.org</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:dev-subscribe@shiro.apache.org" rel="nofollow">Subscribe</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:dev-unsubscribe@shiro.apache.org" rel="nofollow">Unsubscribe</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="http://mail-archives.apache.org/mod_mbox/shiro-dev/">ASF Archive</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="http://shiro-developer.582600.n2.nabble.com/" rel="nofollow">Nabble Forum and Archive</a></td>
+        </tr>
+        <tr>
+            <td colspan="1" rowspan="1" class="confluenceTd"> Shiro SCM List</td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:commits@shiro.apache.org" rel="nofollow">commits@shiro.apache.org</a> </td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:commits-subscribe@shiro.apache.org" rel="nofollow">Subscribe</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="mailto:commits-unsubscribe@shiro.apache.org" rel="nofollow">Unsubscribe</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link" href="http://mail-archives.apache.org/mod_mbox/shiro-commits/">ASF Archive</a></td>
+            <td colspan="1" rowspan="1" class="confluenceTd"></td>
+        </tr>
+        </tbody>
+    </table>
 </div>
 
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/news.html
----------------------------------------------------------------------
diff --git a/news.html b/news.html
index 3cac79c..f3f169f 100644
--- a/news.html
+++ b/news.html
@@ -135,11 +135,11 @@ The Apache Shiro Team
 <div class="blog-post-listing">
     <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
-                    <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
+                    <img class="userLogo logo" src="http://www.gravatar.com/avatar/c0e89e7a227d5612bfd82f7851c4a070" alt="User icon: lhazlewood" title="lhazlewood">
                 </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on May 30, 2013</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on May 30, 2013</div>
         <a class="blogHeading" href="2013/05/30/apache-shiro-122-released.html">Apache Shiro 1.2.2 Released</a>
 
     </div>
@@ -153,29 +153,22 @@ The Apache Shiro Team
 
         <p>All binaries (.jars) are available in Maven Central already.  Please note that the Apache mirrors are still updating to reflect the source distribution, but some mirrors may not be updated yet.  If a mirror download link does not work, please try another or wait another 12 to 24 hours.</p>
 
-        <p>For more information on Shiro 1.2, please read the "<a class="external-link" href="http://www.stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2?</a>" article or the previous <a class="external-link" href="2012/01/24/apache-shiro-120-released.html">1.2 release announcement</a>.</p>
+        <p>For more information on Shiro 1.2, please read the "<a class="external-link" href="https://stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2?</a>" article or the previous <a class="external-link" href="2012/01/24/apache-shiro-120-released.html">1.2 release announcement</a>.</p>
 
         <p>Enjoy!</p>
 
         <p>The Apache Shiro Team</p>
     </div>
-
-
-    <div class="endsection">
-
-        <a href="/confluence/pages/editblogpost.action?pageId=29689097">Edit</a>
-
-    </div>
 </div>
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
-               <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
+               <img class="userLogo logo" src="http://www.gravatar.com/avatar/c0e89e7a227d5612bfd82f7851c4a070" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Jul 29, 2012</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Jul 29, 2012</div>
                 <a class="blogHeading" href="2012/07/29/apache-shiro-121-released.html">Apache Shiro 1.2.1 Released</a>
             
         </div>
@@ -189,57 +182,43 @@ The Apache Shiro Team
 
 <p>All binaries (.jars) are available in Maven Central already.  Please note that the Apache mirrors are still updating to reflect the source distribution, but some mirrors may not be updated yet.  If a mirror download link does not work, please try another or wait another 12 to 24 hours.</p>
 
-<p>For more information on Shiro 1.2, please read the "<a class="external-link" href="http://www.stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2?</a>" article or the previous <a class="external-link" href="2012/01/24/apache-shiro-120-released.html">1.2 release announcement</a>.</p>
+<p>For more information on Shiro 1.2, please read the "<a class="external-link" href="https://stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2?</a>" article or the previous <a class="external-link" href="2012/01/24/apache-shiro-120-released.html">1.2 release announcement</a>.</p>
 
 <p>Enjoy!</p>
 
 <p>The Apache Shiro Team</p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=29689097">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
-               <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
+               <img class="userLogo logo" src="http://www.gravatar.com/avatar/c0e89e7a227d5612bfd82f7851c4a070" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Mar 13, 2012</div>
-                <a class="blogHeading" href="/confluence/pages/viewpage.action?pageId=27840925">What's New in Apache Shiro 1.2?</a>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Mar 13, 2012</div>
+                <a class="blogHeading" href="https://stormpath.com/blog/whats-new-apache-shiro-12">What's New in Apache Shiro 1.2?</a>
             
         </div>
     
     <div class="wiki-content">
         <p>Here's an article covering some of the main features and enhancements in Apache Shiro 1.2:</p>
 
-<p><a class="external-link" href="http://www.stormpath.com/blog/2012/03/12/whats-new-in-apache-shiro-12.html" rel="nofollow">http://www.stormpath.com/blog/2012/03/12/whats-new-in-apache-shiro-12.html</a></p>
+<p><a class="external-link" href="https://stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">https://stormpath.com/blog/whats-new-apache-shiro-12</a></p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=27840925">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
-               <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
+               <img class="userLogo logo" src="http://www.gravatar.com/avatar/c0e89e7a227d5612bfd82f7851c4a070" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Jan 24, 2012</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Jan 24, 2012</div>
                 <a class="blogHeading" href="2012/01/24/apache-shiro-120-released.html">Apache Shiro 1.2.0 Released!</a>
             
         </div>
@@ -287,24 +266,17 @@ The Apache Shiro Team
 
 <p><font color="#222222">The Apache Shiro</font> Team</p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=27836513">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
-               <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
+               <img class="userLogo logo" src="http://www.gravatar.com/avatar/c0e89e7a227d5612bfd82f7851c4a070" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Jun 30, 2011</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Jun 30, 2011</div>
                 <a class="blogHeading" href="2011/06/30/apache-shiro-login-demo.html">Apache Shiro Login Demo</a>
             
         </div>
@@ -316,24 +288,17 @@ The Apache Shiro Team
 <object width="480" height="390"><param valuetype="data" name="movie" value="http://www.youtube.com/v/4LD4mF5ex2U?version=3&amp;hl=en_US&amp;rel=0"><param valuetype="data" name="allowFullScreen" value="true"><param valuetype="data" name="allowscriptaccess" value="always"><embed src="http://www.youtube.com/v/4LD4mF5ex2U?version=3&amp;hl=en_US&amp;rel=0" type="application/x-shockwave-flash" width="480" height="390" allowscriptaccess="always" allowfullscreen="true"></embed></object>
 
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=27820811">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
-               <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
+               <img class="userLogo logo" src="http://www.gravatar.com/avatar/c0e89e7a227d5612bfd82f7851c4a070" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on May 24, 2011</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on May 24, 2011</div>
                 <a class="blogHeading" href="2011/05/24/the-new-rbac-resource-based-access-control.html">The New RBAC - Resource-Based Access Control</a>
             
         </div>
@@ -343,40 +308,26 @@ The Apache Shiro Team
 
 <p>The following article helps explain the differences in role-based vs resource-based access control and why Shiro's permission construct (which is based on resources) can be much better for an application:</p>
 
-<p><a class="external-link" href="http://www.katasoft.com/blog/2011/05/09/new-rbac-resource-based-access-control" rel="nofollow">The New RBAC: Resource-Based Access Control</a></p>
+<p><a class="external-link" href="https://stormpath.com/blog/new-rbac-resource-based-access-control" rel="nofollow">The New RBAC: Resource-Based Access Control</a></p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=26120714">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
-               <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
+               <img class="userLogo logo" src="http://www.gravatar.com/avatar/c0e89e7a227d5612bfd82f7851c4a070" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Mar 14, 2011</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Mar 14, 2011</div>
                 <a class="blogHeading" href="2011/03/14/infoq-article-on-apache-shiro.html">InfoQ article on Apache Shiro</a>
             
         </div>
     
     <div class="wiki-content">
-        <p><a class="external-link" href="http://www.infoq.com/articles/apache-shiro" rel="nofollow">http://www.infoq.com/articles/apache-shiro</a></p>
+        <p><a class="external-link" href="https://www.infoq.com/articles/apache-shiro" rel="nofollow">https://www.infoq.com/articles/apache-shiro</a></p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=25204519">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -396,13 +347,6 @@ The Apache Shiro Team
         <p>In our effort to improve the documentation you need to get started with Shiro, we've written a quick <a href="java-authorization-guide.html" title="Java Authorization Guide">Java Authorization Guide</a> for your review.  Check out and tell us what you think.  And if you haven't already, check out our previous post, the <a href="java-authentication-guide.html" title="Java Authentication Guide">Java Authentication Guide</a>.</p>
 
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=25203368">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -421,15 +365,8 @@ The Apache Shiro Team
     <div class="wiki-content">
         <p>Secure your Grails application quickly and easily using the Apache Shiro security framework. Although easy to get started with, this framework gives you a great deal of flexibility and will support your application as it grows.</p>
 
-<p><a class="external-link" href="http://grails.org/plugin/shiro" rel="nofollow">http://grails.org/plugin/shiro</a></p>
+<p><a class="external-link" href="https://grails.org/plugin/shiro" rel="nofollow">https://grails.org/plugin/shiro</a></p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=25201291">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -446,17 +383,10 @@ The Apache Shiro Team
         </div>
     
     <div class="wiki-content">
-        <p>Mule now has integration with Apache Shiro.  Thanks to Dan Diephouse at <a class="external-link" href="http://www.mulesoft.org" rel="nofollow">MuleSoft</a> for the great blog post.  </p>
+        <p>Mule now has integration with Apache Shiro.  Thanks to Dan Diephouse at <a class="external-link" href="https://developer.mulesoft.com" rel="nofollow">MuleSoft</a> for the great blog post.  </p>
 
-<p><a class="external-link" href="http://blogs.mulesoft.org/apache-shiro-support-for-mule/" rel="nofollow">http://blogs.mulesoft.org/apache-shiro-support-for-mule/</a></p>
+<p><a class="external-link" href="http://blogs.mulesoft.com/dev/mule-dev/apache-shiro-support-for-mule/" rel="nofollow">http://blogs.mulesoft.com/dev/mule-dev/apache-shiro-support-for-mule/</a></p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=24193421">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -488,24 +418,17 @@ The Apache Shiro Team
 <p>Courtesy of Aleksandar and Max at the <a class="external-link" href="http://www.sfjava.org/" rel="nofollow">SF JUG</a></p>
 
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=24192498">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
-               <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
+               <img class="userLogo logo" src="http://www.gravatar.com/avatar/c0e89e7a227d5612bfd82f7851c4a070" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Nov 03, 2010</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Nov 03, 2010</div>
                 <a class="blogHeading" href="2010/11/03/apache-shiro-110-released.html">Apache Shiro 1.1.0 Released</a>
             
         </div>
@@ -523,24 +446,17 @@ The Apache Shiro Team
 
 <p>Enjoy!</p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=24185250">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
                <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Sep 24, 2010</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Sep 24, 2010</div>
                 <a class="blogHeading" href="2010/09/24/apache-shiro-becomes-an-apache-top-level-project.html">Apache Shiro becomes an Apache Top Level Project</a>
             
         </div>
@@ -558,24 +474,17 @@ The Apache Shiro Team
 
 <p>Les</p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=23338922">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
                <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Sep 20, 2010</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Sep 20, 2010</div>
                 <a class="blogHeading" href="2010/09/20/san-francisco-jug-presentation.html">San Francisco JUG presentation</a>
             
         </div>
@@ -583,24 +492,17 @@ The Apache Shiro Team
     <div class="wiki-content">
         <p>On 12 October 2010 at 6:30 pm PDT, Les Hazlewood will present <a class="external-link" href="http://www.sfjava.org/calendar/13539905/" rel="nofollow">Super Simple Application Security with Apache Shiro</a> to the San Francisco Java User Group.  Please RSVP if you wish to attend - seats are limited!</p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=23338543">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
                <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Sep 14, 2010</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Sep 14, 2010</div>
                 <a class="blogHeading" href="2010/09/14/ibm-developerworks-introduction-to-apache-shiro.html">IBM DeveloperWorks - Introduction to Apache Shiro</a>
             
         </div>
@@ -608,24 +510,17 @@ The Apache Shiro Team
     <div class="wiki-content">
         <p>Nathan Good wrote <a class="external-link" href="http://www.ibm.com/developerworks/web/library/wa-apacheshiro/" rel="nofollow">an article</a> introducing some of Apache Shiro's capabilities.  Thanks Nathan!</p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=23337787">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">
+                <a class="userLogoLink" href="https://stormpath.com/blog/author/les">
                <img class="userLogo logo" src="news.userimage//confluence/download/attachments/87901/lhazlewood-43904-pp-les_devnexus_speaking_350x350.jpg?version=1&amp;modificationDate=1327433703000" alt="User icon: lhazlewood" title="lhazlewood">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~lhazlewood">Les Hazlewood</a> posted on Jun 01, 2010</div>
+                </span><div class="page-metadata not-personal"><a class="url fn confluence-userlink" href="https://stormpath.com/blog/author/les">Les Hazlewood</a> posted on Jun 01, 2010</div>
                 <a class="blogHeading" href="2010/06/01/sdforum-java-sig-apache-shiro-presentation.html">SDForum Java SIG Apache Shiro Presentation</a>
             
         </div>
@@ -633,11 +528,4 @@ The Apache Shiro Team
     <div class="wiki-content">
         <p>Tonight, 1 June 2010, Les Hazlewood <a class="external-link" href="http://www.sdforum.org/index.cfm?fuseaction=Calendar.eventDetail&amp;eventID=13671&amp;pageId=471" rel="nofollow">will present</a> Apache Shiro to the SDForum Java SIG in Palo Alto, California.  Please come if you can!</p>
     </div>
-    
-            
-        <div class="endsection">
-        
-            <a href="/confluence/pages/editblogpost.action?pageId=21791855">Edit</a>
-                    
-                    </div>
     </div>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/overview.html
----------------------------------------------------------------------
diff --git a/overview.html b/overview.html
index 7392fd6..d802d2f 100644
--- a/overview.html
+++ b/overview.html
@@ -99,7 +99,7 @@ Subject currentUser = SecurityUtils.getSubject();
 
 <p>The third and final core concept in Shiro is that of a Realm. A Realm acts as the &#8216;bridge&#8217; or &#8216;connector&#8217; between Shiro and your application&#8217;s security data. That is, when it comes time to actually interact with security-related data like user accounts to perform authentication (login) and authorization (access control), Shiro looks up many of these things from one or more Realms configured for an application.</p>
 
-<p>In this sense a Realm is essentially a security-specific <a class="external-link" href="http://en.wikipedia.org/wiki/Data_access_object" rel="nofollow">DAO</a>: it encapsulates connection details for data sources and makes the associated data available to Shiro as needed. When configuring Shiro, you must specify at least one Realm to use for authentication and/or authorization. More than one Realm may be configured, but at least one is required.</p>
+<p>In this sense a Realm is essentially a security-specific <a class="external-link" href="https://en.wikipedia.org/wiki/Data_access_object" rel="nofollow">DAO</a>: it encapsulates connection details for data sources and makes the associated data available to Shiro as needed. When configuring Shiro, you must specify at least one Realm to use for authentication and/or authorization. More than one Realm may be configured, but at least one is required.</p>
 
 <p>Shiro provides out-of-the-box Realms to connect to a number of security data sources (aka directories) such as LDAP, relational databases (JDBC), text configuration sources like INI and properties files, and more. You can plug-in your own Realm implementations to represent custom data sources if the default Realms do not meet your needs.</p>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/powered-by-shiro.html
----------------------------------------------------------------------
diff --git a/powered-by-shiro.html b/powered-by-shiro.html
index d1a786c..93de1f0 100644
--- a/powered-by-shiro.html
+++ b/powered-by-shiro.html
@@ -1,11 +1,10 @@
 <h1><a name="PoweredbyShiro-OrganizationsusingApacheShiro"></a>Organizations using Apache Shiro</h1>
 
-<p>Please consider adding yourself to the Apache Shiro PoweredBy wiki page.  By letting others know that you are using Shiro, you help expand the community and in turn improve Shiro.  Win/Win!</p>
-
-<h3><a name="PoweredbyShiro-Katasoft"></a><a class="external-link" href="http://www.katasoft.com" rel="nofollow">Katasoft</a></h3>
-<p>Katasoft builds software products that make application security easy for developers and their organization.  Les Hazlewood, the Apache Shiro PMC Chair, is Katasoft's founder and CTO.</p>
-<ul><li>Katasoft uses Shiro as the core security subsystem for all of their products.</li><li>Shiro is used to support Katasoft's Single Sign-On (SSO) architecture.</li><li>Shiro's pluggable Realm architecture is used by Katasoft's runtime plugin system to allow changing an application's Realms at runtime, without requiring a server restart.</li></ul>
+<p>Please consider adding yourself to the Apache Shiro PoweredBy page.  By letting others know that you are using Shiro, you help expand the community and in turn improve Shiro.  Win/Win!</p>
 
+<h3><a name="PoweredbyShiro-Stormpath"></a><a class="external-link" href="https://stormpath.com/" rel="nofollow">Stormpath</a></h3>
+<p>Stormpath builds software products that make application security easy for developers and their organization.  Les Hazlewood, the Apache Shiro PMC Chair, is Stormpath's founder and CTO.</p>
+<ul><li>Stormpath uses Shiro as the core security subsystem for their products.</li><li>Shiro is used to support Stormpath's Single Sign-On (SSO) architecture.</li><li>Shiro's pluggable Realm architecture is used by Stormpath's runtime plugin system to allow changing an application's Realms at runtime, without requiring a server restart.</li></ul>
 
 <h3><a name="PoweredbyShiro-LargeFinancialInformationProvider"></a>Large Financial Information Provider</h3>
 <p>Using Shiro in a large scale external web application for authentication, authorization, and custom Session clustering in an enterprise clustered cache</p>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/realm.html.vtl
----------------------------------------------------------------------
diff --git a/realm.html.vtl b/realm.html.vtl
index c9191b6..7d69af4 100644
--- a/realm.html.vtl
+++ b/realm.html.vtl
@@ -7,7 +7,7 @@
 
 <p>Realms usually have a 1-to-1 correlation with a data source such as a relational database, LDAP directory, file system, or other similar resource.  As such, implementations of the <tt>Realm</tt> interface use data source-specific APIs to discover authorization data (roles, permissions, etc), such as JDBC, File IO, Hibernate or JPA, or any other Data Access API.  </p>
 
-#tip('Tip', 'A Realm is essentially a security-specific <a class="external-link" href="http://en.wikipedia.org/wiki/Data_Access_Object" rel="nofollow">DAO</a>')
+#tip('Tip', 'A Realm is essentially a security-specific <a class="external-link" href="https://en.wikipedia.org/wiki/Data_Access_Object" rel="nofollow">DAO</a>')
 
 <p>Because most of these data sources usually store both authentication data (credentials such as passwords) as well as authorization data (such as roles or permissions), every Shiro <tt>Realm</tt> can perform <em>both</em> authentication and authorization operations.</p>
 
@@ -31,7 +31,7 @@ securityManager.realms = $fooRealm, $barRealm, $bazRealm
 </pre>
 </div></div>
 
-<p>Explicit assignment is deterministic - you control exactly which realms are used as well as <em>the order</em> that they will be used for authentication and authorization. Realm ordering effects are described in detail in the Authentication chapter's <a href="authentication.html\#Authentication-sequence">Authentication Sequence</a> section. </p>
+<p>Explicit assignment is deterministic - you control exactly which realms are used as well as <em>the order</em> that they will be used for authentication and authorization. Realm ordering effects are described in detail in the Authentication chapter's <a href="authentication.html#[[#]]#Authentication-sequence">Authentication Sequence</a> section. </p>
 
 <h3><a name="Realm-ImplicitAssignment"></a>Implicit Assignment</h3>
 
@@ -61,23 +61,23 @@ securityManager.realms = $blahRealm, $fooRealm, $barRealm
 </pre>
 </div></div>
 
-<p>However, realize that with implicit assignment, just the order that the realms are defined directly affects how they are consulted during authentication and authorization attempts.  If you change their definition order, you will change how the master <tt>Authenticator</tt>'s <a href="authentication.html\#Authentication-sequence">Authentication Sequence</a> functions.</p>
+<p>However, realize that with implicit assignment, just the order that the realms are defined directly affects how they are consulted during authentication and authorization attempts.  If you change their definition order, you will change how the master <tt>Authenticator</tt>'s <a href="authentication.html#[[#]]#Authentication-sequence">Authentication Sequence</a> functions.</p>
 
 <p>For this reason, and to ensure deterministic behavior, we recommend using Explicit Assignment instead of Implicit Assignment. <br clear="none">
 <a name="Realm-authentication"></a></p>
 <h2><a name="Realm-RealmAuthentication"></a>Realm Authentication</h2>
 
-<p>Once you understand Shiro's master <a href="authentication.html\#Authentication-sequence">Authentication workflow</a>, it is important to know exactly what happens when the <tt>Authenticator</tt> interacts with a <tt>Realm</tt> during an authentication attempt.</p>
+<p>Once you understand Shiro's master <a href="authentication.html#[[#]]#Authentication-sequence">Authentication workflow</a>, it is important to know exactly what happens when the <tt>Authenticator</tt> interacts with a <tt>Realm</tt> during an authentication attempt.</p>
 
 <h3><a name="Realm-Supporting%7B%7BAuthenticationTokens%7D%7D"></a>Supporting <tt>AuthenticationTokens</tt></h3>
 
-<p>As mentioned in the <a href="authentication.html\#Authentication-sequence">authentication sequence</a>, just before a <tt>Realm</tt> is consulted to perform an authentication attempt, its <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html\#supports(org.apache.shiro.authc.AuthenticationToken)">supports</a></tt> method is called.  If the return value is <tt>true</tt>, only then will its <tt>getAuthenticationInfo(token)</tt> method be invoked.</p>
+<p>As mentioned in the <a href="authentication.html#[[#]]#Authentication-sequence">authentication sequence</a>, just before a <tt>Realm</tt> is consulted to perform an authentication attempt, its <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html#[[#]]#supports(org.apache.shiro.authc.AuthenticationToken)">supports</a></tt> method is called.  If the return value is <tt>true</tt>, only then will its <tt>getAuthenticationInfo(token)</tt> method be invoked.</p>
 
 <p>Typically a realm will check the type (interface or class) of the submitted token to see if it can process it.  For example, a Realm that processes biometric data may not understand <tt>UsernamePasswordTokens</tt> at all, in which case it would return <tt>false</tt> from the <tt>supports</tt> method.</p>
 
 <h3><a name="Realm-Handlingsupported%7B%7BAuthenticationTokens%7D%7D"></a>Handling supported <tt>AuthenticationTokens</tt></h3>
 
-<p>If a <tt>Realm</tt> <tt>supports</tt> a submitted <tt>AuthenticationToken</tt>, the <tt>Authenticator</tt> will call the Realm's  <a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html\#getAuthenticationInfo(org.apache.shiro.authc.AuthenticationToken)">getAuthenticationInfo(token)</a> method.  This effectively represents an authentication attempt with the <tt>Realm's</tt> backing data source.  The method, in order:</p>
+<p>If a <tt>Realm</tt> <tt>supports</tt> a submitted <tt>AuthenticationToken</tt>, the <tt>Authenticator</tt> will call the Realm's  <a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html#[[#]]#getAuthenticationInfo(org.apache.shiro.authc.AuthenticationToken)">getAuthenticationInfo(token)</a> method.  This effectively represents an authentication attempt with the <tt>Realm's</tt> backing data source.  The method, in order:</p>
 
 <ol><li>Inspects the <tt>token</tt> for the identifying principal (account identifying information)</li><li>Based on the <tt>principal</tt>, looks up corresponding account data in the data source</li><li>Ensures that the token's supplied <tt>credentials</tt> matches those stored in the data store</li><li>If the credentials match, an <a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/AuthenticationInfo.html">AuthenticationInfo</a> instance is returned that encapsulates the account data in a format Shiro understands</li><li>If the credentials DO NOT match, an <a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/AuthenticationException.html">AuthenticationException</a> is thrown</li></ol>
 
@@ -146,7 +146,7 @@ myRealm.credentialsMatcher = $customMatcher
 
 <p>Shiro provides multiple <tt>HashedCredentialsMatcher</tt> subclass implementations.  You must configure the specific implementation on your realm to match the hashing algorithm you use to hash your users' credentials.</p>
 
-<p>For example, let's say your application uses username/password pairs for authentication.  And due to the benefits of hashing credentials described above, let's say you want to one-way hash a user's password using the <a class="external-link" href="http://en.wikipedia.org/wiki/SHA_hash_functions" rel="nofollow">SHA-256</a> algorithm when you create a user account.  You would hash the user's entered plain-text password and save that value:</p>
+<p>For example, let's say your application uses username/password pairs for authentication.  And due to the benefits of hashing credentials described above, let's say you want to one-way hash a user's password using the <a class="external-link" href="https://en.wikipedia.org/wiki/SHA_hash_functions" rel="nofollow">SHA-256</a> algorithm when you create a user account.  You would hash the user's entered plain-text password and save that value:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/session-management.html
----------------------------------------------------------------------
diff --git a/session-management.html b/session-management.html
index 63fd65c..cbff690 100644
--- a/session-management.html
+++ b/session-management.html
@@ -154,7 +154,7 @@ securityManager.sessionManager.sessionListeners = $aSessionListener, $anotherSes
 <p><a name="SessionManagement-sessionstorage"></a></p>
 <h3><a name="SessionManagement-SessionStorage"></a>Session Storage</h3>
 
-<p>Whenever a session is created or updated, its data needs to persisted to a storage location so it is accessible by the application at a later time.  Similarly, when a session is invalid and longer being used, it needs to be deleted from storage so the session data store space is not exhausted.  The <tt>SessionManager</tt> implementations delegate these Create/Read/Update/Delete (CRUD) operations to an internal component, the <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/session/mgt/eis/SessionDAO.html">SessionDAO</a></tt>, which reflects the <a class="external-link" href="http://en.wikipedia.org/wiki/Data_access_object" rel="nofollow">Data Access Object (DAO)</a> design pattern.</p>
+<p>Whenever a session is created or updated, its data needs to persisted to a storage location so it is accessible by the application at a later time.  Similarly, when a session is invalid and longer being used, it needs to be deleted from storage so the session data store space is not exhausted.  The <tt>SessionManager</tt> implementations delegate these Create/Read/Update/Delete (CRUD) operations to an internal component, the <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/session/mgt/eis/SessionDAO.html">SessionDAO</a></tt>, which reflects the <a class="external-link" href="https://en.wikipedia.org/wiki/Data_access_object" rel="nofollow">Data Access Object (DAO)</a> design pattern.</p>
 
 <p>The power of the SessionDAO is that you can implement this interface to communicate with <em>any</em> data store you wish.  This means your session data can reside in memory, on the file system, in a relational database or NoSQL data store, or any other location you need.  You have control over persistence behavior.</p>
 
@@ -222,11 +222,11 @@ securityManager.cacheManager = $cacheManager
 <p><a name="SessionManagement-ehcachesessioncacheconfiguration"></a></p>
 <h5><a name="SessionManagement-EHCacheSessionCacheConfiguration"></a>EHCache Session Cache Configuration</h5>
 
-<p>By default, the <tt>EhCacheManager</tt> uses a Shiro-specific <tt><a class="external-link" href="https://github.com/apache/shiro/tree/master/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml">ehcache.xml</a></tt> file that sets up the Session cache region and the necessary settings to ensure Sessions are stored and retrieved properly.</p>
+<p>By default, the <tt>EhCacheManager</tt> uses a Shiro-specific <tt><a class="external-link" href="https://github.com/apache/shiro/blob/master/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml">ehcache.xml</a></tt> file that sets up the Session cache region and the necessary settings to ensure Sessions are stored and retrieved properly.</p>
 
 <p>However, if you wish to change the cache settings, or configure your own <tt>ehcache.xml</tt> or EHCache <tt>net.sf.ehcache.CacheManager</tt> instance, you will need to configure the cache region to ensure that Sessions are handled correctly.</p>
 
-<p>If you look at the default <tt><a class="external-link" href="https://github.com/apache/shiro/tree/master/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml">ehcache.xml</a></tt> file, you will see the following <tt>shiro-activeSessionCache</tt> cache configuration:</p>
+<p>If you look at the default <tt><a class="external-link" href="https://github.com/apache/shiro/blob/master/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml">ehcache.xml</a></tt> file, you will see the following <tt>shiro-activeSessionCache</tt> cache configuration:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml">
@@ -294,7 +294,7 @@ securityManager.sessionManager.sessionDAO.sessionIdGenerator = $sessionIdGenerat
 
 <h4><a name="SessionManagement-DefaultSessionValidationScheduler"></a>Default SessionValidationScheduler</h4>
 
-<p>The default <tt>SessionValidationScheduler</tt> usable in all environments is the <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationScheduler.html">ExecutorServiceSessionValidationScheduler</a></tt> which uses a JDK <tt><a class="external-link" href="http://download.oracle.com/javase/6/docs/api/java/util/concurrent/ScheduledExecutorService.html" rel="nofollow">ScheduledExecutorService</a></tt> to control how often the validation should occur.</p>
+<p>The default <tt>SessionValidationScheduler</tt> usable in all environments is the <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationScheduler.html">ExecutorServiceSessionValidationScheduler</a></tt> which uses a JDK <tt><a class="external-link" href="http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/ScheduledExecutorService.html" rel="nofollow">ScheduledExecutorService</a></tt> to control how often the validation should occur.</p>
 
 <p>By default, this implementation will perform validation once per hour.  You can change the rate at which validation occurs by specifying a <b>new</b> instance of <tt>ExecutorServiceSessionValidationScheduler</tt> and specifying a different interval (in milliseconds):</p>
 
@@ -365,7 +365,7 @@ securityManager.sessionManager.deleteInvalidSessions = <span class="code-keyword
 
 <p>Note also that even if you prevent Shiro from deleting invalid sessions, you still should enable session validation somehow - either via Shiro's existing validation mechanisms or via a custom mechanism you provide yourself (see the above "Disabling Session Validation" section above for more).  The validation mechanism will update your session records to reflect the invalid state (e.g. when it was invalidated, when it was last accessed, etc), even if you will delete them manually yourself at some other time.</p>
 
-<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">If you configure Shiro so it does not delete invalid sessions, you are responsible for ensuring that your session data store doesn't exhaust its space.  You must delete invalid sessions from you data store yourself!  
+<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.png" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">If you configure Shiro so it does not delete invalid sessions, you are responsible for ensuring that your session data store doesn't exhaust its space.  You must delete invalid sessions from you data store yourself!
 
 <p>Also note that disabling session deletion is <b>not</b> the same as disabling session validation scheduling.  You should almost always use a session validation scheduling mechanism - either one supported by Shiro directly or your own.</p></td></tr></table></div>
 
@@ -379,7 +379,7 @@ securityManager.sessionManager.deleteInvalidSessions = <span class="code-keyword
 
 <p><b>Distributed Caches</b></p>
 
-<p>Distributed Caches such as <a class="external-link" href="http://ehcache.org/documentation/get-started/about-distributed-cache" rel="nofollow">Ehcache+TerraCotta</a>, <a class="external-link" href="http://www.gigaspaces.com/" rel="nofollow">GigaSpaces</a> <a class="external-link" href="http://www.oracle.com/technetwork/middleware/coherence/overview/index.html" rel="nofollow">Oracle Coherence</a>, and <a class="external-link" href="http://memcached.org/" rel="nofollow">Memcached</a> (and many others) already solve the distributed-data-at-the-persistence-level problem.  Therefore enabling Session clustering in Shiro is as simple as configuring Shiro to use a distributed cache.</p>
+<p>Distributed Caches such as <a class="external-link" href="http://www.ehcache.org/documentation/2.7/configuration/distributed-cache-configuration.html" rel="nofollow">Ehcache+TerraCotta</a>, <a class="external-link" href="http://www.gigaspaces.com/" rel="nofollow">GigaSpaces</a> <a class="external-link" href="http://www.oracle.com/technetwork/middleware/coherence/overview/index.html" rel="nofollow">Oracle Coherence</a>, and <a class="external-link" href="http://memcached.org/" rel="nofollow">Memcached</a> (and many others) already solve the distributed-data-at-the-persistence-level problem.  Therefore enabling Session clustering in Shiro is as simple as configuring Shiro to use a distributed cache.</p>
 
 <p>This gives you the flexibility of choosing the exact clustering mechanism that is suitable for <em>your</em> environment.</p>
 
@@ -441,7 +441,7 @@ securityManager.cacheManager = $cacheManager
 
 <h3><a name="SessionManagement-EhcacheTerracotta"></a>Ehcache + Terracotta</h3>
 
-<p>One such distributed caching solution that people have had success with while using Shiro is the Ehcache + Terracotta pairing.  See the Ehcache-hosted <a class="external-link" href="http://ehcache.org/documentation/get-started/about-distributed-cache" rel="nofollow">Distributed Caching With Terracotta</a> documentation for full details of how to enable distributed caching with Ehcache.</p>
+<p>One such distributed caching solution that people have had success with while using Shiro is the Ehcache + Terracotta pairing.  See the Ehcache-hosted <a class="external-link" href="http://www.ehcache.org/documentation/get-started/about-distributed-cache" rel="nofollow">Distributed Caching With Terracotta</a> documentation for full details of how to enable distributed caching with Ehcache.</p>
 
 <p>Once you've got Terracotta clustering working with Ehcache, the Shiro-specific parts are very simple.  Read and follow the <a href="#SessionManagement-ehcachesessiondao">Ehcache SessionDAO</a> documentation, but we'll need to make a few changes</p>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/spring.html
----------------------------------------------------------------------
diff --git a/spring.html b/spring.html
index 653a60f..96b2b3f 100644
--- a/spring.html
+++ b/spring.html
@@ -17,7 +17,7 @@
 </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>
+<p>This page covers the ways to integrate Shiro into <a class="external-link" href="http://spring.io" rel="nofollow">Spring</a>-based applications.</p>
 
 <p>Shiro's JavaBeans compatibility makes it perfectly suited to be configured via Spring XML or other Spring-based configuration mechanisms.  Shiro applications need an application singleton <tt>SecurityManager</tt> instance.  Note that this does not have to be a <em>static</em> singleton, but there should only be a single instance used by the application, whether its a static singleton or not.</p>
 
@@ -180,7 +180,7 @@ all of its configuration properties in web.xml but define the <tt>SecurityManage
 </pre>
 </div></div>
 
-<p>Once you have defined this bean, you must plug it in to whatever remoting <tt>Exporter</tt> you are using to export/expose your services.  <tt>Exporter</tt> implementations are defined according to the remoting mechanism/protocol in use.  See Spring's <a class="external-link" href="http://static.springsource.org/spring/docs/2.5.x/reference/remoting.html" rel="nofollow">Remoting chapter</a> on defining <tt>Exporter</tt> beans.</p>
+<p>Once you have defined this bean, you must plug it in to whatever remoting <tt>Exporter</tt> you are using to export/expose your services.  <tt>Exporter</tt> implementations are defined according to the remoting mechanism/protocol in use.  See Spring's <a class="external-link" href="http://docs.spring.io/spring/docs/2.5.x/reference/remoting.html" rel="nofollow">Remoting chapter</a> on defining <tt>Exporter</tt> beans.</p>
 
 <p>For example, if using HTTP-based remoting (notice the property reference to the <tt>secureRemoteInvocationExecutor</tt> bean):</p>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/subject.html.vtl
----------------------------------------------------------------------
diff --git a/subject.html.vtl b/subject.html.vtl
index a3f2914..0aa3a06 100644
--- a/subject.html.vtl
+++ b/subject.html.vtl
@@ -81,7 +81,7 @@ session.setAttribute( <span class="code-quote">"someKey"</span>, <span class="co
 </pre>
 </div></div>
 
-<p>You, as the application/GUI developer can choose to show the end-user messages based on exceptions or not (for example, <tt>"There is no account in the system with that username."</tt>).  There are many different types of exceptions you can check, or throw your own for custom conditions Shiro might not account for.  See the <a class="external-link" href="http://www.jsecurity.org/api/org/jsecurity/authc/AuthenticationException.html" rel="nofollow">AuthenticationException JavaDoc</a> for more.</p>
+<p>You, as the application/GUI developer can choose to show the end-user messages based on exceptions or not (for example, <tt>"There is no account in the system with that username."</tt>).  There are many different types of exceptions you can check, or throw your own for custom conditions Shiro might not account for.  See the <a class="external-link" href="https://shiro.apache.org/static/current/apidocs/org/apache/shiro/authc/AuthenticationException.html" rel="nofollow">AuthenticationException JavaDoc</a> for more.</p>
 
 <p>Ok, so by now, we have a logged in user.  What else can we do?</p>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/testing.html.vtl
----------------------------------------------------------------------
diff --git a/testing.html.vtl b/testing.html.vtl
index a186294..1c99db6 100644
--- a/testing.html.vtl
+++ b/testing.html.vtl
@@ -11,7 +11,7 @@
 <ol><li>A <tt>Subject</tt> instance must be created</li><li>The <tt>Subject</tt> instance must be <em>bound</em> to the currently executing thread.</li><li>After the thread is finished executing (or if the thread's execution results in a <tt>Throwable</tt>), the <tt>Subject</tt> must be <em>unbound</em> to ensure that the thread remains 'clean' in any thread-pooled environment.</li></ol>
 
 
-<p>Shiro has architectural components that perform this bind/unbind logic automatically for a running application.  For example, in a web application, the root Shiro Filter performs this logic when <a class="external-link" href="static/current/apidocs/org/apache/shiro/web/servlet/AbstractShiroFilter.html\#doFilterInternal(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)">filtering a request</a>.  But as test environments and frameworks differ, we need to perform this bind/unbind logic ourselves for our chosen test framework.</p>
+<p>Shiro has architectural components that perform this bind/unbind logic automatically for a running application.  For example, in a web application, the root Shiro Filter performs this logic when <a class="external-link" href="static/current/apidocs/org/apache/shiro/web/servlet/AbstractShiroFilter.html#[[#]]#doFilterInternal(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)">filtering a request</a>.  But as test environments and frameworks differ, we need to perform this bind/unbind logic ourselves for our chosen test framework.</p>
 
 <h2><a name="Testing-TestSetup"></a>Test Setup</h2>
 
@@ -102,7 +102,7 @@
 </div></div>
 
 #warning('Testing &amp; Frameworks', 'The code in the <tt>AbstractShiroTest</tt> class uses Shiro''s <tt>ThreadState</tt> concept and a static SecurityManager.  These techniques are useful in tests and in framework code, but rarely ever used in application code.
-<p>Most end-users working with Shiro who need to ensure thread-state consistency will almost always use Shiro''s automatic management mechanisms, namely the <tt>Subject.associateWith</tt> and the <tt>Subject.execute</tt> methods.  These methods are covered in the reference on <a href="subject.html\#Subject-ThreadAssociation">Subject thread association</a>.</p>')
+<p>Most end-users working with Shiro who need to ensure thread-state consistency will almost always use Shiro''s automatic management mechanisms, namely the <tt>Subject.associateWith</tt> and the <tt>Subject.execute</tt> methods.  These methods are covered in the reference on <a href="subject.html#[[#]]#Subject-ThreadAssociation">Subject thread association</a>.</p>')
 
 <h2><a name="Testing-UnitTesting"></a>Unit Testing</h2>
 
@@ -112,7 +112,7 @@
 
 <h3><a name="Testing-ExampleShiroUnitTest"></a>ExampleShiroUnitTest</h3>
 
-<p>Because unit tests are better suited for testing your own logic (and not any implementations your logic might call), it is a great idea to <em>mock</em> any APIs that your logic depends on.  This works very well with Shiro - you can mock the <tt>Subject</tt> interface and have it reflect whatever conditions you want your code under test to react to.  We can leverage modern mock frameworks like <a class="external-link" href="http://easymock.org/" rel="nofollow">EasyMock</a> and <a class="external-link" href="http://mockito.org/" rel="nofollow">Mockito</a> to do this for us.  </p>
+<p>Because unit tests are better suited for testing your own logic (and not any implementations your logic might call), it is a great idea to <em>mock</em> any APIs that your logic depends on.  This works very well with Shiro - you can mock the <tt>Subject</tt> interface and have it reflect whatever conditions you want your code under test to react to.  We can leverage modern mock frameworks like <a class="external-link" href="http://easymock.org/" rel="nofollow">EasyMock</a> and <a class="external-link" href="http://site.mockito.org" rel="nofollow">Mockito</a> to do this for us.  </p>
 
 <p>But as stated above, the key in Shiro tests is to remember that any Subject instance (mock or real) must be bound to the thread during test execution.  So all we need to do is bind the mock Subject to ensure things work as expected.</p>
 


Mime
View raw message